diff options
author | Caroline Tice <cmtice@google.com> | 2016-05-12 15:51:55 -0700 |
---|---|---|
committer | Caroline Tice <cmtice@google.com> | 2016-05-12 15:51:55 -0700 |
commit | fe767fbb6d580458aeea609ac5c82b600acce63d (patch) | |
tree | 22b59d2bb3cf487571797ddfdfc8c719fe34fc71 | |
parent | 3791dafeb2d58bc6c45753f4cdf0fa5431963cfa (diff) | |
download | toolchain_gcc-fe767fbb6d580458aeea609ac5c82b600acce63d.tar.gz toolchain_gcc-fe767fbb6d580458aeea609ac5c82b600acce63d.tar.bz2 toolchain_gcc-fe767fbb6d580458aeea609ac5c82b600acce63d.zip |
Fix gthreads for ChromeOS, too (recent change broke ChromeOS).
Change-Id: Ic7f1a0cd3375b6e247f1ca972922ecf5452a33ac
-rw-r--r-- | gcc-4.9/libstdc++-v3/acinclude.m4 | 8 | ||||
-rwxr-xr-x | gcc-4.9/libstdc++-v3/configure | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/gcc-4.9/libstdc++-v3/acinclude.m4 b/gcc-4.9/libstdc++-v3/acinclude.m4 index 404c78eb7..4e7a441d8 100644 --- a/gcc-4.9/libstdc++-v3/acinclude.m4 +++ b/gcc-4.9/libstdc++-v3/acinclude.m4 @@ -3550,13 +3550,7 @@ AC_DEFUN([GLIBCXX_CHECK_GTHREADS], [ AC_MSG_CHECKING([for gthreads library]) - if test $enable_bionic_libs = yes; then - ac_include_file="gthr-$target_thread_file.h" - else - ac_include_file="$glibcxx_thread_h" - fi - - AC_TRY_COMPILE([#include "$ac_include_file"], + AC_TRY_COMPILE([#include "gthr-$target_thread_file.h"], [ #ifndef __GTHREADS_CXX0X #error diff --git a/gcc-4.9/libstdc++-v3/configure b/gcc-4.9/libstdc++-v3/configure index d8403a4a4..836beca1f 100755 --- a/gcc-4.9/libstdc++-v3/configure +++ b/gcc-4.9/libstdc++-v3/configure @@ -78726,15 +78726,9 @@ $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="gthr-$target_thread_file.h" - else - ac_include_file="$glibcxx_thread_h" - fi - cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include "$ac_include_file" +#include "gthr-$target_thread_file.h" int main () { |