On Tue, Nov 3, 2015 at 12:17 PM, Lynn A. Boger
<labo...@linux.vnet.ibm.com> wrote:
> I can see the problem in gotest. It has to do with the setting of GOARCH.
>
> Previously GOARCH was being set based on the --goarch argument, but now
> goarch is being set. Not sure both GOARCH and goarch are needed?
>
> I've attached a patch I used to get it to work. It worked for ppc64le and
> ppc64
> with 64 and 32 bit.
Thanks. I committed this version of the patch.
Ian
Index: gcc/go/gofrontend/MERGE
===================================================================
--- gcc/go/gofrontend/MERGE (revision 229711)
+++ gcc/go/gofrontend/MERGE (working copy)
@@ -1,4 +1,4 @@
-10e0f935ac369f8403c198b05c909e42e565c1e5
+47f256e1ed527b2eb4041acf90d33e6abc5e1685
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
Index: libgo/Makefile.am
===================================================================
--- libgo/Makefile.am (revision 229616)
+++ libgo/Makefile.am (working copy)
@@ -2344,11 +2344,11 @@ CHECK = \
$(MKDIR_P) $(@D); \
rm -f $@-testsum $@-testlog; \
if test "$(USE_DEJAGNU)" = "yes"; then \
- $(SHELL) $(srcdir)/testsuite/gotest --goarch=$(GOARCH) --goos=$(GOOS)
--dejagnu=yes --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --pkgpath="$(@D)"
--pkgfiles="$(go_$(subst /,_,$(@D))_files)" --testname="$(@D)"
--goarch="$(GOARCH)" $(GOTESTFLAGS) $(go_$(subst /,_,$(@D))_test_files); \
+ $(SHELL) $(srcdir)/testsuite/gotest --goarch=$(GOARCH) --goos=$(GOOS)
--dejagnu=yes --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --pkgpath="$(@D)"
--pkgfiles="$(go_$(subst /,_,$(@D))_files)" --testname="$(@D)" $(GOTESTFLAGS)
$(go_$(subst /,_,$(@D))_test_files); \
elif test "$(GOBENCH)" != ""; then \
- $(SHELL) $(srcdir)/testsuite/gotest --goarch=$(GOARCH) --goos=$(GOOS)
--basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --pkgpath="$(@D)"
--pkgfiles="$(go_$(subst /,_,$(@D))_files)" --goarch="$(GOARCH)"
--bench="$(GOBENCH)" $(GOTESTFLAGS) $(go_$(subst /,_,$(@D))_test_files); \
+ $(SHELL) $(srcdir)/testsuite/gotest --goarch=$(GOARCH) --goos=$(GOOS)
--basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --pkgpath="$(@D)"
--pkgfiles="$(go_$(subst /,_,$(@D))_files)" --bench="$(GOBENCH)" $(GOTESTFLAGS)
$(go_$(subst /,_,$(@D))_test_files); \
else \
- if $(SHELL) $(srcdir)/testsuite/gotest --goarch=$(GOARCH)
--goos=$(GOOS) --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D)
--pkgpath="$(@D)" --pkgfiles="$(go_$(subst /,_,$(@D))_files)"
--goarch="$(GOARCH)" $(GOTESTFLAGS) $(go_$(subst /,_,$(@D))_test_files)
>>$@-testlog 2>&1; then \
+ if $(SHELL) $(srcdir)/testsuite/gotest --goarch=$(GOARCH)
--goos=$(GOOS) --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D)
--pkgpath="$(@D)" --pkgfiles="$(go_$(subst /,_,$(@D))_files)" $(GOTESTFLAGS)
$(go_$(subst /,_,$(@D))_test_files) >>$@-testlog 2>&1; then \
echo "PASS: $(@D)" >> $@-testlog; \
echo "PASS: $(@D)"; \
echo "PASS: $(@D)" > $@-testsum; \
Index: libgo/testsuite/gotest
===================================================================
--- libgo/testsuite/gotest (revision 229616)
+++ libgo/testsuite/gotest (working copy)
@@ -35,7 +35,6 @@ keep=false
pkgpath=
prefix=
dejagnu=no
-GOARCH=""
timeout=240
testname=""
bench=""
@@ -118,15 +117,6 @@ while $loop; do
dejagnu=`echo $1 | sed -e 's/^--dejagnu=//'`
shift
;;
- x--goarch)
- GOARCH=$2
- shift
- shift
- ;;
- x--goarch=*)
- GOARCH=`echo $1 | sed -e 's/^--goarch=//'`
- shift
- ;;
x--timeout)
timeout=$2
shift
@@ -496,7 +486,7 @@ localname() {
{
text="T"
- case "$GOARCH" in
+ case "$goarch" in
ppc64*) text="[TD]" ;;
esac
