diff options
author | Mike Gilbert <floppym@gentoo.org> | 2018-04-30 19:26:26 -0400 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2018-04-30 19:26:26 -0400 |
commit | ba6e7372f34d1760309b03615ad069fda5d916a7 (patch) | |
tree | 3b0148611f74bfcc1d641c7074343602bb0923a3 /www-client/chromium/files | |
parent | mail-client/roundcube: stable ALLARCH (diff) | |
download | gentoo-ba6e7372f34d1760309b03615ad069fda5d916a7.tar.gz gentoo-ba6e7372f34d1760309b03615ad069fda5d916a7.tar.bz2 gentoo-ba6e7372f34d1760309b03615ad069fda5d916a7.zip |
www-client/chromium: dev channel bump (68.0.3409.2)
Package-Manager: Portage-2.3.31_p60, Repoman-2.3.9_p116
Diffstat (limited to 'www-client/chromium/files')
-rw-r--r-- | www-client/chromium/files/chromium-compiler-r1.patch | 174 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-gn-bootstrap-r23.patch | 56 |
2 files changed, 230 insertions, 0 deletions
diff --git a/www-client/chromium/files/chromium-compiler-r1.patch b/www-client/chromium/files/chromium-compiler-r1.patch new file mode 100644 index 000000000000..3c75c1d96dff --- /dev/null +++ b/www-client/chromium/files/chromium-compiler-r1.patch @@ -0,0 +1,174 @@ +From f1e0c5fc3b81053c8851efde9ca77e04c77d4563 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Wed, 25 Apr 2018 13:22:49 -0400 +Subject: [PATCH] Disable various compiler configs + +--- + build/config/compiler/BUILD.gn | 67 +++++++++------------------------- + 1 file changed, 18 insertions(+), 49 deletions(-) + +diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn +index 3dbf872f7038..f8b2dcc9b026 100644 +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -222,8 +222,6 @@ config("compiler") { + + configs += [ + # See the definitions below. +- ":clang_revision", +- ":compiler_cpu_abi", + ":compiler_codegen", + ] + +@@ -474,24 +472,6 @@ config("compiler") { + cflags += [ "-fcolor-diagnostics" ] + } + +- if (is_clang && !is_nacl && current_toolchain == host_toolchain && +- target_os != "chromeos") { +- cflags += [ +- # TODO(hans): Remove this once Clang generates better optimized debug info +- # by default. https://crbug.com/765793 +- "-Xclang", +- "-mllvm", +- "-Xclang", +- "-instcombine-lower-dbg-declare=0", +- +- # TODO(rnk): Remove this once it's the default. https://crbug.com/793819 +- "-Xclang", +- "-mllvm", +- "-Xclang", +- "-fast-isel-sink-local-values=1", +- ] +- } +- + # Print absolute paths in diagnostics. There is no precedent for doing this + # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and + # Windows developers rely on it (crbug.com/636109) so only do this on Windows. +@@ -1403,10 +1383,6 @@ config("default_warnings") { + + # TODO(hans): https://crbug.com/766891 + "-Wno-null-pointer-arithmetic", +- +- # Ignore warnings about MSVC optimization pragmas. +- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314 +- "-Wno-ignored-pragma-optimize", + ] + } else if (use_xcode_clang) { + cflags += [ +@@ -1450,22 +1426,6 @@ config("chromium_code") { + "__STDC_FORMAT_MACROS", + ] + +- if (!is_debug && !using_sanitizer && +- (!is_linux || !is_clang || is_official_build) && +- current_cpu != "s390x" && current_cpu != "s390" && +- current_cpu != "ppc64" && current_cpu != "ppc64" && +- current_cpu != "mips" && current_cpu != "mips64") { +- # _FORTIFY_SOURCE isn't really supported by Clang now, see +- # http://llvm.org/bugs/show_bug.cgi?id=16821. +- # It seems to work fine with Ubuntu 12 headers though, so use it in +- # official builds. +- # +- # 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 || is_ios) { + cflags_objc = [ "-Wobjc-missing-property-synthesis" ] + cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] +@@ -1799,7 +1759,8 @@ config("default_stack_frames") { + } + + # Default "optimization on" config. +-config("optimize") { ++config("optimize") { } ++config("xoptimize") { + if (is_win) { + # TODO(thakis): Remove is_clang here, https://crbug.com/598772 + if (is_official_build && full_wpo_on_official && !is_clang) { +@@ -1833,7 +1794,8 @@ config("optimize") { + } + + # Same config as 'optimize' but without the WPO flag. +-config("optimize_no_wpo") { ++config("optimize_no_wpo") { } ++config("xoptimize_no_wpo") { + if (is_win) { + # Favor size over speed, /O1 must be before the common flags. The GYP + # build also specifies /Os and /GF but these are implied by /O1. +@@ -1856,7 +1818,8 @@ config("optimize_no_wpo") { + } + + # Turn off optimizations. +-config("no_optimize") { ++config("no_optimize") { } ++config("xno_optimize") { + if (is_win) { + cflags = [ + "/Od", # Disable optimization. +@@ -1880,7 +1843,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: +@@ -1927,7 +1891,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: +@@ -1965,7 +1930,8 @@ config("optimize_speed") { + } + } + +-config("optimize_fuzzing") { ++config("optimize_fuzzing") { } ++config("xoptimize_fuzzing") { + cflags = [ "-O1" ] + common_optimize_on_cflags + ldflags = common_optimize_on_ldflags + visibility = [ ":default_optimization" ] +@@ -2047,7 +2013,8 @@ config("afdo") { + # configs += [ "//build/config/compiler:symbols" ] + + # Full symbols. +-config("symbols") { ++config("symbols") { } ++config("xsymbols") { + if (is_win) { + if (use_goma || is_clang) { + # Note that with VC++ this requires is_win_fastlink, enforced elsewhere. +@@ -2139,7 +2106,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) { + # Linker symbols for backtraces only. + cflags = [] +@@ -2170,7 +2138,8 @@ config("minimal_symbols") { + } + + # No symbols. +-config("no_symbols") { ++config("no_symbols") { } ++config("xno_symbols") { + if (!is_win) { + cflags = [ "-g0" ] + asmflags = cflags +-- +2.17.0 + diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r23.patch b/www-client/chromium/files/chromium-gn-bootstrap-r23.patch new file mode 100644 index 000000000000..e826a4dfc37b --- /dev/null +++ b/www-client/chromium/files/chromium-gn-bootstrap-r23.patch @@ -0,0 +1,56 @@ +From 0d3bbfb6b8ba05af199b49f5dd71d842f6acffda Mon Sep 17 00:00:00 2001 +From: Tom Anderson <thomasanderson@chromium.org> +Date: Fri, 27 Apr 2018 18:07:35 +0000 +Subject: [PATCH] Fix gn bootstrap + +BUG=837312 +R=dpranke + +Change-Id: Ia5c57f596388a4ba325208c638fac558984202f0 +Reviewed-on: https://chromium-review.googlesource.com/1030895 +Reviewed-by: Dirk Pranke <dpranke@chromium.org> +Commit-Queue: Dirk Pranke <dpranke@chromium.org> +Cr-Commit-Position: refs/heads/master@{#554419} +--- + tools/gn/bootstrap/bootstrap.py | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py +index 7fa9f0489f5b..ebc32371acc3 100755 +--- a/tools/gn/bootstrap/bootstrap.py ++++ b/tools/gn/bootstrap/bootstrap.py +@@ -525,8 +525,11 @@ def write_gn_ninja(path, root_gen_dir, options, windows_x64_toolchain): + 'base/location.cc', + 'base/logging.cc', + 'base/md5.cc', ++ 'base/memory/platform_shared_memory_region.cc', ++ 'base/memory/read_only_shared_memory_region.cc', + 'base/memory/ref_counted.cc', + 'base/memory/ref_counted_memory.cc', ++ 'base/memory/shared_memory_mapping.cc', + 'base/memory/shared_memory_handle.cc', + 'base/memory/shared_memory_tracker.cc', + 'base/memory/weak_ptr.cc', +@@ -663,6 +666,19 @@ def write_gn_ninja(path, root_gen_dir, options, windows_x64_toolchain): + 'base/vlog.cc', + ]) + ++ if is_win: ++ static_libraries['base']['sources'].extend([ ++ 'base/memory/platform_shared_memory_region_win.cc' ++ ]) ++ elif is_mac: ++ static_libraries['base']['sources'].extend([ ++ 'base/memory/platform_shared_memory_region_mac.cc' ++ ]) ++ elif is_posix: ++ static_libraries['base']['sources'].extend([ ++ 'base/memory/platform_shared_memory_region_posix.cc' ++ ]) ++ + if is_posix: + static_libraries['base']['sources'].extend([ + 'base/base_paths_posix.cc', +-- +2.17.0 + |