diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2016-10-21 21:01:04 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2016-10-21 21:01:04 +0000 |
| commit | 15ca61bc74441eba56703c41a98cd8c0b304fd2b (patch) | |
| tree | 3ef4649d004aab9fb6d2266e38db8457ab87d01a | |
| parent | 6156a05a2588e36f69b279bfa21025892cab4338 (diff) | |
| download | gcc-15ca61bc74441eba56703c41a98cd8c0b304fd2b.zip gcc-15ca61bc74441eba56703c41a98cd8c0b304fd2b.tar.gz gcc-15ca61bc74441eba56703c41a98cd8c0b304fd2b.tar.bz2 | |
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
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/Makefile.am | 2 | ||||
| -rw-r--r-- | libgo/Makefile.in | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 97be99e..fcc2f9f 100644 --- 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 1e99810..2e46ecd 100644 --- 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 c85ec50..25b5a7b 100644 --- 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 |