mksysinfo, net: Always define syscall.SO_REUSEPORT.

From-SVN: r186857

diff --git a/libgo/go/net/sockopt_bsd.go b/libgo/go/net/sockopt_bsd.go
index fff65f362b19007bee28b80c4fb627cae804dd40..af88814b4b9ed918b66041f13e1aa2c5ace68864 100644 (file)
--- a/libgo/go/net/sockopt_bsd.go
+++ b/libgo/go/net/sockopt_bsd.go
@@ -53,9 +53,11 @@ func setDefaultMulticastSockopts(s int) error {
        // This option is supported only in descendants of 4.4BSD,
        // to make an effective multicast application that requires
        // quick draw possible.
-       err = syscall.SetsockoptInt(s, syscall.SOL_SOCKET, syscall.SO_REUSEPORT, 1)
-       if err != nil {
-               return os.NewSyscallError("setsockopt", err)
+       if syscall.SO_REUSEPORT != 0 {
+               err = syscall.SetsockoptInt(s, syscall.SOL_SOCKET, syscall.SO_REUSEPORT, 1)
+               if err != nil {
+                       return os.NewSyscallError("setsockopt", err)
+               }
        }
        return nil
 }

diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
index 4f5153334aa497e3c7093ba4040fe2d17e68f28f..db61a73c0ac9f7628c72a7e5335fc76238728f5f 100755 (executable)
--- a/libgo/mksysinfo.sh
+++ b/libgo/mksysinfo.sh
@@ -264,7 +264,7 @@ grep '^const _SHUT_' gen-sysinfo.go |
   sed -e 's/^\(const \)_\(SHUT[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT}
 
 # The net package requires some const definitions.
-for m in IP_PKTINFO IPV6_V6ONLY IPPROTO_IPV6 IPV6_JOIN_GROUP IPV6_LEAVE_GROUP IPV6_TCLASS; do
+for m in IP_PKTINFO IPV6_V6ONLY IPPROTO_IPV6 IPV6_JOIN_GROUP IPV6_LEAVE_GROUP IPV6_TCLASS SO_REUSEPORT; do
   if ! grep "^const $m " ${OUT} >/dev/null 2>&1; then
     echo "const $m = 0" >> ${OUT}
   fi