WebKit Bugzilla
Attachment 338764 Details for
Bug 184985
: [CMake] Require GCC 6
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-184985-20180425134528.patch (text/plain), 5.18 KB, created by
Michael Catanzaro
on 2018-04-25 11:45:29 PDT
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Michael Catanzaro
Created:
2018-04-25 11:45:29 PDT
Size:
5.18 KB
patch
obsolete
>Subversion Revision: 230997 >diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog >index 34d6827d443005a444b7776ab3b9c9a90e337774..aab1ce37ba0a01562d65a1c035d3725d1359941c 100644 >--- a/Source/WTF/ChangeLog >+++ b/Source/WTF/ChangeLog >@@ -1,3 +1,15 @@ >+2018-04-25 Michael Catanzaro <mcatanzaro@igalia.com> >+ >+ [CMake] Require GCC 6 >+ https://bugs.webkit.org/show_bug.cgi?id=184985 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ 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-25 Dean Jackson <dino@apple.com> > > Make a better flag for system preview, and disable it where necessary >diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog >index b2a487929394ecbf06987c1b36c26ee7aea9a580..76f63c94365141871ad7d2c183f18c4cf6489adf 100644 >--- a/Source/WebCore/ChangeLog >+++ b/Source/WebCore/ChangeLog >@@ -1,3 +1,15 @@ >+2018-04-25 Michael Catanzaro <mcatanzaro@igalia.com> >+ >+ [CMake] Require GCC 6 >+ https://bugs.webkit.org/show_bug.cgi?id=184985 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ 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-25 Per Arne Vollan <pvollan@apple.com> > > [Win] Crash under WebCore::SimpleLineLayout::generateLineBoxTree >diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h >index c26479c3b520a095589ca85b00526f49ab92d615..1391eadf8ed1cfa280dfcdf5a3612097d73abe33 100644 >--- a/Source/WTF/wtf/Compiler.h >+++ b/Source/WTF/wtf/Compiler.h >@@ -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 >diff --git a/Source/WebCore/platform/graphics/FourCC.h b/Source/WebCore/platform/graphics/FourCC.h >index 1afe051f1982f6c65167b33e43d7b5aba9d33706..e12ee52853f2ea5cb7f11b27190c95674d3df691 100644 >--- a/Source/WebCore/platform/graphics/FourCC.h >+++ b/Source/WebCore/platform/graphics/FourCC.h >@@ -27,46 +27,17 @@ > > #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]) > { > 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&); >diff --git a/CMakeLists.txt b/CMakeLists.txt >index 3fb3dd58a2ba7de390faf96c6ad4c1e14c0d275b..1903d6a19ed2a59394008f42cf81668e42d2f1eb 100644 >--- a/CMakeLists.txt >+++ b/CMakeLists.txt >@@ -60,8 +60,8 @@ if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_ID} STREQU > 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 () > >diff --git a/ChangeLog b/ChangeLog >index 8e99022a87a0ab61acf4b17249535251a164b0a3..849674abbc75656ee4f340ea64046487adc0f5b4 100644 >--- a/ChangeLog >+++ b/ChangeLog >@@ -1,3 +1,14 @@ >+2018-04-25 Michael Catanzaro <mcatanzaro@igalia.com> >+ >+ [CMake] Require GCC 6 >+ https://bugs.webkit.org/show_bug.cgi?id=184985 >+ >+ Reviewed by NOBODY (OOPS!). >+ >+ Require it. >+ >+ * CMakeLists.txt: >+ > 2018-04-25 Michael Catanzaro <mcatanzaro@igalia.com> > > [GTK] Miscellaneous build cleanups
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 184985
: 338764 |
338834