diff options
Diffstat (limited to 'www/chromium/files/patch-build_config_compiler_BUILD.gn')
| -rw-r--r-- | www/chromium/files/patch-build_config_compiler_BUILD.gn | 62 |
1 files changed, 38 insertions, 24 deletions
diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn index b83d83406f7f..3a62b1bfc762 100644 --- a/www/chromium/files/patch-build_config_compiler_BUILD.gn +++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/compiler/BUILD.gn.orig 2017-08-03 00:05:04.000000000 +0200 -+++ build/config/compiler/BUILD.gn 2017-08-10 00:34:22.540754000 +0200 -@@ -45,7 +45,7 @@ +--- build/config/compiler/BUILD.gn.orig 2017-09-05 21:05:11.000000000 +0200 ++++ build/config/compiler/BUILD.gn 2017-09-11 02:57:48.188641000 +0200 +@@ -46,7 +46,7 @@ # only two architectures that are currently checked in). Turn this off when # you are using a custom toolchain and need to control -B in cflags. linux_use_bundled_binutils = @@ -9,7 +9,7 @@ (current_cpu == "x64" || current_cpu == "x86") binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin", root_build_dir) -@@ -166,7 +166,7 @@ +@@ -167,7 +167,7 @@ configs += [ "//build/config/win:compiler" ] } else if (is_android) { configs += [ "//build/config/android:compiler" ] @@ -18,7 +18,7 @@ configs += [ "//build/config/linux:compiler" ] } else if (is_nacl) { configs += [ "//build/config/nacl:compiler" ] -@@ -219,7 +219,7 @@ +@@ -222,7 +222,7 @@ # Linker warnings. if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") && !(is_android && use_order_profiling) && !is_mac && !is_ios && @@ -27,7 +27,7 @@ # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1 # crbug.com/485542 -@@ -316,7 +316,7 @@ +@@ -319,7 +319,7 @@ # Linux/Android common flags setup. # --------------------------------- @@ -36,7 +36,7 @@ if (use_pic) { cflags += [ "-fPIC" ] ldflags += [ "-fPIC" ] -@@ -493,7 +493,7 @@ +@@ -509,7 +509,7 @@ ldflags += [ "-flto" ] # Apply a lower LTO optimization level as the default is too slow. @@ -45,7 +45,7 @@ if (use_lld) { ldflags += [ "-Wl,--lto-O1" ] } else { -@@ -516,7 +516,7 @@ +@@ -532,7 +532,7 @@ # Also, when targeting ARM, without this flag, LTO produces a .text section # that is larger than the maximum call displacement, preventing the linker # from relocating calls (http://llvm.org/PR22999). @@ -54,16 +54,30 @@ if (use_lld) { ldflags += [ "-Wl,-mllvm,-function-sections", -@@ -794,7 +794,7 @@ +@@ -603,7 +603,7 @@ + cflags += [ "-mtune=$arm_tune" ] + } + } else if (current_cpu == "arm64") { +- if (is_clang && !is_android && !is_nacl) { ++ if (is_clang && !is_android && !is_nacl && !is_bsd) { + cflags += [ "--target=aarch64-linux-gnu" ] + ldflags += [ "--target=aarch64-linux-gnu" ] + } +@@ -854,11 +854,11 @@ # configs -= [ "//build/config/compiler:clang_stackrealign" ] # See https://crbug.com/556393 for details of where it must be avoided. config("clang_stackrealign") { -- if (is_clang && current_cpu == "x86" && is_linux) { -+ if (is_clang && current_cpu == "x86" && (is_linux || is_bsd)) { - cflags = [ +- if (is_clang && current_cpu == "x86" && (is_android || is_linux)) { ++ if (is_clang && current_cpu == "x86" && (is_android || is_linux || is_bsd)) { + # Android needs -mstackrealign due to a bug on ia32 Jelly Bean. + # See crbug.com/521527 + cflags = [ "-mstackrealign" ] +- if (is_linux) { ++ if (is_linux || is_bsd) { # Align the stack on 16-byte boundaries, http://crbug.com/418554. - "-mstack-alignment=16", -@@ -848,7 +848,7 @@ + cflags += [ "-mstack-alignment=16" ] + } +@@ -910,7 +910,7 @@ # smaller. if (is_win) { configs += [ "//build/config/win:runtime_library" ] @@ -72,7 +86,7 @@ configs += [ "//build/config/linux:runtime_library" ] } else if (is_ios) { configs += [ "//build/config/ios:runtime_library" ] -@@ -1111,7 +1111,7 @@ +@@ -1164,7 +1164,7 @@ "-Wno-address-of-packed-member", # TODO(hans): https://crbug.com/681136 @@ -81,21 +95,21 @@ # TODO(thakis ): https://crbug.com/683349 "-Wno-user-defined-warnings", -@@ -1162,7 +1162,7 @@ +@@ -1214,7 +1214,7 @@ ] if (!is_debug && !using_sanitizer && - (!is_linux || !is_clang || is_official_build) && + (!is_linux || !is_bsd || !is_clang || is_official_build) && current_cpu != "s390x" && current_cpu != "s390" && - current_cpu != "ppc64" && current_cpu != "ppc64") { - # _FORTIFY_SOURCE isn't really supported by Clang now, see -@@ -1669,7 +1669,7 @@ - "-g2", - ] - } else { -- cflags = [ "-g2" ] -+ cflags = [ "-g0" ] + current_cpu != "ppc64" && current_cpu != "ppc64" && + current_cpu != "mips" && current_cpu != "mips64") { +@@ -1734,7 +1734,7 @@ + # "-gdwarf-3" doesn't work with dump_syms in Chrome OS. + cflags += [ "-gdwarf-3" ] + } +- cflags += [ "-g2" ] ++ cflags += [ "-g0" ] } if (use_debug_fission) { cflags += [ "-gsplit-dwarf" ] |