aboutsummaryrefslogtreecommitdiff
path: root/build/tools/toolchain-patches/gcc/0003-gcc-prevent-crash-on-Eclair-and-older-platforms.patch
diff options
context:
space:
mode:
Diffstat (limited to 'build/tools/toolchain-patches/gcc/0003-gcc-prevent-crash-on-Eclair-and-older-platforms.patch')
-rw-r--r--build/tools/toolchain-patches/gcc/0003-gcc-prevent-crash-on-Eclair-and-older-platforms.patch25
1 files changed, 0 insertions, 25 deletions
diff --git a/build/tools/toolchain-patches/gcc/0003-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..e55a6755d 100644
--- a/build/tools/toolchain-patches/gcc/0003-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
@@ -21,35 +21,10 @@ completely. And we don't need them because the pthread symbols
are all in the C library on Android, unlike legacy Linux systems
which put them in libpthread.so (and provide weak stubs in libc.so).
---
- gcc-4.6/gcc/gthr-posix.h | 13 +++++++++++++
gcc-4.8/libgcc/gthr-posix.h | 13 +++++++++++++
gcc-4.9/libgcc/gthr-posix.h | 13 +++++++++++++
3 files changed, 39 insertions(+)
-diff --git a/gcc-4.6/gcc/gthr-posix.h b/gcc-4.6/gcc/gthr-posix.h
-index ecb06e2..8372c64 100644
---- a/gcc-4.6/gcc/gthr-posix.h
-+++ b/gcc-4.6/gcc/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>
- #include <unistd.h>
-
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