diff options
| author | Ian Lance Taylor <iant@google.com> | 2015-11-03 15:07:47 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <iant@google.com> | 2015-11-03 15:07:47 +0000 |
| commit | 042ca1fea289d0decee3ca2e5c94e1ccba78070c (patch) | |
| tree | 5c3df45845766d9a54859597c9b9d3fcd67f98ac | |
| parent | d46ea066de2aa42bb70883962183d9a137cc0062 (diff) | |
mksysinfo.sh: Make sure that CLONE_NEWUSER is defined.
Reviewed-on: https://go-review.googlesource.com/16588
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@229711 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rwxr-xr-x | libgo/mksysinfo.sh | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index b8276eee350..23b53bead86 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -28fbc7f42702ce081ef5f3ce9a1dbc1ed3f3c89e +10e0f935ac369f8403c198b05c909e42e565c1e5 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 3bb7eabdcc8..6d39df96e95 100755 --- a/libgo/mksysinfo.sh +++ b/libgo/mksysinfo.sh @@ -1444,6 +1444,11 @@ grep '^type _inotify_event ' gen-sysinfo.go | \ # The GNU/Linux CLONE flags. grep '^const _CLONE_' gen-sysinfo.go | \ sed -e 's/^\(const \)_\(CLONE_[^= ]*\)\(.*\)$/\1\2 = _\2/' >> ${OUT} +# We need some CLONE constants that are not defined in older versions +# of glibc. +if ! grep '^const CLONE_NEWUSER ' ${OUT} > /dev/null 2>&1; then + echo "const CLONE_NEWUSER = 0x10000000" >> ${OUT} +fi # Struct sizes. set cmsghdr Cmsghdr ip_mreq IPMreq ip_mreqn IPMreqn ipv6_mreq IPv6Mreq \ |