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