switch to le32 target by default
This commit is contained in:
Родитель
b08947097b
Коммит
06a8c252d9
|
@ -17,8 +17,8 @@ var QUANTUM_SIZE = 4; // This is the size of an individual field in a structure.
|
|||
//
|
||||
// Changing this from the default of 4 is deprecated.
|
||||
|
||||
var TARGET_X86 = 1; // For le32-unknown-nacl
|
||||
var TARGET_LE32 = 0; // For i386-pc-linux-gnu
|
||||
var TARGET_X86 = 0; // For i386-pc-linux-gnu
|
||||
var TARGET_LE32 = 1; // For le32-unknown-nacl
|
||||
|
||||
var CORRECT_SIGNS = 1; // Whether we make sure to convert unsigned values to signed values.
|
||||
// Decreases performance with additional runtime checks. Might not be
|
||||
|
|
|
@ -457,7 +457,7 @@ if 'benchmark' not in str(sys.argv) and 'sanity' not in str(sys.argv) and 'brows
|
|||
if len(sys.argv) == 2 and 'ALL.' in sys.argv[1]:
|
||||
ignore, test = sys.argv[1].split('.')
|
||||
print 'Running all test modes on test "%s"' % test
|
||||
sys.argv = [sys.argv[0], 'default.'+test, 'o1.'+test, 'o2.'+test, 'asm1.'+test, 'asm2.'+test, 'asm2g.'+test, 'asm2le32.'+test, 's_0_0.'+test, 's_0_1.'+test, 's_1_0.'+test, 's_1_1.'+test]
|
||||
sys.argv = [sys.argv[0], 'default.'+test, 'o1.'+test, 'o2.'+test, 'asm1.'+test, 'asm2.'+test, 'asm2g.'+test, 'asm2x86.'+test, 's_0_0.'+test, 's_0_1.'+test, 's_1_0.'+test, 's_1_1.'+test]
|
||||
|
||||
class T(RunnerCore): # Short name, to make it more fun to use manually on the commandline
|
||||
## Does a complete test - builds, runs, checks output, etc.
|
||||
|
@ -9345,7 +9345,7 @@ TT = %s
|
|||
exec('asm1 = make_run("asm1", compiler=CLANG, emcc_args=["-O1", "-s", "CHECK_HEAP_ALIGN=1"])')
|
||||
exec('asm2 = make_run("asm2", compiler=CLANG, emcc_args=["-O2"])')
|
||||
exec('asm2g = make_run("asm2g", compiler=CLANG, emcc_args=["-O2", "-g", "-s", "ASSERTIONS=1", "--memory-init-file", "1"])')
|
||||
exec('''asm2le32 = make_run("asm2le32", compiler=CLANG, emcc_args=["-O2", "-g", "-s", "CHECK_HEAP_ALIGN=1"], env='{"EMCC_LLVM_TARGET": "le32-unknown-nacl"}')''')
|
||||
exec('''asm2x86 = make_run("asm2x86", compiler=CLANG, emcc_args=["-O2", "-g", "-s", "CHECK_HEAP_ALIGN=1"], env='{"EMCC_LLVM_TARGET": "i386-pc-linux-gnu"}')''')
|
||||
|
||||
# Make custom runs with various options
|
||||
for compiler, quantum, embetter, typed_arrays, llvm_opts in [
|
||||
|
|
|
@ -295,7 +295,7 @@ def check_node_version():
|
|||
# we re-check sanity when the settings are changed)
|
||||
# We also re-check sanity and clear the cache when the version changes
|
||||
|
||||
EMSCRIPTEN_VERSION = '1.4.2'
|
||||
EMSCRIPTEN_VERSION = '1.4.3'
|
||||
|
||||
def generate_sanity():
|
||||
return EMSCRIPTEN_VERSION + '|' + get_llvm_target()
|
||||
|
@ -495,7 +495,7 @@ except:
|
|||
|
||||
# Target choice. Must be synced with src/settings.js (TARGET_*)
|
||||
def get_llvm_target():
|
||||
return os.environ.get('EMCC_LLVM_TARGET') or 'i386-pc-linux-gnu' # 'le32-unknown-nacl'
|
||||
return os.environ.get('EMCC_LLVM_TARGET') or 'le32-unknown-nacl' # 'i386-pc-linux-gnu'
|
||||
LLVM_TARGET = get_llvm_target()
|
||||
|
||||
try:
|
||||
|
|
Загрузка…
Ссылка в новой задаче