Changeset 164032 in webkit


Ignore:
Timestamp:
Feb 13, 2014 10:00:47 AM (10 years ago)
Author:
commit-queue@webkit.org
Message:

Code cleanup: remove gcc<4.7 guards.
​https://bugs.webkit.org/show_bug.cgi?id=128729

Patch by Tamas Gergely <​tgergely.u-szeged@partner.samsung.com> on 2014-02-13
Reviewed by Anders Carlsson.

Remove GCC_VERSION_AT_LEAST guards when it checks for pre-4.7 versions,
as WK does not compile with earlier gcc versions.

Source/JavaScriptCore:

  • assembler/MIPSAssembler.h:

(JSC::MIPSAssembler::cacheFlush):

  • interpreter/StackVisitor.cpp:

(JSC::printif):

Source/WTF:

  • wtf/Assertions.cpp:
  • wtf/Platform.h:
Location:
trunk/Source
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r164018 r164032  
     12014-02-13  Tamas Gergely  <tgergely.u-szeged@partner.samsung.com>
     2
     3        Code cleanup: remove gcc<4.7 guards.
     4        https://bugs.webkit.org/show_bug.cgi?id=128729
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Remove GCC_VERSION_AT_LEAST guards when it checks for pre-4.7 versions,
     9        as WK does not compile with earlier gcc versions.
     10
     11        * assembler/MIPSAssembler.h:
     12        (JSC::MIPSAssembler::cacheFlush):
     13        * interpreter/StackVisitor.cpp:
     14        (JSC::printif):
     15
    1162014-02-12  Mark Lam  <mark.lam@apple.com>
    217

  • trunk/Source/JavaScriptCore/assembler/MIPSAssembler.h

    r159635 r164032  
    871871    static void cacheFlush(void* code, size_t size)
    872872    {
    873 #if GCC_VERSION_AT_LEAST(4, 3, 0)
    874 #if WTF_MIPS_ISA_REV(2) && !GCC_VERSION_AT_LEAST(4, 4, 3)
    875         int lineSize;
    876         asm("rdhwr %0, $1" : "=r" (lineSize));
    877         //
    878         // Modify "start" and "end" to avoid GCC 4.3.0-4.4.2 bug in
    879         // mips_expand_synci_loop that may execute synci one more time.
    880         // "start" points to the fisrt byte of the cache line.
    881         // "end" points to the last byte of the line before the last cache line.
    882         // Because size is always a multiple of 4, this is safe to set
    883         // "end" to the last byte.
    884         //
    885         intptr_t start = reinterpret_cast<intptr_t>(code) & (-lineSize);
    886         intptr_t end = ((reinterpret_cast<intptr_t>(code) + size - 1) & (-lineSize)) - 1;
    887         __builtin___clear_cache(reinterpret_cast<char*>(start), reinterpret_cast<char*>(end));
    888 #else
    889873        intptr_t end = reinterpret_cast<intptr_t>(code) + size;
    890874        __builtin___clear_cache(reinterpret_cast<char*>(code), reinterpret_cast<char*>(end));
    891 #endif
    892 #else
    893         _flush_cache(reinterpret_cast<char*>(code), size, BCACHE);
    894 #endif
    895875    }
    896876

  • trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp

    r163844 r164032  
    348348        printIndents(indentLevels);
    349349
    350 #if COMPILER(CLANG) || (COMPILER(GCC) && GCC_VERSION_AT_LEAST(4, 6, 0))
     350#if COMPILER(CLANG) || COMPILER(GCC)
    351351#pragma GCC diagnostic push
    352352#pragma GCC diagnostic ignored "-Wformat-nonliteral"
    … …  
    356356    WTF::dataLogFV(format, argList);
    357357
    358 #if COMPILER(CLANG) || (COMPILER(GCC) && GCC_VERSION_AT_LEAST(4, 6, 0))
     358#if COMPILER(CLANG) || COMPILER(GCC)
    359359#pragma GCC diagnostic pop
    360360#endif

  • trunk/Source/WTF/ChangeLog

    r164018 r164032  
     12014-02-13  Tamas Gergely  <tgergely.u-szeged@partner.samsung.com>
     2
     3        Code cleanup: remove gcc<4.7 guards.
     4        https://bugs.webkit.org/show_bug.cgi?id=128729
     5
     6        Reviewed by Anders Carlsson.
     7
     8        Remove GCC_VERSION_AT_LEAST guards when it checks for pre-4.7 versions,
     9        as WK does not compile with earlier gcc versions.
     10
     11        * wtf/Assertions.cpp:
     12        * wtf/Platform.h:
     13
    1142014-02-12  Mark Lam  <mark.lam@apple.com>
    215

  • trunk/Source/WTF/wtf/Assertions.cpp

    r161601 r164032  
    149149}
    150150
    151 #if COMPILER(CLANG) || (COMPILER(GCC) && GCC_VERSION_AT_LEAST(4, 6, 0))
     151#if COMPILER(CLANG) || COMPILER(GCC)
    152152#pragma GCC diagnostic push
    153153#pragma GCC diagnostic ignored "-Wformat-nonliteral"
    … …  
    182182}
    183183
    184 #if COMPILER(CLANG) || (COMPILER(GCC) && GCC_VERSION_AT_LEAST(4, 6, 0))
     184#if COMPILER(CLANG) || COMPILER(GCC)
    185185#pragma GCC diagnostic pop
    186186#endif

  • trunk/Source/WTF/wtf/Platform.h

    r163887 r164032  
    299299#endif
    300300
    301 #if CPU(ARM_NEON) && (!COMPILER(GCC) || GCC_VERSION_AT_LEAST(4, 7, 0))
     301#if CPU(ARM_NEON)
    302302// All NEON intrinsics usage can be disabled by this macro.
    303303#define HAVE_ARM_NEON_INTRINSICS 1
    … …  
    643643#endif
    644644
    645 /* Disable the JIT on versions of GCC prior to 4.1 */
    646 #if !defined(ENABLE_JIT) && COMPILER(GCC) && !GCC_VERSION_AT_LEAST(4, 1, 0)
    647 #define ENABLE_JIT 0
    648 #endif
    649 
    650645/* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms except Windows. */
    651646#if !defined(ENABLE_JIT) \
    652647    && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)) \
    653     && (OS(DARWIN) || !COMPILER(GCC) || GCC_VERSION_AT_LEAST(4, 1, 0)) \
    654648    && !OS(WINCE) \
    655649    && !OS(WINDOWS)
Note: See TracChangeset for help on using the changeset viewer.