diff options
author | Andrew Hsieh <andrewhsieh@google.com> | 2014-04-14 20:41:18 -0700 |
---|---|---|
committer | Andrew Hsieh <andrewhsieh@google.com> | 2014-04-22 16:15:52 -0700 |
commit | b1e9b7655026c246b3faf7b6aa7f642668b740c2 (patch) | |
tree | 63c1a08f3bfb22c0e9dc22a9a602e861e84a7e1f /gcc-4.9 | |
parent | b905a68c1466ba74fac49abc4fb35930c5c456cf (diff) | |
download | toolchain_gcc-b1e9b7655026c246b3faf7b6aa7f642668b740c2.tar.gz toolchain_gcc-b1e9b7655026c246b3faf7b6aa7f642668b740c2.tar.bz2 toolchain_gcc-b1e9b7655026c246b3faf7b6aa7f642668b740c2.zip |
[4.9] GNU libstdc++ --enable-linux-futex
See bf7fbbea63a8ec70c0cf36969af6d9ded9583d16
Change-Id: I8ab5c14fa486c53d7c6abf4c2ca333469632d459
Diffstat (limited to 'gcc-4.9')
-rwxr-xr-x | gcc-4.9/libstdc++-v3/configure | 12 | ||||
-rw-r--r-- | gcc-4.9/libstdc++-v3/libsupc++/guard.cc | 5 |
2 files changed, 17 insertions, 0 deletions
diff --git a/gcc-4.9/libstdc++-v3/configure b/gcc-4.9/libstdc++-v3/configure index 9328b09f8..0f6a766b3 100755 --- a/gcc-4.9/libstdc++-v3/configure +++ b/gcc-4.9/libstdc++-v3/configure @@ -77192,6 +77192,12 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/syscall.h> int lk; +#if !defined(SYS_gettid) +#define SYS_gettid __NR_gettid +#endif +#if !defined(SYS_futex) +#define SYS_futex __NR_futex +#endif int main () { @@ -77250,6 +77256,12 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/syscall.h> int lk; +#if !defined(SYS_gettid) +#define SYS_gettid __NR_gettid +#endif +#if !defined(SYS_futex) +#define SYS_futex __NR_futex +#endif int main () { diff --git a/gcc-4.9/libstdc++-v3/libsupc++/guard.cc b/gcc-4.9/libstdc++-v3/libsupc++/guard.cc index 54f745876..45de1bb13 100644 --- a/gcc-4.9/libstdc++-v3/libsupc++/guard.cc +++ b/gcc-4.9/libstdc++-v3/libsupc++/guard.cc @@ -33,7 +33,12 @@ #if defined(__GTHREADS) && defined(__GTHREAD_HAS_COND) \ && (ATOMIC_INT_LOCK_FREE > 1) && defined(_GLIBCXX_HAVE_LINUX_FUTEX) # include <climits> +#if defined(__ANDROID__) +# include <sys/syscall.h> +# define SYS_futex __NR_futex +#else # include <syscall.h> +#endif # include <unistd.h> # define _GLIBCXX_USE_FUTEX # define _GLIBCXX_FUTEX_WAIT 0 |