diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2013-11-11 21:21:50 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2013-11-11 21:21:50 +0000 |
| commit | 3c450181dc21de5fac5e6d96600bbdd16cb7fdcb (patch) | |
| tree | 4f7025cbbf5334e10ed41103edbe6ce63bd5b86d | |
| parent | 35aacd4cc9fa3b7c80192eb0e78ea7bba7e56358 (diff) | |
| download | gcc-3c450181dc21de5fac5e6d96600bbdd16cb7fdcb.zip gcc-3c450181dc21de5fac5e6d96600bbdd16cb7fdcb.tar.gz gcc-3c450181dc21de5fac5e6d96600bbdd16cb7fdcb.tar.bz2 | |
mksysinfo, net: Always define F_DUPFD_CLOEXEC.
For Solaris and CentOS portability.
From-SVN: r204687
| -rw-r--r-- | libgo/go/net/fd_unix.go | 2 | ||||
| -rwxr-xr-x | libgo/mksysinfo.sh | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libgo/go/net/fd_unix.go b/libgo/go/net/fd_unix.go index 9ed4f75..4911ab0 100644 --- a/libgo/go/net/fd_unix.go +++ b/libgo/go/net/fd_unix.go @@ -410,7 +410,7 @@ func (fd *netFD) accept(toAddr func(syscall.Sockaddr) Addr) (netfd *netFD, err e var tryDupCloexec = int32(1) func dupCloseOnExec(fd int) (newfd int, err error) { - if atomic.LoadInt32(&tryDupCloexec) == 1 { + if atomic.LoadInt32(&tryDupCloexec) == 1 && syscall.F_DUPFD_CLOEXEC != 0 { r0, _, e1 := syscall.Syscall(syscall.SYS_FCNTL, uintptr(fd), syscall.F_DUPFD_CLOEXEC, 0) if runtime.GOOS == "darwin" && e1 == syscall.EBADF { // On OS X 10.6 and below (but we only support diff --git a/libgo/mksysinfo.sh b/libgo/mksysinfo.sh index a1713df..025729c 100755 --- a/libgo/mksysinfo.sh +++ b/libgo/mksysinfo.sh @@ -220,6 +220,11 @@ if ! grep '^const O_CLOEXEC' ${OUT} >/dev/null 2>&1; then echo "const O_CLOEXEC = 0" >> ${OUT} fi +# The os package requires F_DUPFD_CLOEXEC to be defined. +if ! grep '^const F_DUPFD_CLOEXEC' ${OUT} >/dev/null 2>&1; then + echo "const F_DUPFD_CLOEXEC = 0" >> ${OUT} +fi + # These flags can be lost on i386 GNU/Linux when using # -D_FILE_OFFSET_BITS=64, because we see "#define F_SETLK F_SETLK64" # before we see the definition of F_SETLK64. |