aboutsummaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2019-09-11 12:44:12 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2019-09-11 12:44:12 +0000
commitd694576e174d95b7f6066d924715691c55824f30 (patch)
treeaf823b9b492afa34174b7e138d7d5141dee16cd3 /gcc/go
parentc5748fdbf403203195e20cfc06acfa96a733486e (diff)
downloadgcc-d694576e174d95b7f6066d924715691c55824f30.zip
gcc-d694576e174d95b7f6066d924715691c55824f30.tar.gz
gcc-d694576e174d95b7f6066d924715691c55824f30.tar.bz2
gotest: force test package to be imported first
When compiling the x_test package, force the test package to be imported first. That ensures that we will see the types defined in the test package before the types defined in the non-test version of the package. This matters if the types differ in some way, such as by adding a new method. This avoids a failure in internal/poll on Solaris, in which the test package adds a method to a type (FD.EOFError). I think it was Solaris- specific because files are sorted in a different order by default. The go tool handles this kind of thing correctly, by rebuilding dependent packages. This is just a hack sufficient to run the libgo testsuite without using the go tool. Fixes https://gcc.gnu.org/PR91712 Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/194637 From-SVN: r275648
Diffstat (limited to 'gcc/go')
-rw-r--r--gcc/go/gofrontend/MERGE2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 61845bc..895aa6f 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-bf4832d604e7522dee78fca76de220b62a131d54
+1f4ce28409a2d9d4045b1085de55c46de8759d1c
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.