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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@233959 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 960d40b..3627140 100644 (file)
--- 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 92f6c41..e867051 100644 (file)
--- 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] {