diff options
author | Andrew Hsieh <andrewhsieh@google.com> | 2014-04-23 21:06:05 -0700 |
---|---|---|
committer | Andrew Hsieh <andrewhsieh@google.com> | 2014-04-23 21:10:25 -0700 |
commit | e63ecca9d1eaf9cf675723021df86bbe66d1235f (patch) | |
tree | a0ad8fd381555e9b96751675e4f71b115ccc7b67 /build/tools/toolchain-patches/gcc | |
parent | 85b81c40fd673f42cb15cb33fa3615dfa9ea0c60 (diff) | |
download | ndk-e63ecca9d1eaf9cf675723021df86bbe66d1235f.tar.gz |
Update NDK gcc local patches after gcc4.9 rebease
Change-Id: I88ca8648a7740372859143f08f19cc11a6c81f4f
Diffstat (limited to 'build/tools/toolchain-patches/gcc')
-rw-r--r-- | build/tools/toolchain-patches/gcc/0001-Disable-sincos-optimization.patch | 5 | ||||
-rw-r--r-- | build/tools/toolchain-patches/gcc/0002-Enable-C-exceptions-and-RTTI-by-default.patch (renamed from build/tools/toolchain-patches/gcc/0001-Enable-C-exceptions-and-RTTI-by-default.patch) | 6 | ||||
-rw-r--r-- | build/tools/toolchain-patches/gcc/0003-gcc-prevent-crash-on-Eclair-and-older-platforms.patch (renamed from build/tools/toolchain-patches/gcc/0002-gcc-prevent-crash-on-Eclair-and-older-platforms.patch) | 0 | ||||
-rw-r--r-- | build/tools/toolchain-patches/gcc/0004-Rename-libstdc++.so-to-libgnustl_shared.so.patch (renamed from build/tools/toolchain-patches/gcc/0003-Rename-libstdc++.so-to-libgnustl_shared.so.patch) | 0 |
4 files changed, 6 insertions, 5 deletions
diff --git a/build/tools/toolchain-patches/gcc/0001-Disable-sincos-optimization.patch b/build/tools/toolchain-patches/gcc/0001-Disable-sincos-optimization.patch index 0e76a88fc..5aa35f0af 100644 --- a/build/tools/toolchain-patches/gcc/0001-Disable-sincos-optimization.patch +++ b/build/tools/toolchain-patches/gcc/0001-Disable-sincos-optimization.patch @@ -21,8 +21,9 @@ Into machine code that does: Change-Id: I332bf5788267dd56e93b8cdb0cefa04b970eca88 --- - gcc-4.6/gcc/config/linux.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + gcc-4.6/gcc/config/linux.h | 2 +- + gcc-4.8/gcc/config/linux.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gcc-4.6/gcc/config/linux.h b/gcc-4.6/gcc/config/linux.h index 4e21112..025157f 100644 diff --git a/build/tools/toolchain-patches/gcc/0001-Enable-C-exceptions-and-RTTI-by-default.patch b/build/tools/toolchain-patches/gcc/0002-Enable-C-exceptions-and-RTTI-by-default.patch index eca3ca90c..57324bfba 100644 --- a/build/tools/toolchain-patches/gcc/0001-Enable-C-exceptions-and-RTTI-by-default.patch +++ b/build/tools/toolchain-patches/gcc/0002-Enable-C-exceptions-and-RTTI-by-default.patch @@ -46,7 +46,7 @@ index 26f1a74..e5114c2 100644 --- a/gcc-4.9/gcc/config/linux-android.h +++ b/gcc-4.9/gcc/config/linux-android.h @@ -45,8 +45,8 @@ - "%{!fno-pic:%{!fno-PIC:%{!fpic:%{!fPIC: -fPIC}}}}" + "%{!fno-pic:%{!fno-PIC:%{!fpic:%{!fPIC: " ANDROID_PIC_DEFAULT "}}}}" #define ANDROID_CC1PLUS_SPEC \ - "%{!fexceptions:%{!fno-exceptions: -fno-exceptions}} " \ @@ -54,8 +54,8 @@ index 26f1a74..e5114c2 100644 + "%{!fexceptions:%{!fno-exceptions: -fexceptions}} " \ + "%{!frtti:%{!fno-rtti: -frtti}}" - #define ANDROID_LIB_SPEC \ - "%{!static: -ldl}" + #define ANDROID_ASM_SPEC \ + "--noexecstack" -- 1.9.1.423.g4596e3a diff --git a/build/tools/toolchain-patches/gcc/0002-gcc-prevent-crash-on-Eclair-and-older-platforms.patch b/build/tools/toolchain-patches/gcc/0003-gcc-prevent-crash-on-Eclair-and-older-platforms.patch index b67cd977f..b67cd977f 100644 --- a/build/tools/toolchain-patches/gcc/0002-gcc-prevent-crash-on-Eclair-and-older-platforms.patch +++ b/build/tools/toolchain-patches/gcc/0003-gcc-prevent-crash-on-Eclair-and-older-platforms.patch diff --git a/build/tools/toolchain-patches/gcc/0003-Rename-libstdc++.so-to-libgnustl_shared.so.patch b/build/tools/toolchain-patches/gcc/0004-Rename-libstdc++.so-to-libgnustl_shared.so.patch index 411a330cb..411a330cb 100644 --- a/build/tools/toolchain-patches/gcc/0003-Rename-libstdc++.so-to-libgnustl_shared.so.patch +++ b/build/tools/toolchain-patches/gcc/0004-Rename-libstdc++.so-to-libgnustl_shared.so.patch |