From b4928af5e70c85d309f7a074ed80bbcd1ee414f9 Mon Sep 17 00:00:00 2001 From: Wouter van Oortmerssen Date: Mon, 14 Dec 2020 14:18:16 -0800 Subject: Fixed wasm-emscripten-finalize AsmConstWalker not handling 64-bit pointers (#3431) Also improved the LLD test scripts to accomodate 64-bit tests. --- scripts/test/generate_lld_tests.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'scripts/test/generate_lld_tests.py') diff --git a/scripts/test/generate_lld_tests.py b/scripts/test/generate_lld_tests.py index 94c511ef4..00d5ae026 100755 --- a/scripts/test/generate_lld_tests.py +++ b/scripts/test/generate_lld_tests.py @@ -48,10 +48,10 @@ def generate_wat_files(llvm_bin, emscripten_root): wasm_path = os.path.join(lld_path, wasm_file) wat_path = os.path.join(lld_path, wat_file) is_shared = 'shared' in src_file + is_64 = '64' in src_file compile_cmd = [ os.path.join(llvm_bin, 'clang'), src_path, '-o', obj_path, - '--target=wasm32-emscripten', '-mllvm', '-enable-emscripten-sjlj', '-c', '-nostdinc', @@ -81,6 +81,12 @@ def generate_wat_files(llvm_bin, emscripten_root): else: link_cmd.append('--entry=main') + if is_64: + compile_cmd.append('--target=wasm64-emscripten') + link_cmd.append('-mwasm64') + else: + compile_cmd.append('--target=wasm32-emscripten') + try: support.run_command(compile_cmd) support.run_command(link_cmd) -- cgit v1.2.3