Commit 15ca61bc by Ian Lance Taylor

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
parent 6156a05a
9806c8a8e4e448eaf6810ff1acffa715745d2549 6d9929a1641b180e724c2fdcdd55f6a254f1dec0
The first line of this file holds the git revision number of the last The first line of this file holds the git revision number of the last
merge done from the gofrontend repository. merge done from the gofrontend repository.
...@@ -1230,7 +1230,7 @@ runtime-go.lo: ...@@ -1230,7 +1230,7 @@ runtime-go.lo:
runtime.inc: s-runtime-inc; @true runtime.inc: s-runtime-inc; @true
s-runtime-inc: runtime-go.lo Makefile s-runtime-inc: runtime-go.lo Makefile
rm -f runtime.inc.tmp2 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 \ 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; \ grep "#define $$pattern" runtime.inc.tmp >> runtime.inc.tmp2; \
done done
......
...@@ -3621,7 +3621,7 @@ runtime-go.lo: ...@@ -3621,7 +3621,7 @@ runtime-go.lo:
runtime.inc: s-runtime-inc; @true runtime.inc: s-runtime-inc; @true
s-runtime-inc: runtime-go.lo Makefile s-runtime-inc: runtime-go.lo Makefile
rm -f runtime.inc.tmp2 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 \ 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; \ grep "#define $$pattern" runtime.inc.tmp >> runtime.inc.tmp2; \
done done
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment