aboutsummaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2016-08-11 21:36:13 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2016-08-11 21:36:13 +0000
commit3d0fa95d5c3c8826c9bc5ce746b220aa36581afb (patch)
treeeb198c376760f44b13eac6992dd8e740f9a45c75 /gcc/go
parenta8b956c1bc767a2f7730d64edd1b31b8fb13420f (diff)
downloadgcc-3d0fa95d5c3c8826c9bc5ce746b220aa36581afb.zip
gcc-3d0fa95d5c3c8826c9bc5ce746b220aa36581afb.tar.gz
gcc-3d0fa95d5c3c8826c9bc5ce746b220aa36581afb.tar.bz2
os: fix build tags for dir_regfile.go
We want to build dir_regfile.go if not GNU/linux, and not solaris/386, and not solaris/sparc. The latter two conditions were incorrect. To write ! solaris/386 we have to write !solaris !386. I forgot De Morgan's Law. Reviewed-on: https://go-review.googlesource.com/26870 From-SVN: r239393
Diffstat (limited to 'gcc/go')
-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 68e414b..1ebefe6 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-5e05b7bc947231b4d5a8327bf63e2fa648e51dc7
+fe1e77f843220503f1f8d5ea7dd5e307580e1d38
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.