diff options
| author | mcgrathr <mcgrathr@chromium.org> | 2016-01-20 12:08:57 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-20 20:09:41 +0000 |
| commit | 8a97d7152b60975275c88ad070677d5a75f344e7 (patch) | |
| tree | 6d39997b32dceaa47869c28ef6e31aae3ebc4f63 /breakpad/BUILD.gn | |
| parent | 4a8cb8e824cda4945991298c1f60877718ba7df8 (diff) | |
| download | chromium_src-8a97d7152b60975275c88ad070677d5a75f344e7.zip chromium_src-8a97d7152b60975275c88ad070677d5a75f344e7.tar.gz chromium_src-8a97d7152b60975275c88ad070677d5a75f344e7.tar.bz2 | |
GN: Move x86 Clang -mstackrealign workaround to its own config, elide it where problematic
crrev.com/365770 tried to avoid the -mstackrealign flag for building
the breakpad code, but the GN changes there were not valid. This
change refactors the problematic -mstackrealign (and related
-mstack-alignment=16) flags out of compiler_codegen into its own
config that can be removed for components building breakpad code.
BUG=418554,556393
R=brettw@chromium.org, thestig@chromium.org
Review URL: https://codereview.chromium.org/1598523002
Cr-Commit-Position: refs/heads/master@{#370464}
Diffstat (limited to 'breakpad/BUILD.gn')
| -rw-r--r-- | breakpad/BUILD.gn | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/breakpad/BUILD.gn b/breakpad/BUILD.gn index 231abcc..0b4bffc 100644 --- a/breakpad/BUILD.gn +++ b/breakpad/BUILD.gn @@ -554,12 +554,10 @@ if (is_linux || is_android) { cflags = [ "-marm" ] } - if (current_cpu == "x86" && is_clang) { - # Clang's -mstackrealign doesn't work well with - # linux_syscall_support.h hand written asm syscalls. - # See https://crbug.com/556393 - cflags -= [ "-mstackrealign" ] - } + # 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 += [ "src/common/android/breakpad_getcontext.S" ] @@ -667,12 +665,10 @@ if (is_linux || is_android) { include_dirs += [ "src/common/android/include" ] } - if (current_cpu == "x86" && is_clang) { - # Clang's -mstackrealign doesn't work well with - # linux_syscall_support.h hand written asm syscalls. - # See https://crbug.com/556393 - cflags -= [ "-mstackrealign" ] - } + # 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" ] } executable("linux_dumper_unittest_helper") { |