mksysinfo.sh: always define CLONE_NEWNET

    CLONE_NEWNET is needed to compile the syscall tests on GNU/Linux.
    The symbol is not defined in the CentOS 5.11 header files.

    Patch from Uros Bizjak.

    Reviewed-on: https://go-review.googlesource.com/26630

From-SVN: r239296

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index f14fdec06dc40e2ba949944b4ff071acaa706469..b23a1f55bd11096dc2e38dccb9bf5b82358d05d9 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-58be5c6c7d92182dec50a62c8e319d2d7aab12a4
+d3636ca659ed7eed6d2e1cedfa0adccc6d81c07d
 
 The first line of this file holds the git revision number of the last
 merge done from the gofrontend repository.

diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh
index 026bef2dbf958380c7c2b3a25c2403b8f1c19b75..ac5f08631995d34ae3e09dafc4665cf413c726a4 100755 (executable)
--- a/libgo/mksysinfo.sh
+++ b/libgo/mksysinfo.sh
@@ -1475,6 +1475,9 @@ grep '^const _CLONE_' gen-sysinfo.go | \
 if ! grep '^const CLONE_NEWUSER ' ${OUT} > /dev/null 2>&1; then
   echo "const CLONE_NEWUSER = 0x10000000" >> ${OUT}
 fi
+if ! grep '^const CLONE_NEWNET ' ${OUT} > /dev/null 2>&1; then
+  echo "const CLONE_NEWNET = 0x40000000" >> ${OUT}
+fi
 
 # Struct sizes.
 set cmsghdr Cmsghdr ip_mreq IPMreq ip_mreqn IPMreqn ipv6_mreq IPv6Mreq \