From: ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sat, 23 Apr 2016 00:41:03 +0000 (+0000)
Subject:     cmd/go: bring in final version of gccgo pkg-config support
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6baae25622af1c981cfa2c9058a0bbc6e0ea4aac;p=thirdparty%2Fgcc.git

cmd/go: bring in final version of gccgo pkg-config support

    This updates gccgo to the final version of https://golang.org/cl/18790,
    by Michael Hudson-Doyle.

    Update golang/go#11739.

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


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@235380 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index ce20dad142f7..5c8cd7d6f18d 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-ff29ea8e4e69eb94958aef4388da09a61b2b52b6
+97b358f525584e45fa2e3d83fc7d3a091900927a
 
 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/build.go b/libgo/go/cmd/go/build.go
index 4382cf72ed7f..d7a4a43093d2 100644
--- a/libgo/go/cmd/go/build.go
+++ b/libgo/go/cmd/go/build.go
@@ -2647,9 +2647,18 @@ func (tools gccgoToolchain) ld(b *builder, root *action, out string, allactions
 		if err != nil {
 			return err
 		}
+		const ldflagsPrefix = "_CGO_LDFLAGS="
 		for _, line := range strings.Split(string(flags), "\n") {
-			if strings.HasPrefix(line, "_CGO_LDFLAGS=") {
-				cgoldflags = append(cgoldflags, strings.Fields(line[13:])...)
+			if strings.HasPrefix(line, ldflagsPrefix) {
+				newFlags := strings.Fields(line[len(ldflagsPrefix):])
+				for _, flag := range newFlags {
+					// Every _cgo_flags file has -g and -O2 in _CGO_LDFLAGS
+					// but they don't mean anything to the linker so filter
+					// them out.
+					if flag != "-g" && !strings.HasPrefix(flag, "-O") {
+						cgoldflags = append(cgoldflags, flag)
+					}
+				}
 			}
 		}
 		return nil