mksysinfo: strip locale structs

    We don't need them, and this fixes the build when using uClibc-ng
    1.0.26 as originally reported at
    https://gcc.gnu.org/ml/gcc-patches/2017-09/msg01930.html

    Reviewed-on: https://go-review.googlesource.com/67110

From-SVN: r253291

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 12cba43421a04cce61b5aefa3572c47e79824400..56ede0d4c9b49ad260a70da8cfe69d1a528f89b8 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-11b7dae7de94215e92eb46e703cfecd76c0a3282
+9a9d526a4c0a7f5b3635034b3e1dc3bbe6380dd2
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.

diff --git a/libgo/mkrsysinfo.sh b/libgo/mkrsysinfo.sh
index 44a3a6b505f35919a1b818a3372eb769ea86fe6f..aee0163c365f5ee3d4f1d3e9b659d5d563f55da4 100755 (executable)
--- a/libgo/mkrsysinfo.sh
+++ b/libgo/mkrsysinfo.sh
@@ -23,6 +23,7 @@ grep -v '^// ' gen-sysinfo.go | \
   grep -v '^type _timespec_t ' | \
   grep -v '^type _timespec ' | \
   grep -v '^type _epoll_' | \
+  grep -v '^type _*locale[_ ]' | \
   grep -v 'in6_addr' | \
   grep -v 'sockaddr_in6' | \
   sed -e 's/\([^a-zA-Z0-9_]\)_timeval\([^a-zA-Z0-9_]\)/\1timeval\2/g' \

diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
index f7e88a6de26cc30fdcb6c6f5a24be0a2e6aacaa7..cbe5b979418c5c8b9521cabe49a7f8b3e74c4df0 100755 (executable)
--- a/libgo/mksysinfo.sh
+++ b/libgo/mksysinfo.sh
@@ -34,6 +34,7 @@ grep -v '^// ' gen-sysinfo.go | \
   grep -v '^type _timespec ' | \
   grep -v '^type _timestruc_t ' | \
   grep -v '^type _epoll_' | \
+  grep -v '^type _*locale[_ ]' | \
   grep -v 'in6_addr' | \
   grep -v 'sockaddr_in6' | \
   sed -e 's/\([^a-zA-Z0-9_]\)_timeval\([^a-zA-Z0-9_]\)/\1Timeval\2/g' \