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 f49be92fbcaa90935a1ec6a46d4d45a2f73f1f1a..edcea96094c85431eddfb0755fdf2df93aff9794 100644 (file)
--- 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 6ab80e625d933260a624510765fd006450cf13d8..44a3a6b505f35919a1b818a3372eb769ea86fe6f 100755 (executable)
--- 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 7a74269443f2636f9b5c412527203a6a0ade2e87..54978b979972afbd276f1c520d401f897cf2ab2d 100755 (executable)
--- 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}