From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Tue, 25 Sep 2018 14:16:32 +0000 (+0000)
Subject: cmd/go: pass down testing gccgo in TestScript
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b16084d244418d5421505f09851b5adf5abc35ec;p=gcc.git

cmd/go: pass down testing gccgo in TestScript

    This permits TestScript to work when gccgo is not installed.
    Previous testing was using a previously installed gccgo, not the newly
    built one.

    This revealed that the testing of whether an internal package is
    permitted was incorrect for standard library packages, since the
    uninstalled gccgo can see internal packages in the uninstalled libgo.
    Fix the internal package tests.

    This permitted removing a couple of gccgo-specific changes in the
    testsuite.

    Reviewed-on: https://go-review.googlesource.com/137255

From-SVN: r264570
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 175db5d4202..65693ffebbc 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-7b25b4dff4778fc4d6b5d6e10594814146b3e5dd
+1dbc5b805a1665079008d1ce341991c3554c1eeb
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.
diff --git a/libgo/go/cmd/go/internal/load/pkg.go b/libgo/go/cmd/go/internal/load/pkg.go
index 0579fd5ca53..b6c90378881 100644
--- a/libgo/go/cmd/go/internal/load/pkg.go
+++ b/libgo/go/cmd/go/internal/load/pkg.go
@@ -953,8 +953,14 @@ func disallowInternal(srcDir string, importer *Package, importerPath string, p *
 	}
 
 	// We can't check standard packages with gccgo.
-	if cfg.BuildContext.Compiler == "gccgo" && p.Standard {
-		return p
+	if cfg.BuildContext.Compiler == "gccgo" {
+		if importer == nil {
+			if p.Standard {
+				return p
+			}
+		} else if importer.Standard || strings.HasPrefix(importerPath, "cmd/") {
+			return p
+		}
 	}
 
 	// The stack includes p.ImportPath.
diff --git a/libgo/go/cmd/go/script_test.go b/libgo/go/cmd/go/script_test.go
index 02cb17b0452..9e958e0c635 100644
--- a/libgo/go/cmd/go/script_test.go
+++ b/libgo/go/cmd/go/script_test.go
@@ -78,6 +78,7 @@ var extraEnvKeys = []string{
 
 	// For gccgo testing.
 	"GO_TESTING_GOTOOLS",
+	"GCCGO",
 	"GCCGOTOOLDIR",
 }
 
diff --git a/libgo/go/cmd/go/testdata/script/mod_internal.txt b/libgo/go/cmd/go/testdata/script/mod_internal.txt
index 84e77c6d83c..72706fdc7b4 100644
--- a/libgo/go/cmd/go/testdata/script/mod_internal.txt
+++ b/libgo/go/cmd/go/testdata/script/mod_internal.txt
@@ -16,11 +16,11 @@ stderr 'use of internal package golang.org/x/.* not allowed'
 
 # Internal packages in the standard library should not leak into modules.
 ! go build ./fromstd
-[!gccgo] stderr 'use of internal package internal/testenv not allowed'
+stderr 'use of internal package internal/testenv not allowed'
 
 # Packages found via standard-library vendoring should not leak.
 ! go build ./fromstdvendor
-[!gccgo] stderr 'use of vendored package golang_org/x/net/http/httpguts not allowed'
+stderr 'use of vendored package golang_org/x/net/http/httpguts not allowed'
 
 env GO111MODULE=off
 ! go build ./fromstdvendor