commit b4d61f028dd1623142df4130b6c660bb77474b7b
author Ian Lance Taylor <iant@golang.org> Tue Feb 20 07:14:15 2018 -0800
committer Ian Lance Taylor <iant@golang.org> Thu Feb 22 18:48:32 2018 +0000
tree 39e70c3e3716f3309be5bb586617463984e5e41f
parent c6e0970f75508e209a10a7db5164d6ea3f9b28bf

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

Fixes https://gcc.gnu.org/PR84484

Change-Id: I42c9909539ee1a08cd79710ddddc1700571ebae6
Reviewed-on: https://go-review.googlesource.com/95436
Reviewed-by: Than McIntosh <thanm@google.com>

libgo/configure

diff --git a/libgo/configure b/libgo/configure
index aba4dc3..dcfc524 100755
--- a/libgo/configure
+++ b/libgo/configure
@@ -14209,7 +14209,7 @@
   $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 @@
 $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
 
 

libgo/configure.ac

diff --git a/libgo/configure.ac b/libgo/configure.ac
index 1264a1d..1f49aee 100644
--- a/libgo/configure.ac
+++ b/libgo/configure.ac
@@ -493,14 +493,15 @@
 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)