aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaroline Tice <cmtice@google.com>2016-04-24 01:45:59 (GMT)
committerCaroline Tice <cmtice@google.com>2016-04-25 17:49:29 (GMT)
commit3791dafeb2d58bc6c45753f4cdf0fa5431963cfa (patch)
tree6ee7df50208c9b6d555a2c0e10d31dc6e9857420
parent1641488ea2548cf9c5e61ef5a2f914aa496f9870 (diff)
downloadtoolchain_gcc-3791dafeb2d58bc6c45753f4cdf0fa5431963cfa.zip
toolchain_gcc-3791dafeb2d58bc6c45753f4cdf0fa5431963cfa.tar.gz
toolchain_gcc-3791dafeb2d58bc6c45753f4cdf0fa5431963cfa.tar.bz2
Attempt to fix missing gthreads in libstdc++.
The if-else clauses of an if-statement were reversed, causing libstdc++ to not find/define the gthreads. This CL should fix that. Bug: http://b/27433401 Change-Id: Ic8a0afbd4cfdff48cfa4edf931cda2f1409dae34
-rw-r--r--gcc-4.9/libstdc++-v3/acinclude.m44
-rwxr-xr-xgcc-4.9/libstdc++-v3/configure4
2 files changed, 4 insertions, 4 deletions
diff --git a/gcc-4.9/libstdc++-v3/acinclude.m4 b/gcc-4.9/libstdc++-v3/acinclude.m4
index c9c059d..404c78e 100644
--- a/gcc-4.9/libstdc++-v3/acinclude.m4
+++ b/gcc-4.9/libstdc++-v3/acinclude.m4
@@ -3551,9 +3551,9 @@ AC_DEFUN([GLIBCXX_CHECK_GTHREADS], [
AC_MSG_CHECKING([for gthreads library])
if test $enable_bionic_libs = yes; then
- ac_include_file="$glibcxx_thread_h"
- else
ac_include_file="gthr-$target_thread_file.h"
+ else
+ ac_include_file="$glibcxx_thread_h"
fi
AC_TRY_COMPILE([#include "$ac_include_file"],
diff --git a/gcc-4.9/libstdc++-v3/configure b/gcc-4.9/libstdc++-v3/configure
index 2032c72..d8403a4 100755
--- a/gcc-4.9/libstdc++-v3/configure
+++ b/gcc-4.9/libstdc++-v3/configure
@@ -78727,9 +78727,9 @@ $as_echo "$res_mutex_timedlock" >&6; }
$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"
+ else
+ ac_include_file="$glibcxx_thread_h"
fi
cat confdefs.h - <<_ACEOF >conftest.$ac_ext