mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-05 13:30:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

libgo: don't copy semt into runtime.inc

Browse Source 
https://gcc.gnu.org/PR81449 reports a problem with the definition semt
    in runtime.inc on some systems. Since the C code in libgo/runtime
    doesn't need semt, just don't copy it into runtime.inc.
    
    Reviewed-on: https://go-review.googlesource.com/48593

From-SVN: r250217
This commit is contained in:
Ian Lance Taylor 2017-07-14 22:25:26 +00:00
parent b9d36a8daf
commit f30d20915d
4 changed files with 8 additions and 4 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 @@
a77b1091fa83cfaf200e6dad26e92e42483bae43
2ae6bf76f97f7d4c63a1f0ad0683b9ba62baaf06
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.

4
libgo/Makefile.am
View File

@ -543,6 +543,8 @@ s-sigtab: $(srcdir)/mksigtab.sh gen-sysinfo.go
# _Complex_lock and _Reader_lock are Go translations of some AIX system
# types and should not be exported back to C
# semt is a Go translation of the C type sem_t; it fails to convert on
# some systems and need not be exported back to C.
# sigset conflicts with system type sigset on AIX, so we need to rename it
runtime.inc: s-runtime-inc; @true
s-runtime-inc: runtime.lo Makefile
@ -551,7 +553,7 @@ s-runtime-inc: runtime.lo Makefile
for pattern in '_[GP][a-z]' _Max _Lock _Sig _Trace _MHeap _Num; do \
grep "#define $$pattern" runtime.inc.tmp >> runtime.inc.tmp2; \
done
for TYPE in _Complex_lock _Reader_lock; do \
for TYPE in _Complex_lock _Reader_lock semt; do \
sed -e '/struct '$${TYPE}' {/,/^}/s/^.*$$//' runtime.inc.tmp2 > runtime.inc.tmp3; \
mv runtime.inc.tmp3 runtime.inc.tmp2; \
done

4
libgo/Makefile.in
View File

@ -3093,6 +3093,8 @@ s-sigtab: $(srcdir)/mksigtab.sh gen-sysinfo.go
# _Complex_lock and _Reader_lock are Go translations of some AIX system
# types and should not be exported back to C
# semt is a Go translation of the C type sem_t; it fails to convert on
# some systems and need not be exported back to C.
# sigset conflicts with system type sigset on AIX, so we need to rename it
runtime.inc: s-runtime-inc; @true
s-runtime-inc: runtime.lo Makefile
@ -3101,7 +3103,7 @@ s-runtime-inc: runtime.lo Makefile
for pattern in '_[GP][a-z]' _Max _Lock _Sig _Trace _MHeap _Num; do \
grep "#define $$pattern" runtime.inc.tmp >> runtime.inc.tmp2; \
done
for TYPE in _Complex_lock _Reader_lock; do \
for TYPE in _Complex_lock _Reader_lock semt; do \
sed -e '/struct '$${TYPE}' {/,/^}/s/^.*$$//' runtime.inc.tmp2 > runtime.inc.tmp3; \
mv runtime.inc.tmp3 runtime.inc.tmp2; \
done

2
libgo/configure vendored
View File

@ -13773,7 +13773,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
esac
case "${host}" in
mips*el-*-*)
GOARCH="${GOARCH}le"
GOARCH="${GOARCH}le"
;;
*)
GOARCH_BIGENDIAN=1