diff options
| author | Dominik Vogt <vogt@linux.vnet.ibm.com> | 2016-03-04 07:33:16 +0000 |
|---|---|---|
| committer | Andreas Krebbel <krebbel@gcc.gnu.org> | 2016-03-04 07:33:16 +0000 |
| commit | fba054c26857d342f1e274870767a5eab14773b0 (patch) | |
| tree | 1f95c2dbf8b5c2747bfabe65929c883feb832e0d /gcc | |
| parent | f10cdc6c1436bcd59038a8c84128c1fe53f235c4 (diff) | |
| download | gcc-fba054c26857d342f1e274870767a5eab14773b0.zip gcc-fba054c26857d342f1e274870767a5eab14773b0.tar.gz gcc-fba054c26857d342f1e274870767a5eab14773b0.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | 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 960d40b..3627140 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 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] { |