syscall: always define WEXITED and WNOWAIT on GNU/Linux

    Fixes https://gcc.gnu.org/PR88135

    Reviewed-on: https://go-review.googlesource.com/c/150897

From-SVN: r266495

diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 89d79def76843e7df73624a6926f1e50e7be06d7..d68d123bd278de9c0e0271fda2763bea5672281d 100644 (file)
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-26639de5b48ca895f517b7b5f5720b2613f885ce
+3ecc845c337c15d9a19ed8d277e5ee9eaf49c3ad
 
 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 d4286dc1b1d52430a4f7f885ca4801f105d97302..02f0b5b82fe08d04a2e268312360decb2e56646e 100755 (executable)
--- a/libgo/mksysinfo.sh
+++ b/libgo/mksysinfo.sh
@@ -173,6 +173,15 @@ if grep '^const ___WALL = ' gen-sysinfo.go >/dev/null 2>&1 \
    && ! grep '^const _WALL = ' gen-sysinfo.go >/dev/null 2>&1; then
   echo 'const WALL = ___WALL' >> ${OUT}
 fi
+# On GNU/Linux the os package requires WEXITED and WNOWAIT.
+if test "${GOOS}" = "linux"; then
+  if ! grep '^const WEXITED = ' ${OUT} >/dev/null 2>&1; then
+    echo 'const WEXITED = 4' >> ${OUT}
+  fi
+  if ! grep '^const WNOWAIT = ' ${OUT} >/dev/null 2>&1; then
+    echo 'const WNOWAIT = 0x01000000' >> ${OUT}
+  fi
+fi
 
 # Networking constants.
 egrep '^const _(AF|ARPHRD|ETH|IN|SOCK|SOL|SO|IPPROTO|TCP|IP|IPV6)_' gen-sysinfo.go |