From: Ian Lance Taylor Date: Thu, 31 Aug 2017 20:07:55 +0000 (+0000) Subject: mksysinfo: fix in6_addr in mld_hdr_t for Solaris X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f522b07d8dc5c46683a5ef6b283e4fa9749bbb63;p=gcc.git mksysinfo: fix in6_addr in mld_hdr_t for Solaris Patch by Rainer Orth. Reviewed-on: https://go-review.googlesource.com/60732 From-SVN: r251574 --- diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index f49be92fbca..edcea96094c 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -5674b5927d5336e20fbec455a9f7b0b8ed70166c +9d0d5c03a8086f5dd3a23e910abd6e470196973c 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 6ab80e625d9..44a3a6b505f 100755 --- a/libgo/mkrsysinfo.sh +++ b/libgo/mkrsysinfo.sh @@ -36,6 +36,10 @@ grep -v '^// ' gen-sysinfo.go | \ grep '^type _arpcom ' gen-sysinfo.go | \ sed -e 's/_in6_addr/[16]byte/' >> ${OUT} +# Same on Solaris for _mld_hdr_t. +grep '^type _mld_hdr_t ' gen-sysinfo.go | \ + sed -e 's/_in6_addr/[16]byte/' >> ${OUT} + # The time structures need special handling: we need to name the # types, so that we can cast integers to the right types when # assigning to the structures. diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh index 7a74269443f..54978b97997 100755 --- a/libgo/mksysinfo.sh +++ b/libgo/mksysinfo.sh @@ -48,6 +48,10 @@ grep -v '^// ' gen-sysinfo.go | \ grep '^type _arpcom ' gen-sysinfo.go | \ sed -e 's/_in6_addr/[16]byte/' >> ${OUT} +# Same on Solaris for _mld_hdr_t. +grep '^type _mld_hdr_t ' gen-sysinfo.go | \ + sed -e 's/_in6_addr/[16]byte/' >> ${OUT} + # The errno constants. These get type Errno. egrep '#define E[A-Z0-9_]+ ' errno.i | \ sed -e 's/^#define \(E[A-Z0-9_]*\) .*$/const \1 = Errno(_\1)/' >> ${OUT}