aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2018-02-05 01:38:34 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2018-02-05 01:38:34 +0000
commit59597e373547a60ee635083f06ef322f8537f7c0 (patch)
tree6ec8b83dfacb7196cfc08401ace4fa0a2def9067 /gcc
parent56d6cc37bde81bb79abc0540346dc414e148ce29 (diff)
downloadgcc-59597e373547a60ee635083f06ef322f8537f7c0.zip
gcc-59597e373547a60ee635083f06ef322f8537f7c0.tar.gz
gcc-59597e373547a60ee635083f06ef322f8537f7c0.tar.bz2
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
Diffstat (limited to 'gcc')
-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 34d0e52..9cf3b14 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.