88 lines
3.0 KiB
Diff
88 lines
3.0 KiB
Diff
|
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
|
||
|
|
index fcc00ee..0c1b861 100644
|
||
|
|
--- a/build/config/BUILDCONFIG.gn
|
||
|
|
+++ b/build/config/BUILDCONFIG.gn
|
||
|
|
|
||
|
|
@@ -522,7 +522,6 @@
|
||
|
|
"//build/config/compiler:afdo",
|
||
|
|
"//build/config/compiler:afdo_optimize_size",
|
||
|
|
"//build/config/compiler:compiler",
|
||
|
|
- "//build/config/compiler:clang_stackrealign",
|
||
|
|
"//build/config/compiler:compiler_arm_fpu",
|
||
|
|
"//build/config/compiler:compiler_arm_thumb",
|
||
|
|
"//build/config/compiler:chromium_code",
|
||
|
|
|
||
|
|
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
|
||
|
|
index a703551..71f8f18 100644
|
||
|
|
--- a/build/config/compiler/BUILD.gn
|
||
|
|
+++ b/build/config/compiler/BUILD.gn
|
||
|
|
|
||
|
|
@@ -1079,20 +1079,6 @@
|
||
|
|
asmflags = cflags
|
||
|
|
}
|
||
|
|
|
||
|
|
-# This is separate from :compiler_codegen (and not even a sub-config there)
|
||
|
|
-# so that some targets can remove it from the list with:
|
||
|
|
-# 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) {
|
||
|
|
- cflags = [
|
||
|
|
- # Align the stack on 16-byte boundaries, http://crbug.com/418554.
|
||
|
|
- "-mstack-alignment=16",
|
||
|
|
- "-mstackrealign",
|
||
|
|
- ]
|
||
|
|
- }
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
config("clang_revision") {
|
||
|
|
if (is_clang && clang_base_path == default_clang_base_path) {
|
||
|
|
update_args = [
|
||
|
|
|
||
|
|
diff --git a/components/crash/content/app/BUILD.gn b/components/crash/content/app/BUILD.gn
|
||
|
|
index d4fa4c3..ec55236 100644
|
||
|
|
--- a/components/crash/content/app/BUILD.gn
|
||
|
|
+++ b/components/crash/content/app/BUILD.gn
|
||
|
|
|
||
|
|
@@ -76,11 +76,6 @@
|
||
|
|
"//third_party/breakpad:client",
|
||
|
|
"//third_party/crashpad/crashpad/snapshot",
|
||
|
|
]
|
||
|
|
-
|
||
|
|
- # Clang's -mstackrealign doesn't work well with
|
||
|
|
- # linux_syscall_support.h hand written asm syscalls.
|
||
|
|
- # See https://crbug.com/556393
|
||
|
|
- configs -= [ "//build/config/compiler:clang_stackrealign" ]
|
||
|
|
}
|
||
|
|
|
||
|
|
if (is_win) {
|
||
|
|
|
||
|
|
diff --git a/third_party/breakpad/BUILD.gn b/third_party/breakpad/BUILD.gn
|
||
|
|
index 01ea9fc..95b71bc 100644
|
||
|
|
--- a/third_party/breakpad/BUILD.gn
|
||
|
|
+++ b/third_party/breakpad/BUILD.gn
|
||
|
|
|
||
|
|
@@ -623,11 +623,6 @@
|
||
|
|
cflags = [ "-marm" ]
|
||
|
|
}
|
||
|
|
|
||
|
|
- # Clang's -mstackrealign doesn't work well with
|
||
|
|
- # linux_syscall_support.h hand written asm syscalls.
|
||
|
|
- # See https://crbug.com/556393
|
||
|
|
- configs -= [ "//build/config/compiler:clang_stackrealign" ]
|
||
|
|
-
|
||
|
|
if (is_android) {
|
||
|
|
sources += [ "breakpad/src/common/android/breakpad_getcontext.S" ]
|
||
|
|
}
|
||
|
|
@@ -737,11 +732,6 @@
|
||
|
|
extra_dist_files = [ "$root_out_dir/linux_dumper_unittest_helper" ]
|
||
|
|
}
|
||
|
|
|
||
|
|
- # Clang's -mstackrealign doesn't work well with
|
||
|
|
- # linux_syscall_support.h hand written asm syscalls.
|
||
|
|
- # See https://crbug.com/556393
|
||
|
|
- configs -= [ "//build/config/compiler:clang_stackrealign" ]
|
||
|
|
-
|
||
|
|
# Add the breakpad unittest config at the end to override all configs.
|
||
|
|
configs += [ ":breakpad_unittest_config" ]
|
||
|
|
}
|