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

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 68e414b4e8b1834ec827981e9c84b9a3ef474c14..1ebefe6b0205006439b1e5afec5fdedca04f3629 100644 (file)
--- 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.

diff --git a/libgo/go/os/dir_regfile.go b/libgo/go/os/dir_regfile.go
index adea87d5430416017f96fb7b5f77d1cbb2a45a68..8b17f387f1cf48c8b74a49adac060cef06accbb9 100644 (file)
--- a/libgo/go/os/dir_regfile.go
+++ b/libgo/go/os/dir_regfile.go
@@ -6,8 +6,8 @@
 // license that can be found in the LICENSE file.
 
 // +build !linux
-// +build !solaris,386
-// +build !solaris,sparc
+// +build !solaris !386
+// +build !solaris !sparc
 
 package os