| Index: breakpad/BUILD.gn
 | 
| diff --git a/breakpad/BUILD.gn b/breakpad/BUILD.gn
 | 
| index 233c5971598836d7834ca50e350680729aae781c..f3cf53a034cab938eea45f717cee3b1b96a64270 100644
 | 
| --- a/breakpad/BUILD.gn
 | 
| +++ b/breakpad/BUILD.gn
 | 
| @@ -545,6 +545,13 @@ 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" ]
 | 
| +    }
 | 
| +
 | 
|      if (is_android) {
 | 
|        sources += [ "src/common/android/breakpad_getcontext.S" ]
 | 
|      }
 | 
| @@ -650,6 +657,13 @@ if (is_linux || is_android) {
 | 
|        libs = [ "log" ]
 | 
|        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" ]
 | 
| +    }
 | 
|    }
 | 
|  
 | 
|    executable("linux_dumper_unittest_helper") {
 | 
| 
 |