mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-08 19:20:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

libgo: keep c0 and c1 out of runtime.inc

Browse Source 
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
This commit is contained in:
Ian Lance Taylor 2016-10-21 21:01:04 +00:00
parent 6156a05a25
commit 15ca61bc74
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gcc/go/gofrontend/MERGE
View File

@ -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.

2
libgo/Makefile.am
View File

@ -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

2
libgo/Makefile.in
View File

@ -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