This is the mail archive of the
libc-ports@sources.redhat.com
mailing list for the libc-ports project.
[PATCH] Fix SOCK_CLOEXEC on HPPA to match O_CLOEXEC
- From: Matt Turner <mattst88 at gmail dot com>
- To: libc-ports at sourceware dot org
- Cc: Matt Turner <mattst88 at gmail dot com>, Carlos O'Donell <carlos at codesourcery dot com>, Kyle McMartin <kyle at redhat dot com>
- Date: Fri, 12 Feb 2010 23:54:02 -0500
- Subject: [PATCH] Fix SOCK_CLOEXEC on HPPA to match O_CLOEXEC
Firstly, commit fa1b9bae63 tried to fix the value of SOCK_CLOEXEC,
but missed a trailing 0.
Secondly, the Changelog.hppa says the fix is from Kyle McMartin,
but git thinks the author is Carlos. I definitely think these two
should always match. Use git commit --author=... next time.
>From bea02fbe52724594b3b5f87035fbd7d3074a2e5e Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gmail.com>
Date: Fri, 12 Feb 2010 23:39:43 -0500
Subject: [PATCH] Fix SOCK_CLOEXEC on HPPA to match O_CLOEXEC.
The kernel defines SOCK_CLOEXEC as
include/linux/net.h:#define SOCK_CLOEXEC O_CLOEXEC
arch/parisc/include/asm/fcntl.h:#define O_CLOEXEC 010000000
But glibc was defining
sysdeps/unix/sysv/linux/hppa/bits/socket.h: SOCK_CLOEXEC = 01000000,
Signed-off-by: Matt Turner <mattst88@gmail.com>
CC: Carlos O'Donell <carlos@codesourcery.com>
CC: Kyle McMartin <kyle@redhat.com>
---
ChangeLog.hppa | 5 +++++
sysdeps/unix/sysv/linux/hppa/bits/socket.h | 2 +-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ChangeLog.hppa b/ChangeLog.hppa
index 28a3c44..228e719 100644
--- a/ChangeLog.hppa
+++ b/ChangeLog.hppa
@@ -1,3 +1,8 @@
+2010-02-12 Matt Turner <mattst88@gmail.com>
+
+ * sysdeps/unix/sysv/linux/hppa/bits/socket.h: Actually fix
+ SOCK_CLOEXEC to match O_CLOEXEC.
+
2010-02-01 Kyle McMartin <kyle@redhat.com>
* sysdeps/unix/sysv/linux/hppa/bits/socket.h: Fix value of
diff --git a/sysdeps/unix/sysv/linux/hppa/bits/socket.h b/sysdeps/unix/sysv/linux/hppa/bits/socket.h
index bcc27cc..819b398 100644
--- a/sysdeps/unix/sysv/linux/hppa/bits/socket.h
+++ b/sysdeps/unix/sysv/linux/hppa/bits/socket.h
@@ -62,7 +62,7 @@ enum __socket_type
/* Flags to be ORed into the type parameter of socket and socketpair and
used for the flags parameter of paccept. */
- SOCK_CLOEXEC = 01000000, /* Atomically set close-on-exec flag for the
+ SOCK_CLOEXEC = 010000000, /* Atomically set close-on-exec flag for the
new descriptor(s). */
#define SOCK_CLOEXEC SOCK_CLOEXEC
#undef SOCK_NONBLOCK
--
1.6.4.4