libgo: don't copy semt into runtime.inc

    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

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 5c5602188da62fb7ff0f77c220bdbb08b5a1bd41..524aca72fd75c26bde5c81c18c8afac66f0ab0ce 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -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.

diff --git a/libgo/Makefile.am b/libgo/Makefile.am
index 0f9881ffaa4e122d311d82e9b2d565090d1faf70..b94ac0c526cfbe6013787aed376297d6eea13b34 100644 (file)
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -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

diff --git a/libgo/Makefile.in b/libgo/Makefile.in
index 2452f967252ba14abfbc8de9737672b50d70c220..ba0a923c40ed9aca65c38e9104759a4c46b6f748 100644 (file)
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -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

diff --git a/libgo/configure b/libgo/configure
index 48feebdb10d4d57ad837272cbb6b84159b87a196..cfdcd7409c500a375df7beec9c7661c067cb3d9d 100755 (executable)
--- a/libgo/configure
+++ b/libgo/configure
@@ -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