Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add warning about fastcomp deprecation #11280

Merged
merged 3 commits into from
May 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ Current Trunk
config setting can be used.
- Removed obsolete SIMD.js support (-s SIMD=1). Use -msimd128 to target Wasm
SIMD. (#11180)
- Add warning about fastcomp deprecation (can be disabled via `-Wno-fastcomp`).
- Removed obsolete SIMD.js support (-s SIMD=1). Use -msimd128 to target Wasm SIMD. (#11180)
- The mmap method of JavaScript filesystem drivers (based on library_fs.js) no
longer takes a target memory. It's safer/cleaner/smaller to assume the target
is the global memory buffer.
Expand Down
5 changes: 5 additions & 0 deletions emcc.py
Original file line number Diff line number Diff line change
Expand Up @@ -1258,6 +1258,11 @@ def get_last_setting_change(setting):

shared.verify_settings()

# We allow this warning to be supressed by the environment so that we can run the test
# suite against fastcomp while supressing this warning.
if not shared.Settings.WASM_BACKEND and 'EMCC_ALLOW_FASTCOMP' not in os.environ:
diagnostics.warning('fastcomp', 'the fastomp compiler is deprecated. Please switch to the upstream llvm backend as soon as possible and open issues if you have trouble doing so')

if options.no_entry or '_main' not in shared.Settings.EXPORTED_FUNCTIONS:
shared.Settings.EXPECT_MAIN = 0

Expand Down
7 changes: 5 additions & 2 deletions tests/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ def create_test_file(name, contents, binary=False):
'strict'
]

if shared.Settings.WASM_BACKEND:
if Settings.WASM_BACKEND:
core_test_modes += [
'wasm2js0',
'wasm2js1',
Expand Down Expand Up @@ -306,7 +306,7 @@ def create_test_file(name, contents, binary=False):
'benchmark',
]

if shared.Settings.WASM_BACKEND:
if Settings.WASM_BACKEND:
non_core_test_modes += [
'asan',
'lsan',
Expand Down Expand Up @@ -461,6 +461,9 @@ def setUp(self):
self.env = {}
self.temp_files_before_run = []

if not Settings.WASM_BACKEND:
os.environ['EMCC_ALLOW_FASTCOMP'] = '1'

if EMTEST_DETECT_TEMPFILE_LEAKS:
for root, dirnames, filenames in os.walk(self.temp_dir):
for dirname in dirnames:
Expand Down
2 changes: 1 addition & 1 deletion tools/gen_struct_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ def inspect_code(headers, cpp_opts, structs, defines):

if not shared.Settings.WASM_BACKEND:
# Avoid the binaryen dependency if we are only using fastcomp
cmd += ['-s', 'WASM=0']
cmd += ['-s', 'WASM=0', '-Wno-fastcomp']
if shared.Settings.LTO:
cmd += ['-flto=' + shared.Settings.LTO]

Expand Down
1 change: 1 addition & 0 deletions tools/shared.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
diagnostics.add_warning('emcc')
diagnostics.add_warning('undefined')
diagnostics.add_warning('version-check')
diagnostics.add_warning('fastcomp')
diagnostics.add_warning('unused-command-line-argument', shared=True)


Expand Down
3 changes: 3 additions & 0 deletions tools/system_libs.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ def run_one_command(cmd):
for opt in ['EMMAKEN_CFLAGS']:
if opt in safe_env:
del safe_env[opt]
# Disable certain warnings when we build ports/system libraries we don't want to
# show them a million times.
cmd.append('-Wno-fastcomp')
shared.run_process(cmd, stdout=stdout, stderr=stderr, env=safe_env)


Expand Down