aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2016-08-03 22:46:06 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2016-08-03 22:46:06 +0000
commit9c26dfd08a1374c6c1137ad13b9bfe402c66d299 (patch)
tree38f3f1c3dbee66f77aa716bd1022a2c9a6b1781d /gcc
parentac2c96ab1233e1c3dcd29a4854ae4eb7d0f68199 (diff)
downloadgcc-9c26dfd08a1374c6c1137ad13b9bfe402c66d299.zip
gcc-9c26dfd08a1374c6c1137ad13b9bfe402c66d299.tar.gz
gcc-9c26dfd08a1374c6c1137ad13b9bfe402c66d299.tar.bz2
gotest: multiple +build lines must all be true
The code that handled +build lines did not correctly require them to all be true. While looking into this I discovered that multiple +build lines were mishandled in a different way, because the shell does not preseve line breaks in backquoted data. Look for the +build token to tell us when we are switching from one +build line to another. Reviewed-on: https://go-review.googlesource.com/25460 From-SVN: r239100
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 1d83328..58066bd 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-0fb416a7bed076bdfef168480789bb2994a58de3
+3096ac81185edacbf800783f0f803d1c419dccdd
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.