This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH 4/6] Split powerpc out of main Linux kernel-features.h
- From: Adhemerval Zanella <azanella at linux dot vnet dot ibm dot com>
- To: "Joseph S. Myers" <joseph at codesourcery dot com>, libc-alpha at sourceware dot org
- Date: Tue, 24 Jun 2014 22:15:34 -0300
- Subject: Re: [PATCH 4/6] Split powerpc out of main Linux kernel-features.h
- Authentication-results: sourceware.org; auth=none
- References: <Pine dot LNX dot 4 dot 64 dot 1406241554410 dot 4217 at digraph dot polyomino dot org dot uk> <Pine dot LNX dot 4 dot 64 dot 1406241600030 dot 4217 at digraph dot polyomino dot org dot uk>
This looks fine, thanks.
On 24-06-2014 13:00, Joseph S. Myers wrote:
> This patch splits powerpc out of the main Linux kernel-features.h.
>
> Not tested.
>
> 2014-06-24 Joseph Myers <joseph@codesourcery.com>
>
> * sysdeps/unix/sysv/linux/powerpc/kernel-features.h: New file.
> * sysdeps/unix/sysv/linux/kernel-features.h [__powerpc__]
> (__ASSUME_SOCKETCALL): Do not define.
> (__ASSUME_IPC64): Define unconditionally.
> [__LINUX_KERNEL_VERSION >= 0x020625 && __powerpc__]
> (__ASSUME_ACCEPT4_SYSCALL): Do not define.
> [__LINUX_KERNEL_VERSION >= 0x020625 && __powerpc__]
> (__ASSUME_RECVMMSG_SYSCALL): Likewise.
> [__LINUX_KERNEL_VERSION >= 0x030000 && __powerpc__]
> (__ASSUME_SENDMMSG_SYSCALL): Likewise.
> [__powerpc__] (__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL):
> Likewise.
>
> diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
> index 0294c9b..7fdf55a 100644
> --- a/sysdeps/unix/sysv/linux/kernel-features.h
> +++ b/sysdeps/unix/sysv/linux/kernel-features.h
> @@ -44,18 +44,14 @@
> socket-related operations, via a socket.S file in glibc, instead of
> separate syscalls. __ASSUME_SOCKETCALL is defined for such
> architectures. */
> -#if defined __powerpc__ \
> - || defined __s390__ \
> - || defined __sh__
> +#if defined __s390__ || defined __sh__
> # define __ASSUME_SOCKETCALL 1
> #endif
>
> /* Linux 2.3.39 introduced IPC64. Except for powerpc. Linux 2.4.0 on
> PPC introduced a correct IPC64. But PowerPC64 does not support a
> separate 64-bit syscall, already 64-bit. */
> -#ifndef __powerpc64__
> -# define __ASSUME_IPC64 1
> -#endif
> +#define __ASSUME_IPC64 1
>
> /* The changed st_ino field appeared in 2.4.0-test6. However, SH is lame,
> and still does not have a 64-bit inode field. */
> @@ -131,8 +127,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 (__LINUX_KERNEL_VERSION >= 0x020625 \
> - && (defined __powerpc__ || defined __sh__))
> +#if __LINUX_KERNEL_VERSION >= 0x020625 && defined __sh__
> # define __ASSUME_ACCEPT4_SYSCALL 1
> #endif
>
> @@ -160,8 +155,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 >= 0x020625 \
> - && (defined __powerpc__ || defined __sh__))
> +#if __LINUX_KERNEL_VERSION >= 0x020625 && defined __sh__
> # define __ASSUME_RECVMMSG_SYSCALL 1
> #endif
>
> @@ -193,11 +187,10 @@
>
> /* The sendmmsg syscall was added for i386, x86_64, PowerPC, SH and
> SPARC in 3.0. */
> -#if __LINUX_KERNEL_VERSION >= 0x030000 \
> - && (defined __powerpc__ || defined __sh__)
> +#if __LINUX_KERNEL_VERSION >= 0x030000 && defined __sh__
> # define __ASSUME_SENDMMSG_SYSCALL 1
> #endif
> -#if defined __powerpc__ || defined __sh__
> +#ifdef __sh__
> # define __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL 1
> #endif
>
> diff --git a/sysdeps/unix/sysv/linux/powerpc/kernel-features.h b/sysdeps/unix/sysv/linux/powerpc/kernel-features.h
> new file mode 100644
> index 0000000..d8a98f1
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/powerpc/kernel-features.h
> @@ -0,0 +1,42 @@
> +/* Set flags signalling availability of kernel features based on given
> + kernel version number. PowerPC 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/>. */
> +
> +/* PowerPC uses socketcall. */
> +#define __ASSUME_SOCKETCALL 1
> +
> +/* The accept4 syscall was added for PowerPC in 2.6.37. */
> +#if __LINUX_KERNEL_VERSION >= 0x020625
> +# define __ASSUME_ACCEPT4_SYSCALL 1
> +#endif
> +
> +/* The recvmmsg syscall was added for PowerPC in 2.6.37. */
> +#if __LINUX_KERNEL_VERSION >= 0x020625
> +# define __ASSUME_RECVMMSG_SYSCALL 1
> +#endif
> +
> +/* The sendmmsg syscall was added for PowerPC 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>
> +
> +/* PowerPC64 IPC is always 64-bit and does not use __IPC_64. */
> +#undef __ASSUME_IPC64
>