diff mbox

[2/6] Split i386 out of main Linux kernel-features.h

Message ID Pine.LNX.4.64.1406241558370.4217@digraph.polyomino.org.uk
State Committed
Headers show

Commit Message

Joseph Myers June 24, 2014, 3:58 p.m. UTC
This patch splits i386 out of the main Linux kernel-features.h.

Tested x86 that there are no changes to disassembly of installed
shared libraries.

2014-06-24  Joseph Myers  <joseph@codesourcery.com>

	* sysdeps/unix/sysv/linux/i386/kernel-features.h: New file.
	* sysdeps/unix/sysv/linux/kernel-features.h [__i386__]
	(__ASSUME_SOCKETCALL): Do not define.
	[__LINUX_KERNEL_VERSION >= 0x020621 && __i386__]
	(__ASSUME_RECVMMSG_SYSCALL): Likewise.
	[__i386__] (__ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL): Likewise.
	[__LINUX_KERNEL_VERSION >= 0x030000 && __i386__]
	(__ASSUME_SENDMMSG_SYSCALL): Likewise.
	[__i386__] (__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL): Likewise.

Comments

Joseph Myers June 27, 2014, 12:08 p.m. UTC | #1
Ping.  This patch 
<https://sourceware.org/ml/libc-alpha/2014-06/msg00694.html> is pending 
review.
Joseph Myers June 30, 2014, 3:20 p.m. UTC | #2
Ping^2 (last ping for this patch for 2.20).  This patch 
<https://sourceware.org/ml/libc-alpha/2014-06/msg00694.html> is still 
pending review.
Joseph Myers July 17, 2014, 2:38 p.m. UTC | #3
Ping^3.  This patch 
<https://sourceware.org/ml/libc-alpha/2014-06/msg00694.html> is still 
pending review.
Andreas Jaeger July 17, 2014, 5:32 p.m. UTC | #4
On 06/24/2014 05:58 PM, Joseph S. Myers wrote:
> This patch splits i386 out of the main Linux kernel-features.h.
> 
> Tested x86 that there are no changes to disassembly of installed
> shared libraries.
> 
> 2014-06-24  Joseph Myers  <joseph@codesourcery.com>
> 
> 	* sysdeps/unix/sysv/linux/i386/kernel-features.h: New file.
> 	* sysdeps/unix/sysv/linux/kernel-features.h [__i386__]
> 	(__ASSUME_SOCKETCALL): Do not define.
> 	[__LINUX_KERNEL_VERSION >= 0x020621 && __i386__]
> 	(__ASSUME_RECVMMSG_SYSCALL): Likewise.
> 	[__i386__] (__ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL): Likewise.
> 	[__LINUX_KERNEL_VERSION >= 0x030000 && __i386__]
> 	(__ASSUME_SENDMMSG_SYSCALL): Likewise.
> 	[__i386__] (__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL): Likewise.
> 

Ok, thanks,

Andreas
diff mbox

Patch

diff --git a/sysdeps/unix/sysv/linux/i386/kernel-features.h b/sysdeps/unix/sysv/linux/i386/kernel-features.h
new file mode 100644
index 0000000..3b17ed8
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/i386/kernel-features.h
@@ -0,0 +1,35 @@ 
+/* Set flags signalling availability of kernel features based on given
+   kernel version number.  i386 version.
+   Copyright (C) 1999-2014 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+/* i386 uses socketcall.  */
+#define __ASSUME_SOCKETCALL		1
+
+/* The recvmmsg syscall was added for i386 in 2.6.33.  */
+#if __LINUX_KERNEL_VERSION >= 0x020621
+# define __ASSUME_RECVMMSG_SYSCALL	1
+#endif
+#define __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL	1
+
+/* The sendmmsg syscall was added for i386 in 3.0.  */
+#if __LINUX_KERNEL_VERSION >= 0x030000
+# define __ASSUME_SENDMMSG_SYSCALL	1
+#endif
+#define __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL	1
+
+#include_next <kernel-features.h>
diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index 3592671..5995fa0 100644
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -44,8 +44,7 @@ 
    socket-related operations, via a socket.S file in glibc, instead of
    separate syscalls.  __ASSUME_SOCKETCALL is defined for such
    architectures.  */
-#if defined __i386__ \
-    || defined __powerpc__ \
+#if defined __powerpc__ \
     || defined __s390__ \
     || defined __sh__ \
     || defined __sparc__
@@ -173,12 +172,12 @@ 
 /* The recvmmsg syscall was added for i386, x86_64 and SPARC in
    2.6.33, and for PowerPC and SH in 2.6.37.  */
 #if (__LINUX_KERNEL_VERSION >= 0x020621			\
-     && (defined __i386__ || defined __sparc__))	\
+     && defined __sparc__)				\
     || (__LINUX_KERNEL_VERSION >= 0x020625		\
 	&& (defined __powerpc__ || defined __sh__))
 # define __ASSUME_RECVMMSG_SYSCALL	1
 #endif
-#if defined __i386__ || defined __sparc__
+#ifdef __sparc__
 # define __ASSUME_RECVMMSG_SYSCALL_WITH_SOCKETCALL	1
 #endif
 
@@ -211,12 +210,11 @@ 
 /* The sendmmsg syscall was added for i386, x86_64, PowerPC, SH and
    SPARC in 3.0.  */
 #if __LINUX_KERNEL_VERSION >= 0x030000		\
-    && (defined __i386__ || defined __powerpc__	\
+    && (defined __powerpc__			\
 	|| defined __sh__ || defined __sparc__)
 # define __ASSUME_SENDMMSG_SYSCALL	1
 #endif
-#if defined __i386__ || defined __powerpc__ || defined __sh__ \
-    || defined __sparc__
+#if defined __powerpc__ || defined __sh__ || defined __sparc__
 # define __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL	1
 #endif