View | Details | Raw Unified | Return to bug 32732
Collapse All | Expand All

(-)webkitgtk-2.4.11/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h.orig (-3 / +6 lines)
Lines 1542-1548 Link Here
1542
#if OS(MAC_OS_X)
1542
#if OS(MAC_OS_X)
1543
1543
1544
    // All X86 Macs are guaranteed to support at least SSE2,
1544
    // All X86 Macs are guaranteed to support at least SSE2,
1545
    static bool isSSE2Present()
1545
    //static 
1546
    bool isSSE2Present()
1546
    {
1547
    {
1547
        return true;
1548
        return true;
1548
    }
1549
    }
Lines 1555-1561 Link Here
1555
        NoSSE2
1556
        NoSSE2
1556
    };
1557
    };
1557
1558
1558
    static bool isSSE2Present()
1559
    //static 
1560
    bool isSSE2Present()
1559
    {
1561
    {
1560
        if (s_sse2CheckState == NotCheckedSSE2) {
1562
        if (s_sse2CheckState == NotCheckedSSE2) {
1561
            // Default the flags value to zero; if the compiler is
1563
            // Default the flags value to zero; if the compiler is
Lines 1595-1601 Link Here
1595
1597
1596
    // On x86-64 we should never be checking for SSE2 in a non-debug build,
1598
    // On x86-64 we should never be checking for SSE2 in a non-debug build,
1597
    // but non debug add this method to keep the asserts above happy.
1599
    // but non debug add this method to keep the asserts above happy.
1598
    static bool isSSE2Present()
1600
    //static 
1601
    bool isSSE2Present()
1599
    {
1602
    {
1600
        return true;
1603
        return true;
1601
    }
1604
    }
(-)webkitgtk-2.4.11/Source/JavaScriptCore/runtime/VM.cpp.orig (+6 lines)
Lines 123-128 Link Here
123
// just checks for ENABLE(JIT) or ENABLE(YARR_JIT) with this premise in mind.
123
// just checks for ENABLE(JIT) or ENABLE(YARR_JIT) with this premise in mind.
124
124
125
#if ENABLE(ASSEMBLER)
125
#if ENABLE(ASSEMBLER)
126
127
extern bool isSSE2Present(); //FIXME: now made non-static in Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h
128
126
static bool enableAssembler(ExecutableAllocator& executableAllocator)
129
static bool enableAssembler(ExecutableAllocator& executableAllocator)
127
{
130
{
128
    if (!Options::useJIT() && !Options::useRegExpJIT())
131
    if (!Options::useJIT() && !Options::useRegExpJIT())
Lines 134-139 Link Here
134
        return false;
137
        return false;
135
    }
138
    }
136
139
140
    if (!isSSE2Present()) 
141
	    return false;
142
137
#if USE(CF)
143
#if USE(CF)
138
#if COMPILER(GCC) && !COMPILER(CLANG)
144
#if COMPILER(GCC) && !COMPILER(CLANG)
139
    // FIXME: remove this once the EWS have been upgraded to LLVM.
145
    // FIXME: remove this once the EWS have been upgraded to LLVM.

Return to bug 32732