Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (164031 => 164032)
--- trunk/Source/_javascript_Core/ChangeLog 2014-02-13 17:30:18 UTC (rev 164031)
+++ trunk/Source/_javascript_Core/ChangeLog 2014-02-13 18:00:47 UTC (rev 164032)
@@ -1,3 +1,18 @@
+2014-02-13 Tamas Gergely <[email protected]>
+
+ Code cleanup: remove gcc<4.7 guards.
+ https://bugs.webkit.org/show_bug.cgi?id=128729
+
+ 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.
+
+ * assembler/MIPSAssembler.h:
+ (JSC::MIPSAssembler::cacheFlush):
+ * interpreter/StackVisitor.cpp:
+ (JSC::printif):
+
2014-02-12 Mark Lam <[email protected]>
No need to save reservedZoneSize when dropping the JSLock.
Modified: trunk/Source/_javascript_Core/assembler/MIPSAssembler.h (164031 => 164032)
--- trunk/Source/_javascript_Core/assembler/MIPSAssembler.h 2014-02-13 17:30:18 UTC (rev 164031)
+++ trunk/Source/_javascript_Core/assembler/MIPSAssembler.h 2014-02-13 18:00:47 UTC (rev 164032)
@@ -870,28 +870,8 @@
static void cacheFlush(void* code, size_t size)
{
-#if GCC_VERSION_AT_LEAST(4, 3, 0)
-#if WTF_MIPS_ISA_REV(2) && !GCC_VERSION_AT_LEAST(4, 4, 3)
- int lineSize;
- asm("rdhwr %0, $1" : "=r" (lineSize));
- //
- // Modify "start" and "end" to avoid GCC 4.3.0-4.4.2 bug in
- // mips_expand_synci_loop that may execute synci one more time.
- // "start" points to the fisrt byte of the cache line.
- // "end" points to the last byte of the line before the last cache line.
- // Because size is always a multiple of 4, this is safe to set
- // "end" to the last byte.
- //
- intptr_t start = reinterpret_cast<intptr_t>(code) & (-lineSize);
- intptr_t end = ((reinterpret_cast<intptr_t>(code) + size - 1) & (-lineSize)) - 1;
- __builtin___clear_cache(reinterpret_cast<char*>(start), reinterpret_cast<char*>(end));
-#else
intptr_t end = reinterpret_cast<intptr_t>(code) + size;
__builtin___clear_cache(reinterpret_cast<char*>(code), reinterpret_cast<char*>(end));
-#endif
-#else
- _flush_cache(reinterpret_cast<char*>(code), size, BCACHE);
-#endif
}
static ptrdiff_t maxJumpReplacementSize()
Modified: trunk/Source/_javascript_Core/interpreter/StackVisitor.cpp (164031 => 164032)
--- trunk/Source/_javascript_Core/interpreter/StackVisitor.cpp 2014-02-13 17:30:18 UTC (rev 164031)
+++ trunk/Source/_javascript_Core/interpreter/StackVisitor.cpp 2014-02-13 18:00:47 UTC (rev 164032)
@@ -347,7 +347,7 @@
if (indentLevels)
printIndents(indentLevels);
-#if COMPILER(CLANG) || (COMPILER(GCC) && GCC_VERSION_AT_LEAST(4, 6, 0))
+#if COMPILER(CLANG) || COMPILER(GCC)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
#pragma GCC diagnostic ignored "-Wmissing-format-attribute"
@@ -355,7 +355,7 @@
WTF::dataLogFV(format, argList);
-#if COMPILER(CLANG) || (COMPILER(GCC) && GCC_VERSION_AT_LEAST(4, 6, 0))
+#if COMPILER(CLANG) || COMPILER(GCC)
#pragma GCC diagnostic pop
#endif
Modified: trunk/Source/WTF/ChangeLog (164031 => 164032)
--- trunk/Source/WTF/ChangeLog 2014-02-13 17:30:18 UTC (rev 164031)
+++ trunk/Source/WTF/ChangeLog 2014-02-13 18:00:47 UTC (rev 164032)
@@ -1,3 +1,16 @@
+2014-02-13 Tamas Gergely <[email protected]>
+
+ Code cleanup: remove gcc<4.7 guards.
+ https://bugs.webkit.org/show_bug.cgi?id=128729
+
+ 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.
+
+ * wtf/Assertions.cpp:
+ * wtf/Platform.h:
+
2014-02-12 Mark Lam <[email protected]>
No need to save reservedZoneSize when dropping the JSLock.
Modified: trunk/Source/WTF/wtf/Assertions.cpp (164031 => 164032)
--- trunk/Source/WTF/wtf/Assertions.cpp 2014-02-13 17:30:18 UTC (rev 164031)
+++ trunk/Source/WTF/wtf/Assertions.cpp 2014-02-13 18:00:47 UTC (rev 164032)
@@ -148,7 +148,7 @@
vfprintf(stderr, format, args);
}
-#if COMPILER(CLANG) || (COMPILER(GCC) && GCC_VERSION_AT_LEAST(4, 6, 0))
+#if COMPILER(CLANG) || COMPILER(GCC)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
#endif
@@ -181,7 +181,7 @@
vprintf_stderr_common(formatWithNewline.get(), args);
}
-#if COMPILER(CLANG) || (COMPILER(GCC) && GCC_VERSION_AT_LEAST(4, 6, 0))
+#if COMPILER(CLANG) || COMPILER(GCC)
#pragma GCC diagnostic pop
#endif
Modified: trunk/Source/WTF/wtf/Platform.h (164031 => 164032)
--- trunk/Source/WTF/wtf/Platform.h 2014-02-13 17:30:18 UTC (rev 164031)
+++ trunk/Source/WTF/wtf/Platform.h 2014-02-13 18:00:47 UTC (rev 164032)
@@ -298,7 +298,7 @@
#define WTF_CPU_ARM_NEON 1
#endif
-#if CPU(ARM_NEON) && (!COMPILER(GCC) || GCC_VERSION_AT_LEAST(4, 7, 0))
+#if CPU(ARM_NEON)
// All NEON intrinsics usage can be disabled by this macro.
#define HAVE_ARM_NEON_INTRINSICS 1
#endif
@@ -642,15 +642,9 @@
#define ENABLE_FTL_JIT 0
#endif
-/* Disable the JIT on versions of GCC prior to 4.1 */
-#if !defined(ENABLE_JIT) && COMPILER(GCC) && !GCC_VERSION_AT_LEAST(4, 1, 0)
-#define ENABLE_JIT 0
-#endif
-
/* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms except Windows. */
#if !defined(ENABLE_JIT) \
&& (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)) \
- && (OS(DARWIN) || !COMPILER(GCC) || GCC_VERSION_AT_LEAST(4, 1, 0)) \
&& !OS(WINCE) \
&& !OS(WINDOWS)
#define ENABLE_JIT 1
