From: Ian Lance Taylor <ian@gcc.gnu.org>
Date: Mon, 5 Feb 2018 01:38:34 +0000 (+0000)
Subject: cmd/go: don't lose last flag from _cgo_flags
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=59597e373547a60ee635083f06ef322f8537f7c0;p=gcc.git

cmd/go: don't lose last flag from _cgo_flags

    The quoting code that read _cgo_flags, currently only in the gccgo
    version of cmd/go, was losing the last flag read from the file.

    Fixes golang/go#23666

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

From-SVN: r257373
---

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 34d0e520fdf..9cf3b14e31a 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-981e6621bcd48670d0b58e51e9eeffe549725378
+9057b8f71e6078f140938fe60be9aaa7d59a3a2b
 
 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/work/gccgo.go b/libgo/go/cmd/go/internal/work/gccgo.go
index 8f558460705..72d4d9dd4ba 100644
--- a/libgo/go/cmd/go/internal/work/gccgo.go
+++ b/libgo/go/cmd/go/internal/work/gccgo.go
@@ -258,6 +258,9 @@ func (tools gccgoToolchain) link(b *Builder, root *Action, out, importcfg string
 					nl = append(nl, b)
 					start = false
 				}
+				if len(nl) > 0 {
+					cgoldflags = append(cgoldflags, string(nl))
+				}
 			}
 		}
 		return nil