aboutsummaryrefslogtreecommitdiff
path: root/build/tools/toolchain-patches/gcc
diff options
context:
space:
mode:
authorAndrew Hsieh <andrewhsieh@google.com>2013-10-31 10:06:40 +0800
committerAndrew Hsieh <andrewhsieh@google.com>2013-10-31 10:36:18 +0800
commit60e87b828a08bc307e71d4359b23b68a1fe6104c (patch)
tree582ae052c047796dd68fac4c92ffc68c4ead553a /build/tools/toolchain-patches/gcc
parentcc18a546fd2e0cdf4045f726921f5056509233de (diff)
downloadndk-60e87b828a08bc307e71d4359b23b68a1fe6104c.tar.gz
Remove clang3.2, gcc4.7 and binutils-2.22
Both clang3.2 and gcc4.7 (which uses binutils-2.22) are deprecated and will be removed from r9c Change-Id: I8101ece53fef6e2e32d393ec0fb3d1ecbee5a02a
Diffstat (limited to 'build/tools/toolchain-patches/gcc')
-rw-r--r--build/tools/toolchain-patches/gcc/0001-Enable-C-exceptions-and-RTTI-by-default.patch15
-rw-r--r--build/tools/toolchain-patches/gcc/0002-gcc-prevent-crash-on-Eclair-and-older-platforms.patch24
-rw-r--r--build/tools/toolchain-patches/gcc/0006-Disable-libstdc-versioning.patch23
3 files changed, 0 insertions, 62 deletions
diff --git a/build/tools/toolchain-patches/gcc/0001-Enable-C-exceptions-and-RTTI-by-default.patch b/build/tools/toolchain-patches/gcc/0001-Enable-C-exceptions-and-RTTI-by-default.patch
index 79aa56e99..fd727cfe3 100644
--- a/build/tools/toolchain-patches/gcc/0001-Enable-C-exceptions-and-RTTI-by-default.patch
+++ b/build/tools/toolchain-patches/gcc/0001-Enable-C-exceptions-and-RTTI-by-default.patch
@@ -24,21 +24,6 @@ index 94c5274..7256082 100644
#define ANDROID_ASM_SPEC \
"--noexecstack"
-diff --git a/gcc-4.7/gcc/config/linux-android.h b/gcc-4.7/gcc/config/linux-android.h
-index 94c5274..7256082 100644
---- a/gcc-4.7/gcc/config/linux-android.h
-+++ b/gcc-4.7/gcc/config/linux-android.h
-@@ -46,8 +46,8 @@
- "%{!fno-pic:%{!fno-PIC:%{!fpic:%{!fPIC: " ANDROID_PIC_DEFAULT "}}}}"
-
- #define ANDROID_CC1PLUS_SPEC \
-- "%{!fexceptions:%{!fno-exceptions: -fno-exceptions}} " \
-- "%{!frtti:%{!fno-rtti: -fno-rtti}}"
-+ "%{!fexceptions:%{!fno-exceptions: -fexceptions}} " \
-+ "%{!frtti:%{!fno-rtti: -frtti}}"
-
- #define ANDROID_ASM_SPEC \
- "--noexecstack"
diff --git a/gcc-4.8/gcc/config/linux-android.h b/gcc-4.8/gcc/config/linux-android.h
index 2c87c84..47a3e7c 100644
--- a/gcc-4.8/gcc/config/linux-android.h
diff --git a/build/tools/toolchain-patches/gcc/0002-gcc-prevent-crash-on-Eclair-and-older-platforms.patch b/build/tools/toolchain-patches/gcc/0002-gcc-prevent-crash-on-Eclair-and-older-platforms.patch
index befa6a099..ee9f3075c 100644
--- a/build/tools/toolchain-patches/gcc/0002-gcc-prevent-crash-on-Eclair-and-older-platforms.patch
+++ b/build/tools/toolchain-patches/gcc/0002-gcc-prevent-crash-on-Eclair-and-older-platforms.patch
@@ -48,30 +48,6 @@ index ecb06e2..8372c64 100644
#include <pthread.h>
#include <unistd.h>
-diff --git a/gcc-4.7/libgcc/gthr-posix.h b/gcc-4.7/libgcc/gthr-posix.h
-index a935e92..08281b7 100644
---- a/gcc-4.7/libgcc/gthr-posix.h
-+++ b/gcc-4.7/libgcc/gthr-posix.h
-@@ -38,6 +38,19 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
- #define _REENTRANT 1
- #endif
-
-+/* The following should normally be in a different header file,
-+ * but I couldn't find the right location. The point of the macro
-+ * definition below is to prevent libsupc++ and libstdc++ to reference
-+ * weak symbols in their static C++ constructors. Such code crashes
-+ * when a shared object linked statically to these libraries is
-+ * loaded on Android 2.1 (Eclair) and older platform releases, due
-+ * to a dynamic linker bug.
-+ */
-+#ifdef __ANDROID__
-+#undef GTHREAD_USE_WEAK
-+#define GTHREAD_USE_WEAK 0
-+#endif
-+
- #include <pthread.h>
-
- #if ((defined(_LIBOBJC) || defined(_LIBOBJC_WEAK)) \
diff --git a/gcc-4.8/libgcc/gthr-posix.h b/gcc-4.8/libgcc/gthr-posix.h
index f0d8cd7..1d03af0 100644
--- a/gcc-4.8/libgcc/gthr-posix.h
diff --git a/build/tools/toolchain-patches/gcc/0006-Disable-libstdc-versioning.patch b/build/tools/toolchain-patches/gcc/0006-Disable-libstdc-versioning.patch
index b11c12804..3ca8b7733 100644
--- a/build/tools/toolchain-patches/gcc/0006-Disable-libstdc-versioning.patch
+++ b/build/tools/toolchain-patches/gcc/0006-Disable-libstdc-versioning.patch
@@ -35,29 +35,6 @@ index 146ec3f..99f0f56 100644
mostlyclean-compile:
-rm -f *.$(OBJEXT)
-diff --git a/gcc-4.7/libstdc++-v3/src/Makefile.in b/gcc-4.7/libstdc++-v3/src/Makefile.in
-index b10d853..3669b06 100644
---- a/gcc-4.7/libstdc++-v3/src/Makefile.in
-+++ b/gcc-4.7/libstdc++-v3/src/Makefile.in
-@@ -332,7 +332,7 @@ AM_CPPFLAGS = $(GLIBCXX_INCLUDES)
- SUBDIRS = c++98 c++11
-
- # Cross compiler support.
--toolexeclib_LTLIBRARIES = libstdc++.la
-+toolexeclib_LTLIBRARIES = libgnustl_shared.la
- @GLIBCXX_LDBL_COMPAT_FALSE@ldbl_compat_sources =
- @GLIBCXX_LDBL_COMPAT_TRUE@ldbl_compat_sources = compatibility-ldbl.cc
- @ENABLE_PARALLEL_FALSE@parallel_compat_sources =
-@@ -515,6 +515,9 @@ clean-toolexeclibLTLIBRARIES:
- libstdc++.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES)
- $(libstdc___la_LINK) -rpath $(toolexeclibdir) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS)
-
-+libgnustl_shared.la: $(libstdc___la_OBJECTS) $(libstdc___la_DEPENDENCIES)
-+ $(libstdc___la_LINK) -rpath $(toolexeclibdir) $(libstdc___la_OBJECTS) $(libstdc___la_LIBADD) $(LIBS)
-+
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
-
diff --git a/gcc-4.8/libstdc++-v3/src/Makefile.in b/gcc-4.8/libstdc++-v3/src/Makefile.in
index 69001b4..e875539 100644
--- a/gcc-4.8/libstdc++-v3/src/Makefile.in