Title: [231152] trunk
- Revision
- 231152
- Author
- [email protected]
- Date
- 2018-04-29 10:29:56 -0700 (Sun, 29 Apr 2018)
Log Message
[CMake] Require GCC 6
https://bugs.webkit.org/show_bug.cgi?id=184985
Reviewed by Alex Christensen.
.:
Require it.
* CMakeLists.txt:
Source/WebCore:
Remove a GCC 5 fallback path. This seems to be the only such fallback path in WebKit.
* platform/graphics/FourCC.h:
(WebCore::FourCC::FourCC):
Source/WTF:
Stop enforcing GCC version in Compiler.h. It's better to do this in the build system. And I
don't like having the same check in two different places.
* wtf/Compiler.h:
Modified Paths
Diff
Modified: trunk/CMakeLists.txt (231151 => 231152)
--- trunk/CMakeLists.txt 2018-04-29 17:29:13 UTC (rev 231151)
+++ trunk/CMakeLists.txt 2018-04-29 17:29:56 UTC (rev 231152)
@@ -60,8 +60,8 @@
endif ()
if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
- if (${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS "5.0.0")
- message(FATAL_ERROR "GCC 5.0.0 is required to build WebKitGTK+, use a newer GCC version or clang")
+ if (${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS "6.0.0")
+ message(FATAL_ERROR "GCC 6.0.0 is required to build WebKitGTK+, use a newer GCC version or clang")
endif ()
endif ()
Modified: trunk/ChangeLog (231151 => 231152)
--- trunk/ChangeLog 2018-04-29 17:29:13 UTC (rev 231151)
+++ trunk/ChangeLog 2018-04-29 17:29:56 UTC (rev 231152)
@@ -1,3 +1,14 @@
+2018-04-29 Michael Catanzaro <[email protected]>
+
+ [CMake] Require GCC 6
+ https://bugs.webkit.org/show_bug.cgi?id=184985
+
+ Reviewed by Alex Christensen.
+
+ Require it.
+
+ * CMakeLists.txt:
+
2018-04-26 Daniel Bates <[email protected]>
ASSERTION FAILED: ASSERT(!containsImage || MIMETypeRegistry::isSupportedImageResourceMIMEType([resource MIMEType])) in -[NSPasteboard(WebExtras) _web_writePromisedRTFDFromArchive:containsImage:]
Modified: trunk/Source/WTF/ChangeLog (231151 => 231152)
--- trunk/Source/WTF/ChangeLog 2018-04-29 17:29:13 UTC (rev 231151)
+++ trunk/Source/WTF/ChangeLog 2018-04-29 17:29:56 UTC (rev 231152)
@@ -1,3 +1,15 @@
+2018-04-29 Michael Catanzaro <[email protected]>
+
+ [CMake] Require GCC 6
+ https://bugs.webkit.org/show_bug.cgi?id=184985
+
+ Reviewed by Alex Christensen.
+
+ Stop enforcing GCC version in Compiler.h. It's better to do this in the build system. And I
+ don't like having the same check in two different places.
+
+ * wtf/Compiler.h:
+
2018-04-29 Geoffrey Garen <[email protected]>
WordLock doesn't need per-thread data
Modified: trunk/Source/WTF/wtf/Compiler.h (231151 => 231152)
--- trunk/Source/WTF/wtf/Compiler.h 2018-04-29 17:29:13 UTC (rev 231151)
+++ trunk/Source/WTF/wtf/Compiler.h 2018-04-29 17:29:56 UTC (rev 231152)
@@ -92,10 +92,6 @@
#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
#define GCC_VERSION_AT_LEAST(major, minor, patch) (GCC_VERSION >= (major * 10000 + minor * 100 + patch))
-#if !GCC_VERSION_AT_LEAST(5, 0, 0)
-#error "Please use a newer version of GCC. WebKit requires GCC 5.0.0 or newer to compile."
-#endif
-
#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
#define WTF_COMPILER_SUPPORTS_C_STATIC_ASSERT 1
#endif
Modified: trunk/Source/WebCore/ChangeLog (231151 => 231152)
--- trunk/Source/WebCore/ChangeLog 2018-04-29 17:29:13 UTC (rev 231151)
+++ trunk/Source/WebCore/ChangeLog 2018-04-29 17:29:56 UTC (rev 231152)
@@ -1,3 +1,15 @@
+2018-04-29 Michael Catanzaro <[email protected]>
+
+ [CMake] Require GCC 6
+ https://bugs.webkit.org/show_bug.cgi?id=184985
+
+ Reviewed by Alex Christensen.
+
+ Remove a GCC 5 fallback path. This seems to be the only such fallback path in WebKit.
+
+ * platform/graphics/FourCC.h:
+ (WebCore::FourCC::FourCC):
+
2018-04-29 Zalan Bujtas <[email protected]>
[LFC] Implement Display::Box functions
Modified: trunk/Source/WebCore/platform/graphics/FourCC.h (231151 => 231152)
--- trunk/Source/WebCore/platform/graphics/FourCC.h 2018-04-29 17:29:13 UTC (rev 231151)
+++ trunk/Source/WebCore/platform/graphics/FourCC.h 2018-04-29 17:29:56 UTC (rev 231152)
@@ -27,39 +27,11 @@
#include <wtf/text/WTFString.h>
-// FIXME: Remove this messy fallback path and require GCC 6 in May 2018.
-#if COMPILER(GCC)
-#if !GCC_VERSION_AT_LEAST(6, 0, 0)
-#define NEED_FOURCC_LEGACY_CONSTRUCTOR
-#include <cstring>
-#endif
-#endif
-
namespace WebCore {
struct FourCC {
WEBCORE_EXPORT FourCC(uint32_t value) : value(value) { }
-#ifdef NEED_FOURCC_LEGACY_CONSTRUCTOR
- // This constructor is risky because it creates ambiguous function
- // calls that will not exist except with old versions of GCC: the
- // initialization FourCC { 0 } is valid only when this legacy
- // constructor is not enabled, because the uint32_t constructor and
- // this constructor are equally-appropriate options. So the more
- // verbose initialization FourCC { uint32_t { 0 } } is required, but
- // developers will not realize this unless they use an old version of
- // GCC. Bad.
- FourCC(const char* data)
- {
- if (!data) {
- value = 0;
- return;
- }
- RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(strlen(data) == 4);
- value = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
- }
-#undef NEED_FOURCC_LEGACY_CONSTRUCTOR
-#else
template<std::size_t N>
constexpr FourCC(const char (&data)[N])
{
@@ -66,7 +38,6 @@
static_assert((N - 1) == 4, "FourCC literals must be exactly 4 characters long");
value = data[0] << 24 | data[1] << 16 | data[2] << 8 | data[3];
}
-#endif
String toString() const;
WEBCORE_EXPORT static std::optional<FourCC> fromString(const String&);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
