diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-07-17 17:53:52 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-07-17 17:53:52 +0000 |
| commit | 642530c1b4f933f78b56e0b4bfcde1872776f563 (patch) | |
| tree | 33f07351311a4525571acd2d52b275d0a77c50fb /sysdeps/unix/sysv/linux/kernel-features.h | |
| parent | 03f77315182e8b976ca71ac70711654fed46bc3d (diff) | |
| download | glibc-642530c1b4f933f78b56e0b4bfcde1872776f563.tar.gz glibc-642530c1b4f933f78b56e0b4bfcde1872776f563.tar.xz glibc-642530c1b4f933f78b56e0b4bfcde1872776f563.zip | |
[PATCH 4/6] Split powerpc out of main Linux kernel-features.h.
This patch splits powerpc out of the main Linux kernel-features.h. Not tested. * 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.
Diffstat (limited to 'sysdeps/unix/sysv/linux/kernel-features.h')
| -rw-r--r-- | sysdeps/unix/sysv/linux/kernel-features.h | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h index 0294c9b06f..7fdf55aa6f 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 |