libgo: keep c0 and c1 out of runtime.inc

    The constants named c0 and c1 turn up as macros in runtime.inc.  This
    reportedly breaks building on Solaris 11, where there is a system struct
    that has a field named c1.  The constants aren't needed by the runtime C
    code, so avoid the problem by grepping them out.

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

From-SVN: r241432

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 97be99e0c021c6a5608bf2d8b559feadce1099c7..fcc2f9f9af9f98b3a9cb2b2fded3fe4a0824c44f 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-9806c8a8e4e448eaf6810ff1acffa715745d2549
+6d9929a1641b180e724c2fdcdd55f6a254f1dec0
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.

diff --git a/libgo/Makefile.am b/libgo/Makefile.am
index 1e99810f478873789bd5b70d2d3d2da1a0050cd6..2e46ecd514f8d899d346693cfb66607320c4b281 100644 (file)
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -1230,7 +1230,7 @@ runtime-go.lo:
 runtime.inc: s-runtime-inc; @true
 s-runtime-inc: runtime-go.lo Makefile
        rm -f runtime.inc.tmp2
-       grep -v "#define _" runtime.inc.tmp > runtime.inc.tmp2
+       grep -v "#define _" runtime.inc.tmp | grep -v "#define c0 " | grep -v "#define c1 " > runtime.inc.tmp2
        for pattern in '_G[a-z]' '_P[a-z]' _Max _Lock _Sig _Trace _MHeap _Num; do \
          grep "#define $$pattern" runtime.inc.tmp >> runtime.inc.tmp2; \
        done

diff --git a/libgo/Makefile.in b/libgo/Makefile.in
index c85ec502236d27d7492c8d671b7f0757f54e0f4d..25b5a7be8ebbdbd1987889ce28dd98cee3d0a221 100644 (file)
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -3621,7 +3621,7 @@ runtime-go.lo:
 runtime.inc: s-runtime-inc; @true
 s-runtime-inc: runtime-go.lo Makefile
        rm -f runtime.inc.tmp2
-       grep -v "#define _" runtime.inc.tmp > runtime.inc.tmp2
+       grep -v "#define _" runtime.inc.tmp | grep -v "#define c0 " | grep -v "#define c1 " > runtime.inc.tmp2
        for pattern in '_G[a-z]' '_P[a-z]' _Max _Lock _Sig _Trace _MHeap _Num; do \
          grep "#define $$pattern" runtime.inc.tmp >> runtime.inc.tmp2; \
        done