diff options
author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-09-29 14:14:40 +0000 |
---|---|---|
committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2017-09-29 14:14:40 +0000 |
commit | 47e8a478fd9ba3848b6206349c2205919d180d00 (patch) | |
tree | 5253d7739fbd73f74be1b133cbbf6cc028d53f1c | |
parent | cd24e4977ad210b046562f89308eee7e1d7c7619 (diff) | |
download | gcc-47e8a478fd9ba3848b6206349c2205919d180d00.tar.gz |
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
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@253291 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
-rwxr-xr-x | libgo/mkrsysinfo.sh | 1 | ||||
-rwxr-xr-x | libgo/mksysinfo.sh | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 12cba43421a..56ede0d4c9b 100644 --- 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 44a3a6b505f..aee0163c365 100755 --- 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 f7e88a6de26..cbe5b979418 100755 --- 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' \ |