libgo: add -L option for libatomic when using -pthread

Fixes https://gcc.gnu.org/PR84484
    
    Reviewed-on: https://go-review.googlesource.com/95436

From-SVN: r257911
This commit is contained in:
Ian Lance Taylor 2018-02-22 18:49:33 +00:00
parent 5d0d5d6876
commit 35e7db41ca
3 changed files with 7 additions and 5 deletions

View File

@ -1,4 +1,4 @@
c6e0970f75508e209a10a7db5164d6ea3f9b28bf
b4d61f028dd1623142df4130b6c660bb77474b7b
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.

5
libgo/configure vendored
View File

@ -14209,7 +14209,7 @@ if test "${libgo_cv_lib_pthread+set}" = set; then :
$as_echo_n "(cached) " >&6
else
CFLAGS_hold=$CFLAGS
CFLAGS="$CFLAGS -pthread"
CFLAGS="$CFLAGS -pthread -L../libatomic/.libs"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int i;
@ -14226,7 +14226,8 @@ fi
$as_echo "$libgo_cv_lib_pthread" >&6; }
PTHREAD_CFLAGS=
if test "$libgo_cv_lib_pthread" = yes; then
PTHREAD_CFLAGS=-pthread
# RISC-V apparently adds -latomic when using -pthread.
PTHREAD_CFLAGS="-pthread -L../libatomic/.libs"
fi

View File

@ -493,14 +493,15 @@ dnl Test whether the compiler supports the -pthread option.
AC_CACHE_CHECK([whether -pthread is supported],
[libgo_cv_lib_pthread],
[CFLAGS_hold=$CFLAGS
CFLAGS="$CFLAGS -pthread"
CFLAGS="$CFLAGS -pthread -L../libatomic/.libs"
AC_COMPILE_IFELSE([[int i;]],
[libgo_cv_lib_pthread=yes],
[libgo_cv_lib_pthread=no])
CFLAGS=$CFLAGS_hold])
PTHREAD_CFLAGS=
if test "$libgo_cv_lib_pthread" = yes; then
PTHREAD_CFLAGS=-pthread
# RISC-V apparently adds -latomic when using -pthread.
PTHREAD_CFLAGS="-pthread -L../libatomic/.libs"
fi
AC_SUBST(PTHREAD_CFLAGS)