diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/emmaken.py | 5 | ||||
| -rw-r--r-- | tools/shared.py | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/tools/emmaken.py b/tools/emmaken.py index 3590f86b..b860bacb 100755 --- a/tools/emmaken.py +++ b/tools/emmaken.py @@ -55,11 +55,14 @@ try: CC = to_cc(CXX) CC_ARG_SKIP = ['-O1', '-O2', '-O3'] - CC_ADDITIONAL_ARGS = ['-m32', '-U__i386__', '-U__x86_64__', '-UX87_DOUBLE_ROUNDING', '-UHAVE_GCC_ASM_FOR_X87'] + CC_ADDITIONAL_ARGS = ['-m32', '-U__i386__', '-U__x86_64__', '-U__SSE__', '-UX87_DOUBLE_ROUNDING', '-UHAVE_GCC_ASM_FOR_X87'] ALLOWED_LINK_ARGS = ['-f', '-help', '-o', '-print-after', '-print-after-all', '-print-before', '-print-before-all', '-time-passes', '-v', '-verify-dom-info', '-version' ] DISALLOWED_LINK_ARGS = []#['rc'] + EMMAKEN_CFLAGS = os.environ.get('EMMAKEN_CFLAGS') + if EMMAKEN_CFLAGS: CC_ADDITIONAL_ARGS += EMMAKEN_CFLAGS.split(' ') + # ---------------- End configs ------------- if len(sys.argv) == 2 and 'conftest' not in ' '.join(sys.argv): # Avoid messing with configure, see below too diff --git a/tools/shared.py b/tools/shared.py index 55a8412a..ad3b1912 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -14,6 +14,7 @@ LLVM_OPT=os.path.expanduser(os.path.join(LLVM_ROOT, 'opt')) LLVM_AS=os.path.expanduser(os.path.join(LLVM_ROOT, 'llvm-as')) LLVM_DIS=os.path.expanduser(os.path.join(LLVM_ROOT, 'llvm-dis')) LLVM_DIS_OPTS = ['-show-annotations'] # For LLVM 2.8+. For 2.7, you may need to do just [] +LLVM_INTERPRETER=os.path.expanduser(os.path.join(LLVM_ROOT, 'lli')) # Engine tweaks @@ -32,9 +33,9 @@ def timeout_run(proc, timeout, note): raise Exception("Timed out: " + note) return proc.communicate()[0] -def run_js(engine, filename, args, check_timeout=False): +def run_js(engine, filename, args, check_timeout=False, stdout=PIPE, stderr=STDOUT): return timeout_run(Popen(engine + [filename] + (['--'] if 'v8' in engine[0] else []) + args, - stdout=PIPE, stderr=STDOUT), 120 if check_timeout else None, 'Execution') + stdout=stdout, stderr=stderr), 120 if check_timeout else None, 'Execution') def to_cc(cxx): # By default, LLVM_GCC and CLANG are really the C++ versions. This gets an explicit C version |