From fba054c26857d342f1e274870767a5eab14773b0 Mon Sep 17 00:00:00 2001
From: Dominik Vogt <vogt@linux.vnet.ibm.com>
Date: Fri, 4 Mar 2016 07:33:16 +0000
Subject: [PATCH] S/390: Set GOARCH to the current target when testing
 multiarch.

The attached patch fixes a test failure of go.test/test/env.go on
s390x biarch.  Bootstrapped and regression tested on s390x biarch
and s390.

gcc/testsuite/ChangeLog

2016-03-04  Dominik Vogt  <vogt@linux.vnet.ibm.com>

	PR testsuite/69766
	* go.test/go-test.exp: S/390: Set GOARCH to the current target when
	testing multiarch.

From-SVN: r233959
---
 gcc/testsuite/ChangeLog           |  6 ++++++
 gcc/testsuite/go.test/go-test.exp | 11 ++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 960d40b0b531..3627140b8da4 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2016-03-04  Dominik Vogt  <vogt@linux.vnet.ibm.com>
+
+	PR testsuite/69766
+	* go.test/go-test.exp: S/390: Set GOARCH to the current target when
+	testing multiarch.
+
 2016-03-04  Jakub Jelinek  <jakub@redhat.com>
 
 	PR debug/69947
diff --git a/gcc/testsuite/go.test/go-test.exp b/gcc/testsuite/go.test/go-test.exp
index 92f6c41678d2..e867051c9ef9 100644
--- a/gcc/testsuite/go.test/go-test.exp
+++ b/gcc/testsuite/go.test/go-test.exp
@@ -248,11 +248,12 @@ proc go-set-goarch { } {
 		}
 	    }
 	}
-	"s390-*-*" {
-	    set goarch "s390"
-	}
-	"s390x-*-*" {
-	    set goarch "s390x"
+	"s390*-*-*" {
+	    if [check_effective_target_ilp32] {
+		set goarch "s390"
+	    } else {
+		set goarch "s390x"
+	    }
 	}
 	"sparc*-*-*" {
 	    if [check_effective_target_ilp32] {