diff options
Diffstat (limited to 'gcc-4.9/libstdc++-v3')
| -rw-r--r-- | gcc-4.9/libstdc++-v3/acinclude.m4 | 8 | ||||
| -rwxr-xr-x | gcc-4.9/libstdc++-v3/configure | 20 |
2 files changed, 26 insertions, 2 deletions
diff --git a/gcc-4.9/libstdc++-v3/acinclude.m4 b/gcc-4.9/libstdc++-v3/acinclude.m4 index e57ef727e..c9c059dbc 100644 --- a/gcc-4.9/libstdc++-v3/acinclude.m4 +++ b/gcc-4.9/libstdc++-v3/acinclude.m4 @@ -3550,7 +3550,13 @@ AC_DEFUN([GLIBCXX_CHECK_GTHREADS], [ AC_MSG_CHECKING([for gthreads library]) - AC_TRY_COMPILE([#include "gthr.h"], + if test $enable_bionic_libs = yes; then + ac_include_file="$glibcxx_thread_h" + else + ac_include_file="gthr-$target_thread_file.h" + fi + + AC_TRY_COMPILE([#include "$ac_include_file"], [ #ifndef __GTHREADS_CXX0X #error diff --git a/gcc-4.9/libstdc++-v3/configure b/gcc-4.9/libstdc++-v3/configure index 4d3fa1e5f..2032c72fe 100755 --- a/gcc-4.9/libstdc++-v3/configure +++ b/gcc-4.9/libstdc++-v3/configure @@ -77244,6 +77244,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 () { @@ -77302,6 +77308,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 () { @@ -78714,9 +78726,15 @@ $as_echo "$res_mutex_timedlock" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gthreads library" >&5 $as_echo_n "checking for gthreads library... " >&6; } + if test $enable_bionic_libs = yes; then + ac_include_file="$glibcxx_thread_h" + else + ac_include_file="gthr-$target_thread_file.h" + fi + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include "gthr.h" +#include "$ac_include_file" int main () { |