diff options
| author |  Adam Michael <ajmichael@google.com> | 2016-11-01 21:23:58 +0000 |
|---|---|---|
| committer |  Laszlo Csomor <laszlocsomor@google.com> | 2016-11-02 08:29:24 +0000 |
| commit | 44ac215aa33bd3f39aa247e3c51595d3624aee6b (patch) | |
| tree | 9f768f956cfa9263f10dc318655f62f8c7edfd22 /src/main/java/com | |
| parent | 472b411d3e6d8efcdbc1a019cffc89f5714b490a (diff) | |
Android native libraries compile with -mstackrealign for 32bit x86 clang.
This is a workaround for a clang bug. See
https://code.google.com/p/android/issues/detail?id=220159.
RELNOTES: Fix for Android clang++ std::stack segfault on 32bit x86. See https://code.google.com/p/android/issues/detail?id=220159
--
MOS_MIGRATED_REVID=137871199
Diffstat (limited to 'src/main/java/com')
2 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r11/X86Crosstools.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r11/X86Crosstools.java index d44c80f47c..570496dfc6 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r11/X86Crosstools.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r11/X86Crosstools.java @@ -48,6 +48,8 @@ class X86Crosstools { // clang CToolchain.Builder x86Clang = createBaseX86ClangToolchain("x86", "i686") + // Workaround for https://code.google.com/p/android/issues/detail?id=220159. + .addCompilerFlag("-mstackrealign") .setToolchainIdentifier("x86-clang3.8") .setTargetCpu("x86") diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r12/X86Crosstools.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r12/X86Crosstools.java index d61745ae3b..23ab77a50d 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r12/X86Crosstools.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/ndkcrosstools/r12/X86Crosstools.java @@ -46,6 +46,8 @@ class X86Crosstools { // clang CToolchain.Builder x86Clang = createBaseX86ClangToolchain("x86", "i686") + // Workaround for https://code.google.com/p/android/issues/detail?id=220159. + .addCompilerFlag("-mstackrealign") .setToolchainIdentifier("x86-clang3.8") .setTargetCpu("x86") .addAllToolPath(ndkPaths.createClangToolpaths("x86-4.9", "i686-linux-android", null)) |