This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[libgo] Remove Solaris 11.1+ zone_net_addr_t treatment
- From: Rainer Orth <ro at CeBiTec dot Uni-Bielefeld dot DE>
- To: gcc-patches at gcc dot gnu dot org
- Cc: Ian Lance Taylor <iant at google dot com>
- Date: Mon, 03 Nov 2014 17:59:32 +0100
- Subject: [libgo] Remove Solaris 11.1+ zone_net_addr_t treatment
- Authentication-results: sourceware.org; auth=none
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.
Bootstrapped without regressions on i386-pc-solaris2.1[01], ok for
mainline?
Rainer
2014-10-31 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* mksysinfo.sh (_zone_net_addr_t): Remove handling.
# HG changeset patch
# Parent 99be3781928c62bd9d00f98b4cd5304bcc7d8043
Remove Solaris 11.1+ zone_net_addr_t treatment
diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
--- a/libgo/mksysinfo.sh
+++ b/libgo/mksysinfo.sh
@@ -1203,11 +1203,6 @@ grep '^type _inotify_event ' gen-sysinfo
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 \
--
-----------------------------------------------------------------------------
Rainer Orth, Center for Biotechnology, Bielefeld University