diff options
| author | Andrew Hsieh <andrewhsieh@google.com> | 2013-04-02 20:29:20 +0800 |
|---|---|---|
| committer | Andrew Hsieh <andrewhsieh@google.com> | 2013-04-02 20:37:07 +0800 |
| commit | bf7fbbea63a8ec70c0cf36969af6d9ded9583d16 (patch) | |
| tree | 0bc4c48d6d880fd687132c7e3f9c06b21c19a76b | |
| parent | 59f82b394a9ece7ea20714014a0b9800da3a87fe (diff) | |
| download | toolchain_gcc-bf7fbbea63a8ec70c0cf36969af6d9ded9583d16.tar.gz toolchain_gcc-bf7fbbea63a8ec70c0cf36969af6d9ded9583d16.tar.bz2 toolchain_gcc-bf7fbbea63a8ec70c0cf36969af6d9ded9583d16.zip | |
[4.8] GNU libstdc++ --enable-linux-futex
See fe1a20404b19d5dd0cd0988d080cff8a455c2a76
Change-Id: I93f281d919bce84796670dc1b29917c690d39c15
| -rwxr-xr-x | gcc-4.8/libstdc++-v3/configure | 12 | ||||
| -rw-r--r-- | gcc-4.8/libstdc++-v3/libsupc++/guard.cc | 5 |
2 files changed, 17 insertions, 0 deletions
diff --git a/gcc-4.8/libstdc++-v3/configure b/gcc-4.8/libstdc++-v3/configure index faaa53ddd..4aeff9ccd 100755 --- a/gcc-4.8/libstdc++-v3/configure +++ b/gcc-4.8/libstdc++-v3/configure @@ -70745,6 +70745,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 () { @@ -70803,6 +70809,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.8/libstdc++-v3/libsupc++/guard.cc b/gcc-4.8/libstdc++-v3/libsupc++/guard.cc index c509fa71a..983fcf071 100644 --- a/gcc-4.8/libstdc++-v3/libsupc++/guard.cc +++ b/gcc-4.8/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 |