From 5166c63e9da7ebf371b7faf0afc672ce494408f7 Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Thu, 10 Feb 2022 12:00:03 -0500 Subject: chromium 100 maybe? --- .../chromium-100-ByteSwapUintPtrT-constexpr.patch | 56 ++++++ .../files/chromium-100-LayoutUnit-constexpr.patch | 31 +++ ...mium-100-PartitionFreelistEntry-namespace.patch | 26 +++ .../chromium/files/chromium-100-compiler.patch | 220 +++++++++++++++++++++ 4 files changed, 333 insertions(+) create mode 100644 www-client/chromium/files/chromium-100-ByteSwapUintPtrT-constexpr.patch create mode 100644 www-client/chromium/files/chromium-100-LayoutUnit-constexpr.patch create mode 100644 www-client/chromium/files/chromium-100-PartitionFreelistEntry-namespace.patch create mode 100644 www-client/chromium/files/chromium-100-compiler.patch (limited to 'www-client/chromium/files') diff --git a/www-client/chromium/files/chromium-100-ByteSwapUintPtrT-constexpr.patch b/www-client/chromium/files/chromium-100-ByteSwapUintPtrT-constexpr.patch new file mode 100644 index 0000000..dc85dc2 --- /dev/null +++ b/www-client/chromium/files/chromium-100-ByteSwapUintPtrT-constexpr.patch @@ -0,0 +1,56 @@ +From 1ea2079fec7098cd0fdfabce259d65a09197532d Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Thu, 27 Jan 2022 14:36:21 +0000 +Subject: [PATCH] GCC: add constexpr to base::ByteSwapUintPtrT and + base::ByteSwap + +base::internal::EncodedPartitionFreelistEntryPtr::Transform() is +constexpr. This requires base::ByteSwapUintPtrT() and +base::ByteSwap() to be constexpr too. +--- + base/sys_byteorder.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/base/sys_byteorder.h b/base/sys_byteorder.h +index 4de2b5f..d86cc36 100644 +--- a/base/sys_byteorder.h ++++ b/base/sys_byteorder.h +@@ -22,7 +22,7 @@ + namespace base { + + // Returns a value with all bytes in |x| swapped, i.e. reverses the endianness. +-inline uint16_t ByteSwap(uint16_t x) { ++constexpr uint16_t ByteSwap(uint16_t x) { + #if defined(COMPILER_MSVC) && !defined(__clang__) + return _byteswap_ushort(x); + #else +@@ -30,7 +30,7 @@ inline uint16_t ByteSwap(uint16_t x) { + #endif + } + +-inline uint32_t ByteSwap(uint32_t x) { ++constexpr uint32_t ByteSwap(uint32_t x) { + #if defined(COMPILER_MSVC) && !defined(__clang__) + return _byteswap_ulong(x); + #else +@@ -38,7 +38,7 @@ inline uint32_t ByteSwap(uint32_t x) { + #endif + } + +-inline uint64_t ByteSwap(uint64_t x) { ++constexpr uint64_t ByteSwap(uint64_t x) { + // Per build/build_config.h, clang masquerades as MSVC on Windows. If we are + // actually using clang, we can rely on the builtin. + // +@@ -53,7 +53,7 @@ inline uint64_t ByteSwap(uint64_t x) { + #endif + } + +-inline uintptr_t ByteSwapUintPtrT(uintptr_t x) { ++constexpr uintptr_t ByteSwapUintPtrT(uintptr_t x) { + // We do it this way because some build configurations are ILP32 even when + // defined(ARCH_CPU_64_BITS). Unfortunately, we can't use sizeof in #ifs. But, + // because these conditionals are constexprs, the irrelevant branches will +-- +2.34.1 + diff --git a/www-client/chromium/files/chromium-100-LayoutUnit-constexpr.patch b/www-client/chromium/files/chromium-100-LayoutUnit-constexpr.patch new file mode 100644 index 0000000..41943c4 --- /dev/null +++ b/www-client/chromium/files/chromium-100-LayoutUnit-constexpr.patch @@ -0,0 +1,31 @@ +From 23384ca857117c7dff6627847638e0ab2b9a9e6c Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Tue, 25 Jan 2022 17:29:49 +0000 +Subject: [PATCH] GCC: default initialize member in blink::LayoutUnit + constructor + +Before C++20 the compiler is not required to check that members are +initialized before use in constexpr constructors. However, +expressions with undefined behaviour (e.g. due to unitialized data +members) is prohibited for constexpr. Default initialize to +value_ to 0 to workaround the problem. +--- + third_party/blink/renderer/platform/geometry/layout_unit.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/third_party/blink/renderer/platform/geometry/layout_unit.h b/third_party/blink/renderer/platform/geometry/layout_unit.h +index e6cbe37..d1e4f07 100644 +--- a/third_party/blink/renderer/platform/geometry/layout_unit.h ++++ b/third_party/blink/renderer/platform/geometry/layout_unit.h +@@ -95,7 +95,7 @@ class LayoutUnit { + public: + constexpr LayoutUnit() : value_(0) {} + template +- constexpr explicit LayoutUnit(IntegerType value) { ++ constexpr explicit LayoutUnit(IntegerType value) : value_(0) { + if (std::is_signed::value) + SaturatedSet(static_cast(value)); + else +-- +2.34.1 + diff --git a/www-client/chromium/files/chromium-100-PartitionFreelistEntry-namespace.patch b/www-client/chromium/files/chromium-100-PartitionFreelistEntry-namespace.patch new file mode 100644 index 0000000..0ca9956 --- /dev/null +++ b/www-client/chromium/files/chromium-100-PartitionFreelistEntry-namespace.patch @@ -0,0 +1,26 @@ +From f6490c3b85b1d6f2043c59680ac7c273b03b5a39 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Sun, 6 Feb 2022 07:58:32 +0000 +Subject: [PATCH] libstdc++: add namespace for nullptr_t in + PartitionFreelistEntry + +--- + base/allocator/partition_allocator/partition_freelist_entry.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/base/allocator/partition_allocator/partition_freelist_entry.h b/base/allocator/partition_allocator/partition_freelist_entry.h +index cb20598..850d27b 100644 +--- a/base/allocator/partition_allocator/partition_freelist_entry.h ++++ b/base/allocator/partition_allocator/partition_freelist_entry.h +@@ -86,7 +86,7 @@ class EncodedPartitionFreelistEntryPtr { + // the rationale and mechanism, respectively. + class PartitionFreelistEntry { + private: +- explicit constexpr PartitionFreelistEntry(nullptr_t) ++ explicit constexpr PartitionFreelistEntry(std::nullptr_t) + : encoded_next_(EncodedPartitionFreelistEntryPtr(nullptr)) + #if defined(PA_HAS_FREELIST_SHADOW_ENTRY) + , +-- +2.34.1 + diff --git a/www-client/chromium/files/chromium-100-compiler.patch b/www-client/chromium/files/chromium-100-compiler.patch new file mode 100644 index 0000000..e4ca9b3 --- /dev/null +++ b/www-client/chromium/files/chromium-100-compiler.patch @@ -0,0 +1,220 @@ +From 307a0f63dd9b118f4b8470ed3d7567e81fdb7a6d Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Thu, 3 Feb 2022 16:26:20 +0000 +Subject: [PATCH] Disable various compiler configs + +--- + build/config/compiler/BUILD.gn | 105 ++++++--------------------------- + 1 file changed, 17 insertions(+), 88 deletions(-) + +diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn +index 61ceb0d..7392018 100644 +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -291,9 +291,7 @@ config("compiler") { + + configs += [ + # See the definitions below. +- ":clang_revision", + ":rustc_revision", +- ":compiler_cpu_abi", + ":compiler_codegen", + ":compiler_deterministic", + ] +@@ -534,31 +532,6 @@ config("compiler") { + ldflags += [ "-Wl,-z,keep-text-section-prefix" ] + } + +- if (is_clang && !is_nacl && current_os != "zos") { +- cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] +- +- # TODO(hans): Remove this once Clang generates better optimized debug info +- # by default. https://crbug.com/765793 +- cflags += [ +- "-mllvm", +- "-instcombine-lower-dbg-declare=0", +- ] +- if (!is_debug && use_thin_lto && is_a_target_toolchain) { +- if (is_win) { +- ldflags += [ "-mllvm:-instcombine-lower-dbg-declare=0" ] +- } else { +- ldflags += [ "-Wl,-mllvm,-instcombine-lower-dbg-declare=0" ] +- } +- } +- +- # TODO(crbug.com/1235145): Investigate why/if this should be needed. +- if (is_win) { +- cflags += [ "/clang:-ffp-contract=off" ] +- } else { +- cflags += [ "-ffp-contract=off" ] +- } +- } +- + # Rust compiler setup (for either clang or rustc). + if (enable_rust) { + defines += [ "RUST_ENABLED" ] +@@ -1235,45 +1208,6 @@ config("compiler_deterministic") { + } + } + +- # Makes builds independent of absolute file path. +- if (is_clang && strip_absolute_paths_from_debug_symbols) { +- # If debug option is given, clang includes $cwd in debug info by default. +- # For such build, this flag generates reproducible obj files even we use +- # different build directory like "out/feature_a" and "out/feature_b" if +- # we build same files with same compile flag. +- # Other paths are already given in relative, no need to normalize them. +- if (is_nacl) { +- # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here. +- cflags += [ +- "-Xclang", +- "-fdebug-compilation-dir", +- "-Xclang", +- ".", +- ] +- } else { +- # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir= +- # and -fcoverage-compilation-dir=. +- cflags += [ "-ffile-compilation-dir=." ] +- } +- if (!is_win) { +- # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) +- asmflags = [ "-Wa,-fdebug-compilation-dir,." ] +- } +- +- if (is_win && use_lld) { +- if (symbol_level == 2 || (is_clang && using_sanitizer)) { +- # Absolutize source file paths for PDB. Pass the real build directory +- # if the pdb contains source-level debug information and if linker +- # reproducibility is not critical. +- ldflags += [ "/PDBSourcePath:" + rebase_path(root_build_dir) ] +- } else { +- # Use a fake fixed base directory for paths in the pdb to make the pdb +- # output fully deterministic and independent of the build directory. +- ldflags += [ "/PDBSourcePath:o:\fake\prefix" ] +- } +- } +- } +- + # Tells the compiler not to use absolute paths when passing the default + # paths to the tools it invokes. We don't want this because we don't + # really need it and it can mess up the goma cache entries. +@@ -1594,7 +1528,7 @@ config("chromium_code") { + defines = [ "_HAS_NODISCARD" ] + } + } else { +- cflags = [ "-Wall" ] ++ cflags = [] + if (treat_warnings_as_errors) { + cflags += [ "-Werror" ] + +@@ -1603,10 +1537,6 @@ config("chromium_code") { + # well. + ldflags = [ "-Werror" ] + } +- if (is_clang) { +- # Enable extra warnings for chromium_code when we control the compiler. +- cflags += [ "-Wextra" ] +- } + + # In Chromium code, we define __STDC_foo_MACROS in order to get the + # C99 macros on Mac and Linux. +@@ -1615,15 +1545,6 @@ config("chromium_code") { + "__STDC_FORMAT_MACROS", + ] + +- if (!is_debug && !using_sanitizer && current_cpu != "s390x" && +- current_cpu != "s390" && current_cpu != "ppc64" && +- current_cpu != "mips" && current_cpu != "mips64") { +- # Non-chromium code is not guaranteed to compile cleanly with +- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are +- # disabled, so only do that for Release build. +- defines += [ "_FORTIFY_SOURCE=2" ] +- } +- + if (is_mac) { + cflags_objc = [ "-Wobjc-missing-property-synthesis" ] + cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] +@@ -2026,7 +1947,8 @@ config("default_stack_frames") { + } + + # Default "optimization on" config. +-config("optimize") { ++config("optimize") { } ++config("xoptimize") { + if (is_win) { + if (chrome_pgo_phase != 2) { + # Favor size over speed, /O1 must be before the common flags. +@@ -2064,7 +1986,8 @@ config("optimize") { + } + + # Turn off optimizations. +-config("no_optimize") { ++config("no_optimize") { } ++config("xno_optimize") { + if (is_win) { + cflags = [ + "/Od", # Disable optimization. +@@ -2104,7 +2027,8 @@ config("no_optimize") { + # Turns up the optimization level. On Windows, this implies whole program + # optimization and link-time code generation which is very expensive and should + # be used sparingly. +-config("optimize_max") { ++config("optimize_max") { } ++config("xoptimize_max") { + if (is_nacl && is_nacl_irt) { + # The NaCl IRT is a special case and always wants its own config. + # Various components do: +@@ -2137,7 +2061,8 @@ config("optimize_max") { + # + # TODO(crbug.com/621335) - rework how all of these configs are related + # so that we don't need this disclaimer. +-config("optimize_speed") { ++config("optimize_speed") { } ++config("xoptimize_speed") { + if (is_nacl && is_nacl_irt) { + # The NaCl IRT is a special case and always wants its own config. + # Various components do: +@@ -2163,7 +2088,8 @@ config("optimize_speed") { + } + } + +-config("optimize_fuzzing") { ++config("optimize_fuzzing") { } ++config("xoptimize_fuzzing") { + cflags = [ "-O1" ] + common_optimize_on_cflags + rustflags = [ "-Copt-level=1" ] + ldflags = common_optimize_on_ldflags +@@ -2283,7 +2209,8 @@ config("win_pdbaltpath") { + } + + # Full symbols. +-config("symbols") { ++config("symbols") { } ++config("xsymbols") { + if (is_win) { + if (is_clang) { + cflags = [ "/Z7" ] # Debug information in the .obj files. +@@ -2411,7 +2338,8 @@ config("symbols") { + # Minimal symbols. + # This config guarantees to hold symbol for stack trace which are shown to user + # when crash happens in unittests running on buildbot. +-config("minimal_symbols") { ++config("minimal_symbols") { } ++config("xminimal_symbols") { + if (is_win) { + # Functions, files, and line tables only. + cflags = [] +@@ -2480,7 +2408,8 @@ config("minimal_symbols") { + # This configuration contains function names only. That is, the compiler is + # told to not generate debug information and the linker then just puts function + # names in the final debug information. +-config("no_symbols") { ++config("no_symbols") { } ++config("xno_symbols") { + if (is_win) { + ldflags = [ "/DEBUG" ] + +-- +2.34.1 + -- cgit v1.2.3