From 5be44ea623bf5ccfb06b8ea4f6b1fabdf6021b93 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 17 Jul 2014 17:49:45 +0000 Subject: [PATCH 1/6] Split x86_64 out of main Linux kernel-features.h. 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. * 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. --- sysdeps/unix/sysv/linux/kernel-features.h | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'sysdeps/unix/sysv/linux/kernel-features.h') diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h index 665c348829..359267131f 100644 --- a/sysdeps/unix/sysv/linux/kernel-features.h +++ b/sysdeps/unix/sysv/linux/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 -- cgit v1.2.1