From patchwork Tue Jun 24 15:58:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 1693 Received: (qmail 16957 invoked by alias); 24 Jun 2014 15:59:43 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 16909 invoked by uid 89); 24 Jun 2014 15:59:42 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Date: Tue, 24 Jun 2014 15:58:53 +0000 From: "Joseph S. Myers" To: Subject: [PATCH 2/6] Split i386 out of main Linux kernel-features.h In-Reply-To: Message-ID: References: MIME-Version: 1.0 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 * 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. 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 + . */ + +/* 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 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