Backed out changeset 8ab0a696d2ec (bug 978456) since bug 939562 has now been backed out

This commit is contained in:
Ed Morley 2014-03-03 16:56:42 +00:00
Родитель c8041c17a7
Коммит 12e3d71d6d
1 изменённых файлов: 16 добавлений и 17 удалений

Просмотреть файл

@ -5775,6 +5775,22 @@ SetRuntimeOptions(JSRuntime *rt, const OptionParser &op)
rt->setParallelIonCompilationEnabled(parallelCompilation);
#endif
#if defined(JS_CODEGEN_X86) && defined(DEBUG)
if (op.getBoolOption("no-fpu"))
JSC::MacroAssembler::SetFloatingPointDisabled();
#endif
#if (defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64)) && defined(DEBUG)
if (op.getBoolOption("no-sse3")) {
JSC::MacroAssembler::SetSSE3Disabled();
PropagateFlagToNestedShells("--no-sse3");
}
if (op.getBoolOption("no-sse4")) {
JSC::MacroAssembler::SetSSE4Disabled();
PropagateFlagToNestedShells("--no-sse4");
}
#endif
#endif // JS_ION
#ifdef JS_ARM_SIMULATOR
@ -6032,25 +6048,8 @@ main(int argc, char **argv, char **envp)
* allocations as possible.
*/
OOM_printAllocationCount = op.getBoolOption('O');
#if defined(JS_CODEGEN_X86) && defined(JS_ION)
if (op.getBoolOption("no-fpu"))
JSC::MacroAssembler::SetFloatingPointDisabled();
#endif
#if (defined(JS_CODEGEN_X86) || defined(JS_CODEGEN_X64)) && defined(JS_ION)
if (op.getBoolOption("no-sse3")) {
JSC::MacroAssembler::SetSSE3Disabled();
PropagateFlagToNestedShells("--no-sse3");
}
if (op.getBoolOption("no-sse4")) {
JSC::MacroAssembler::SetSSE4Disabled();
PropagateFlagToNestedShells("--no-sse4");
}
#endif
#endif // DEBUG
// Start the engine.
if (!JS_Init())
return 1;