diff options
| -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 12cba43..56ede0d 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 44a3a6b..aee0163 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 f7e88a6..cbe5b97 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' \ |