From 447638d2c4d80ee03650406775c0b8a17d246f55 Mon Sep 17 00:00:00 2001
From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Fri, 20 Apr 2018 20:40:27 +0000
Subject: [PATCH] gotest: only use [TD] on big-endian PPC64 non-AIX systems

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

From-SVN: r259531
---
 gcc/go/gofrontend/MERGE |  2 +-
 libgo/testsuite/gotest  | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index aeba5254fe6..a97408ab7e6 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-b367349d85f315e94e10ee2d76a7c6a46b993dcb
+7b37b9c3f9338a1387ee1e2301de89c3d2d87d2b
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
diff --git a/libgo/testsuite/gotest b/libgo/testsuite/gotest
index 06848fdb1f0..434c26de933 100755
--- a/libgo/testsuite/gotest
+++ b/libgo/testsuite/gotest
@@ -506,9 +506,13 @@ localname() {
 
 {
 	text="T"
-	case "$goarch" in
-	ppc64*) text="[TD]" ;;
-	esac
+
+	# On systems using PPC64 ELF ABI v1 function symbols show up
+	# as descriptors in the data section.  We assume that $goarch
+	# distinguishes v1 (ppc64) from v2 (ppc64le).
+	if test "$goos" != "aix" && test "$goarch" = "ppc64"; then
+	    text="[TD]"
+	fi
 
 	symtogo='sed -e s/_test\([^A-Za-z0-9]\)/XXXtest\1/ -e s/.*_\([^_]*\.\)/\1/ -e s/XXXtest/_test/'