diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2015-03-30 18:06:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-30 18:07:00 +0000 |
| commit | 8302c75ad26e9431351bcbf5152ffd89843421f3 (patch) | |
| tree | 964b4989fa2b36caac675c12385da5da7deb4c07 /build | |
| parent | b7fda9d0bf5df0ee6af2ba9163986cac196e9c0c (diff) | |
| parent | 81696d2de5b29f6c3c160b4c949c48e0002559d2 (diff) | |
| download | ndk-8302c75ad26e9431351bcbf5152ffd89843421f3.tar.gz | |
Merge "Compile x86/x86_64 STL with -mstackrealign"
Diffstat (limited to 'build')
| -rwxr-xr-x | build/tools/build-cxx-stl.sh | 6 | ||||
| -rwxr-xr-x | build/tools/build-gnu-libstdc++.sh | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/build/tools/build-cxx-stl.sh b/build/tools/build-cxx-stl.sh index eaf6a9ffe..ce16e9bc7 100755 --- a/build/tools/build-cxx-stl.sh +++ b/build/tools/build-cxx-stl.sh @@ -537,6 +537,12 @@ build_stl_libs_for_abi () EXTRA_CFLAGS="-mfix-cortex-a53-835769" EXTRA_CXXFLAGS="-mfix-cortex-a53-835769" ;; + x86|x86_64) + # ToDo: remove the following once all x86-based device call JNI function with + # stack aligned to 16-byte + EXTRA_CFLAGS="-mstackrealign" + EXTRA_CXXFLAGS="-mstackrealign" + ;; mips32r6) EXTRA_CFLAGS="-mips32r6" EXTRA_CXXFLAGS="-mips32r6" diff --git a/build/tools/build-gnu-libstdc++.sh b/build/tools/build-gnu-libstdc++.sh index 90c8ee214..6e24871a6 100755 --- a/build/tools/build-gnu-libstdc++.sh +++ b/build/tools/build-gnu-libstdc++.sh @@ -184,9 +184,15 @@ build_gnustl_for_abi () ;; x86) BUILD_HOST=i686-linux-android + # ToDo: remove the following once all x86-based device call JNI function with + # stack aligned to 16-byte + EXTRA_CFLAGS="$EXTRA_CFLAGS -mstackrealign" ;; x86_64) BUILD_HOST=x86_64-linux-android + # ToDo: remove the following once all x86-based device call JNI function with + # stack aligned to 16-byte + EXTRA_CFLAGS="$EXTRA_CFLAGS -mstackrealign" ;; mips) BUILD_HOST=mipsel-linux-android |