[1/6] Split x86_64 out of main Linux kernel-features.h
Commit Message
This patch splits x86_64 out of the main Linux kernel-features.h.
Tested x86_64 that there are no changes to disassembly of installed
shared libraries.
2014-06-24 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/x86_64/kernel-features.h: New file.
* sysdeps/unix/sysv/linux/kernel-features.h [__x86_64__]
(__ASSUME_ACCEPT4_SYSCALL): Do not define.
[__LINUX_KERNEL_VERSION >= 0x020621 && __x86_64__]
(__ASSUME_RECVMMSG_SYSCALL): Likewise.
[__LINUX_KERNEL_VERSION >= 0x030000 && __x86_64__]
(__ASSUME_SENDMMSG_SYSCALL): Likewise.
[__x86_64__ && __LINUX_KERNEL_VERSION >= 0x030100]
(__ASSUME_GETCPU_SYSCALL): Likewise.
Comments
Ping. This patch
<https://sourceware.org/ml/libc-alpha/2014-06/msg00693.html> is pending
review.
Ping^2 (last ping for this patch for 2.20). This patch
<https://sourceware.org/ml/libc-alpha/2014-06/msg00693.html> is still
pending review.
Ping^3. This patch
<https://sourceware.org/ml/libc-alpha/2014-06/msg00693.html> is still
pending review.
On 06/24/2014 05:58 PM, Joseph S. Myers wrote:
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/x86_64/kernel-features.h
> @@ -0,0 +1,38 @@
> +/* Set flags signalling availability of kernel features based on given
> + kernel version number. x86_64 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/>. */
> +
> +/* The accept4 syscall was added for x86_64 in 2.6.28. */
> +#define __ASSUME_ACCEPT4_SYSCALL 1
> +
> +/* The recvmmsg syscall was added for x86_64 in 2.6.33. */
> +#if __LINUX_KERNEL_VERSION >= 0x020621
> +# define __ASSUME_RECVMMSG_SYSCALL 1
> +#endif
> +
> +/* The sendmmsg syscall was added for x86_64 in 3.0. */
Could you use x86-64 everywhere (with minus instead of underscore), please?
Ok with this change,
thanks,
Andreas
> +#if __LINUX_KERNEL_VERSION >= 0x030000
> +# define __ASSUME_SENDMMSG_SYSCALL 1
> +#endif
> +
> +/* getcpu is a syscall for x86-64 since 3.1. */
> +#if __LINUX_KERNEL_VERSION >= 0x030100
> +# define __ASSUME_GETCPU_SYSCALL 1
> +#endif
> +
> +#include_next <kernel-features.h>
@@ -137,7 +137,7 @@
/* The accept4 syscall was added for x86_64 and SPARC in 2.6.28, and
for PowerPC and SH in 2.6.37. */
-#if (defined __x86_64__ || defined __sparc__) \
+#if defined __sparc__ \
|| (__LINUX_KERNEL_VERSION >= 0x020625 \
&& (defined __powerpc__ || defined __sh__))
# define __ASSUME_ACCEPT4_SYSCALL 1
@@ -173,7 +173,7 @@
/* 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 __x86_64__ || defined __sparc__)) \
+ && (defined __i386__ || defined __sparc__)) \
|| (__LINUX_KERNEL_VERSION >= 0x020625 \
&& (defined __powerpc__ || defined __sh__))
# define __ASSUME_RECVMMSG_SYSCALL 1
@@ -210,8 +210,8 @@
/* The sendmmsg syscall was added for i386, x86_64, PowerPC, SH and
SPARC in 3.0. */
-#if __LINUX_KERNEL_VERSION >= 0x030000 \
- && (defined __i386__ || defined __x86_64__ || defined __powerpc__ \
+#if __LINUX_KERNEL_VERSION >= 0x030000 \
+ && (defined __i386__ || defined __powerpc__ \
|| defined __sh__ || defined __sparc__)
# define __ASSUME_SENDMMSG_SYSCALL 1
#endif
@@ -223,8 +223,3 @@
#if defined __ASSUME_SENDMMSG_SOCKETCALL || defined __ASSUME_SENDMMSG_SYSCALL
# define __ASSUME_SENDMMSG 1
#endif
-
-/* getcpu is a syscall for x86-64 since 3.1. */
-#if defined __x86_64__ && __LINUX_KERNEL_VERSION >= 0x030100
-# define __ASSUME_GETCPU_SYSCALL 1
-#endif
new file mode 100644
@@ -0,0 +1,38 @@
+/* Set flags signalling availability of kernel features based on given
+ kernel version number. x86_64 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/>. */
+
+/* The accept4 syscall was added for x86_64 in 2.6.28. */
+#define __ASSUME_ACCEPT4_SYSCALL 1
+
+/* The recvmmsg syscall was added for x86_64 in 2.6.33. */
+#if __LINUX_KERNEL_VERSION >= 0x020621
+# define __ASSUME_RECVMMSG_SYSCALL 1
+#endif
+
+/* The sendmmsg syscall was added for x86_64 in 3.0. */
+#if __LINUX_KERNEL_VERSION >= 0x030000
+# define __ASSUME_SENDMMSG_SYSCALL 1
+#endif
+
+/* getcpu is a syscall for x86-64 since 3.1. */
+#if __LINUX_KERNEL_VERSION >= 0x030100
+# define __ASSUME_GETCPU_SYSCALL 1
+#endif
+
+#include_next <kernel-features.h>