From 898c81f8312dedffeed01aac035324a698c249c7 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 6 Feb 2015 16:18:14 +0000 Subject: [PATCH] mksysinfo.sh: Remove _zone_net_addr_t handling. From Rainer Orth. The recent godump changes broke Solaris 11.1+ bootstrap in libgo: before, gen-sysinfo.so had type _zone_net_addr_t struct { zna_family uint16; zna_plen uint16; zna_addru struct { znau_addr6 _in6_addr; }; } which was filtered out by mksysinfo.sh due to the use of _in6_addr. After the change, there's now type _zone_net_addr_t struct { zna_family uint16; zna_plen uint16; zna_addru struct { znau_addr6 [16]byte; Godump_0_align [0]uint32; }; } instead, not filtered, but added a second time by the _zone_net_addr_t code in mksysinfo.sh, which leads to redefinition warnings/errors. Simply removing the old _zone_net_addr_t fragment fixes this and restores bootstrap. From-SVN: r220481 --- libgo/mksysinfo.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh index ddfa8bb91345..a977f56937b2 100755 --- a/libgo/mksysinfo.sh +++ b/libgo/mksysinfo.sh @@ -1240,11 +1240,6 @@ grep '^type _inotify_event ' gen-sysinfo.go | \ grep '^const _CLONE_' gen-sysinfo.go | \ sed -e 's/^\(const \)_\(CLONE_[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT} -# The Solaris 11 Update 1 _zone_net_addr_t struct. -grep '^type _zone_net_addr_t ' gen-sysinfo.go | \ - sed -e 's/_in6_addr/[16]byte/' \ - >> ${OUT} - # Struct sizes. set cmsghdr Cmsghdr ip_mreq IPMreq ip_mreqn IPMreqn ipv6_mreq IPv6Mreq \ ifaddrmsg IfAddrmsg ifinfomsg IfInfomsg in_pktinfo Inet4Pktinfo \ -- 2.47.2