summaryrefslogtreecommitdiff
path: root/patches/gcc/7.1.0/974-crystax.patch
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2017-05-16 04:12:36 (GMT)
committerGitHub <noreply@github.com>2017-05-16 04:12:36 (GMT)
commit1dbb06f2d375d58f12e79399b64b3111fc4d35fc (patch)
treeb2b8807fd6c7d0d700b3efd724fb308182001cb1 /patches/gcc/7.1.0/974-crystax.patch
parentef762bfe8e1ec9063d645b1745dc8843997b7767 (diff)
parent97a20eed5c3cf3a2f7bb261705405b8b16c56b36 (diff)
Merge pull request #717 from stilor/merge-bionic
Merge bionic
Diffstat (limited to 'patches/gcc/7.1.0/974-crystax.patch')
-rw-r--r--patches/gcc/7.1.0/974-crystax.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/patches/gcc/7.1.0/974-crystax.patch b/patches/gcc/7.1.0/974-crystax.patch
new file mode 100644
index 0000000..9db4f54
--- /dev/null
+++ b/patches/gcc/7.1.0/974-crystax.patch
@@ -0,0 +1,24 @@
+commit dbeae1190cabad83999f2540523f045acc1bb4ec
+Author: Dmitry Moskalchuk <dm@crystax.net>
+Date: Fri Aug 21 17:41:59 2015 +0300
+
+ [android] Always use gthr-posix.h instead of gthr-default.h
+
+ Signed-off-by: Dmitry Moskalchuk <dm@crystax.net>
+
+diff --git a/libgcc/gthr.h b/libgcc/gthr.h
+index 47a7d061a..67a680f90 100644
+--- a/libgcc/gthr.h
++++ b/libgcc/gthr.h
+@@ -145,7 +145,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
+ #define GTHREAD_USE_WEAK 1
+ #endif
+ #endif
++#if __ANDROID__
++#include "gthr-posix.h"
++#else
+ #include "gthr-default.h"
++#endif
+
+ #ifndef HIDE_EXPORTS
+ #pragma GCC visibility pop