From ac58a228df4ae9b2d7752e89f6323600e1ecac53 Mon Sep 17 00:00:00 2001
From: ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 22 Feb 2018 18:49:33 +0000
Subject:     libgo: add -L option for libatomic when using -pthread

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

    Reviewed-on: https://go-review.googlesource.com/95436


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@257911 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libgo/configure | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'libgo/configure')

diff --git a/libgo/configure b/libgo/configure
index aba4dc396fc..dcfc524bccb 100755
--- a/libgo/configure
+++ b/libgo/configure
@@ -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
 
 
-- 
cgit v1.2.1


From 364c6e61ea0e362ea01c0d191a0961ffa5eda944 Mon Sep 17 00:00:00 2001
From: ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 22 Feb 2018 19:49:04 +0000
Subject: 	PR go/84484     libgo: add support for riscv64

    Patch by Andreas Schwab.

    Reviewed-on: https://go-review.googlesource.com/96377

	* go.test/go-test.exp (go-set-goarch): Recognize riscv64-*-*.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@257914 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libgo/configure | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'libgo/configure')

diff --git a/libgo/configure b/libgo/configure
index dcfc524bccb..c5f8e8a3763 100755
--- a/libgo/configure
+++ b/libgo/configure
@@ -13653,10 +13653,10 @@ esac
 #   - libgo/go/syscall/endian_XX.go
 #   - possibly others
 # - possibly update files in libgo/go/internal/syscall/unix
-ALLGOARCH="386 alpha amd64 amd64p32 arm armbe arm64 arm64be ia64 m68k mips mipsle mips64 mips64le mips64p32 mips64p32le ppc ppc64 ppc64le s390 s390x sh shbe sparc sparc64"
+ALLGOARCH="386 alpha amd64 amd64p32 arm armbe arm64 arm64be ia64 m68k mips mipsle mips64 mips64le mips64p32 mips64p32le ppc ppc64 ppc64le riscv64 s390 s390x sh shbe sparc sparc64"
 
 # All known GOARCH family values.
-ALLGOARCHFAMILY="I386 ALPHA AMD64 ARM ARM64 IA64 M68K MIPS MIPS64 PPC PPC64 S390 S390X SH SPARC SPARC64"
+ALLGOARCHFAMILY="I386 ALPHA AMD64 ARM ARM64 IA64 M68K MIPS MIPS64 PPC PPC64 RISCV64 S390 S390X SH SPARC SPARC64"
 
 GOARCH=unknown
 case ${host} in
@@ -13773,6 +13773,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     ;;
+  riscv64-*-*)
+    GOARCH=riscv64
+    ;;
   s390*-*-*)
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-- 
cgit v1.2.1