[PATCH] S/390: Set GOARCH to the current target when testing multiarch.

[Dominik Vogt]

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.
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69766

Ciao

Dominik ^_^  ^_^

-- 

Dominik Vogt
IBM Germany

gcc/testsuite/ChangeLog

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

>From e8eb58c645f6840de76b1f2d9fc39fb7e021dda8 Mon Sep 17 00:00:00 2001
From: Dominik Vogt <v...@linux.vnet.ibm.com>
Date: Thu, 11 Feb 2016 12:40:35 +0100
Subject: [PATCH] S/390: Set GOARCH to the current target when testing
 multiarch.

---
 gcc/testsuite/go.test/go-test.exp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/gcc/testsuite/go.test/go-test.exp b/gcc/testsuite/go.test/go-test.exp
index 92f6c41..e867051 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] {
-- 
2.3.0