aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2013-04-17 11:08:51 -0700
committerAlon Zakai <alonzakai@gmail.com>2013-04-17 11:12:38 -0700
commit2be92943d135dd4beb12c394c921eaaa26f98cc5 (patch)
treef49cca0beb4fd4a9f0840043b16f27f05b5296bb
parentd66573c7e8becabf5acfb72cd3e65fedf1b56b3b (diff)
enable asm in -O1 and prepare to add testing
-rwxr-xr-xemcc2
-rwxr-xr-xtests/runner.py1
2 files changed, 2 insertions, 1 deletions
diff --git a/emcc b/emcc
index 7edc71e4..e25d9d91 100755
--- a/emcc
+++ b/emcc
@@ -1002,7 +1002,7 @@ try:
# Apply effects from settings
if shared.Settings.ASM_JS:
- assert opt_level == 2, 'asm.js requires -O2'
+ assert opt_level >= 1, 'asm.js requires -O1 or above'
if closure:
print >> sys.stderr, 'emcc: warning: disabling closure because it is not compatible with asm.js code generation'
diff --git a/tests/runner.py b/tests/runner.py
index db5ba108..8786d4f6 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -9001,6 +9001,7 @@ TT = %s
exec('o2 = make_run("o2", compiler=CLANG, emcc_args=["-O2", "-s", "JS_CHUNK_SIZE=1024"])')
# asm.js
+ #exec('asm1 = make_run("asm1", compiler=CLANG, emcc_args=["-O1", "-s", "ASM_JS=1"])')
exec('asm2 = make_run("asm2", compiler=CLANG, emcc_args=["-O2", "-s", "ASM_JS=1"])')
exec('asm2g = make_run("asm2g", compiler=CLANG, emcc_args=["-O2", "-s", "ASM_JS=1", "-g", "-s", "ASSERTIONS=1", "--memory-init-file", "1"])')