aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2014-07-17 17:54:43 +0000
committerJoseph Myers <joseph@codesourcery.com>2014-07-17 17:54:43 +0000
commit067764ef47ba0b29d6b556c5a0cb3565c14571f9 (patch)
tree9a6b8308218d15ffd98d37a89389232c3b115280
parent642530c1b4f933f78b56e0b4bfcde1872776f563 (diff)
downloadglibc-067764ef47ba0b29d6b556c5a0cb3565c14571f9.tar
glibc-067764ef47ba0b29d6b556c5a0cb3565c14571f9.tar.gz
glibc-067764ef47ba0b29d6b556c5a0cb3565c14571f9.tar.bz2
glibc-067764ef47ba0b29d6b556c5a0cb3565c14571f9.zip
[PATCH 5/6] Split sh out of main Linux kernel-features.h.
This patch splits sh out of the main Linux kernel-features.h. Not tested. * sysdeps/unix/sysv/linux/sh/kernel-features.h: New file. * sysdeps/unix/sysv/linux/kernel-features.h [__sh__] (__ASSUME_SOCKETCALL): Do not define. (__ASSUME_ST_INO_64_BIT): Define unconditionally. [__LINUX_KERNEL_VERSION >= 0x020625 && __sh__] (__ASSUME_ACCEPT4_SYSCALL): Do not define. [__LINUX_KERNEL_VERSION >= 0x020625 && __sh__] (__ASSUME_RECVMMSG_SYSCALL): Likewise. [__LINUX_KERNEL_VERSION >= 0x030000 && __sh__] (__ASSUME_SENDMMSG_SYSCALL): Likewise. [__sh__] (__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL): Likewise.
-rw-r--r--ChangeLog12
-rw-r--r--sysdeps/unix/sysv/linux/kernel-features.h27
-rw-r--r--sysdeps/unix/sysv/linux/sh/kernel-features.h42
3 files changed, 56 insertions, 25 deletions
diff --git a/ChangeLog b/ChangeLog
index 4175eba5fa..cd10795fdb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
2014-07-17 Joseph Myers <joseph@codesourcery.com>
+ * sysdeps/unix/sysv/linux/sh/kernel-features.h: New file.
+ * sysdeps/unix/sysv/linux/kernel-features.h [__sh__]
+ (__ASSUME_SOCKETCALL): Do not define.
+ (__ASSUME_ST_INO_64_BIT): Define unconditionally.
+ [__LINUX_KERNEL_VERSION >= 0x020625 && __sh__]
+ (__ASSUME_ACCEPT4_SYSCALL): Do not define.
+ [__LINUX_KERNEL_VERSION >= 0x020625 && __sh__]
+ (__ASSUME_RECVMMSG_SYSCALL): Likewise.
+ [__LINUX_KERNEL_VERSION >= 0x030000 && __sh__]
+ (__ASSUME_SENDMMSG_SYSCALL): Likewise.
+ [__sh__] (__ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL): Likewise.
+
* sysdeps/unix/sysv/linux/powerpc/kernel-features.h: New file.
* sysdeps/unix/sysv/linux/kernel-features.h [__powerpc__]
(__ASSUME_SOCKETCALL): Do not define.
diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index 7fdf55aa6f..e5ca8d1d3f 100644
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -44,7 +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 __s390__ || defined __sh__
+#ifdef __s390__
# define __ASSUME_SOCKETCALL 1
#endif
@@ -55,9 +55,7 @@
/* 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. */
-#ifndef __sh__
-# define __ASSUME_ST_INO_64_BIT 1
-#endif
+#define __ASSUME_ST_INO_64_BIT 1
/* The getdents64 syscall was introduced in 2.4.0-test7 (but later for
MIPS n32). */
@@ -125,12 +123,6 @@
# define __ASSUME_ACCEPT4_SOCKETCALL 1
#endif
-/* 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 __sh__
-# define __ASSUME_ACCEPT4_SYSCALL 1
-#endif
-
#if defined __ASSUME_ACCEPT4_SOCKETCALL || defined __ASSUME_ACCEPT4_SYSCALL
# define __ASSUME_ACCEPT4 1
#endif
@@ -153,12 +145,6 @@
# define __ASSUME_RECVMMSG_SOCKETCALL 1
#endif
-/* 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 __sh__
-# define __ASSUME_RECVMMSG_SYSCALL 1
-#endif
-
#if defined __ASSUME_RECVMMSG_SOCKETCALL || defined __ASSUME_RECVMMSG_SYSCALL
# define __ASSUME_RECVMMSG 1
#endif
@@ -185,15 +171,6 @@
# define __ASSUME_SENDMMSG_SOCKETCALL 1
#endif
-/* The sendmmsg syscall was added for i386, x86_64, PowerPC, SH and
- SPARC in 3.0. */
-#if __LINUX_KERNEL_VERSION >= 0x030000 && defined __sh__
-# define __ASSUME_SENDMMSG_SYSCALL 1
-#endif
-#ifdef __sh__
-# define __ASSUME_SENDMMSG_SYSCALL_WITH_SOCKETCALL 1
-#endif
-
#if defined __ASSUME_SENDMMSG_SOCKETCALL || defined __ASSUME_SENDMMSG_SYSCALL
# define __ASSUME_SENDMMSG 1
#endif
diff --git a/sysdeps/unix/sysv/linux/sh/kernel-features.h b/sysdeps/unix/sysv/linux/sh/kernel-features.h
new file mode 100644
index 0000000000..ae272efaab
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sh/kernel-features.h
@@ -0,0 +1,42 @@
+/* Set flags signalling availability of kernel features based on given
+ kernel version number. SH 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/>. */
+
+/* SH uses socketcall. */
+#define __ASSUME_SOCKETCALL 1
+
+/* The accept4 syscall was added for SH in 2.6.37. */
+#if __LINUX_KERNEL_VERSION >= 0x020625
+# define __ASSUME_ACCEPT4_SYSCALL 1
+#endif
+
+/* The recvmmsg syscall was added for SH in 2.6.37. */
+#if __LINUX_KERNEL_VERSION >= 0x020625
+# define __ASSUME_RECVMMSG_SYSCALL 1
+#endif
+
+/* The sendmmsg syscall was added for SH 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>
+
+/* SH does not have a 64-bit inode field. */
+#undef __ASSUME_ST_INO_64_BIT