Bug 940591 - Build most of js/src/jit in unified mode; r=djvj

This commit is contained in:
Ehsan Akhgari 2013-11-20 22:39:42 -05:00
parent da5895572b
commit b35b36fd1a
2 changed files with 6 additions and 6 deletions

View File

@ -1627,7 +1627,7 @@ MacroAssembler::convertValueToInt(JSContext *cx, const Value &v, Register output
break; break;
} }
case IntConversion_Truncate: case IntConversion_Truncate:
move32(Imm32(ToInt32(d)), output); move32(Imm32(js::ToInt32(d)), output);
break; break;
case IntConversion_ClampToUint8: case IntConversion_ClampToUint8:
move32(Imm32(ClampDoubleToUint8(d)), output); move32(Imm32(ClampDoubleToUint8(d)), output);

View File

@ -210,7 +210,7 @@ if CONFIG['ENABLE_TRACE_LOGGING']:
] ]
if CONFIG['ENABLE_ION']: if CONFIG['ENABLE_ION']:
SOURCES += [ UNIFIED_SOURCES += [
'jit/AliasAnalysis.cpp', 'jit/AliasAnalysis.cpp',
'jit/AsmJS.cpp', 'jit/AsmJS.cpp',
'jit/AsmJSLink.cpp', 'jit/AsmJSLink.cpp',
@ -267,7 +267,7 @@ if CONFIG['ENABLE_ION']:
'jit/VMFunctions.cpp', 'jit/VMFunctions.cpp',
] ]
if CONFIG['TARGET_CPU'].find('86') != -1: if CONFIG['TARGET_CPU'].find('86') != -1:
SOURCES += [ UNIFIED_SOURCES += [
'jit/shared/Assembler-x86-shared.cpp', 'jit/shared/Assembler-x86-shared.cpp',
'jit/shared/BaselineCompiler-x86-shared.cpp', 'jit/shared/BaselineCompiler-x86-shared.cpp',
'jit/shared/BaselineIC-x86-shared.cpp', 'jit/shared/BaselineIC-x86-shared.cpp',
@ -277,7 +277,7 @@ if CONFIG['ENABLE_ION']:
'jit/shared/MoveEmitter-x86-shared.cpp', 'jit/shared/MoveEmitter-x86-shared.cpp',
] ]
if CONFIG['TARGET_CPU'] == 'x86_64': if CONFIG['TARGET_CPU'] == 'x86_64':
SOURCES += [ UNIFIED_SOURCES += [
'jit/x64/Assembler-x64.cpp', 'jit/x64/Assembler-x64.cpp',
'jit/x64/Bailouts-x64.cpp', 'jit/x64/Bailouts-x64.cpp',
'jit/x64/BaselineCompiler-x64.cpp', 'jit/x64/BaselineCompiler-x64.cpp',
@ -288,7 +288,7 @@ if CONFIG['ENABLE_ION']:
'jit/x64/Trampoline-x64.cpp', 'jit/x64/Trampoline-x64.cpp',
] ]
else: else:
SOURCES += [ UNIFIED_SOURCES += [
'jit/x86/Assembler-x86.cpp', 'jit/x86/Assembler-x86.cpp',
'jit/x86/Bailouts-x86.cpp', 'jit/x86/Bailouts-x86.cpp',
'jit/x86/BaselineCompiler-x86.cpp', 'jit/x86/BaselineCompiler-x86.cpp',
@ -299,7 +299,7 @@ if CONFIG['ENABLE_ION']:
'jit/x86/Trampoline-x86.cpp', 'jit/x86/Trampoline-x86.cpp',
] ]
elif CONFIG['TARGET_CPU'].find('arm') != -1: elif CONFIG['TARGET_CPU'].find('arm') != -1:
SOURCES += [ UNIFIED_SOURCES += [
'jit/arm/Architecture-arm.cpp', 'jit/arm/Architecture-arm.cpp',
'jit/arm/Assembler-arm.cpp', 'jit/arm/Assembler-arm.cpp',
'jit/arm/Bailouts-arm.cpp', 'jit/arm/Bailouts-arm.cpp',