about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2014-07-17 17:55:44 +0000
committerJoseph Myers <joseph@codesourcery.com>2014-07-17 17:55:44 +0000
commitb21c2d5020d85596c0391e03054d7fe031ffd60b (patch)
treedf74864bcfd10282c6cc7dabdceca2ecb2c6cca3
parent067764ef47ba0b29d6b556c5a0cb3565c14571f9 (diff)
downloadglibc-b21c2d5020d85596c0391e03054d7fe031ffd60b.tar.gz
glibc-b21c2d5020d85596c0391e03054d7fe031ffd60b.tar.xz
glibc-b21c2d5020d85596c0391e03054d7fe031ffd60b.zip
[PATCH 6/6] Split s390 out of main Linux kernel-features.h.
This patch splits s390 out of the main Linux kernel-features.h.

Not tested.

	* sysdeps/unix/sysv/linux/s390/kernel-features.h: New file.
	* sysdeps/unix/sysv/linux/kernel-features.h [__s390__]
	(__ASSUME_SOCKETCALL): Do not define.
-rw-r--r--ChangeLog4
-rw-r--r--sysdeps/unix/sysv/linux/kernel-features.h3
-rw-r--r--sysdeps/unix/sysv/linux/s390/kernel-features.h23
3 files changed, 27 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index cd10795fdb..041839be81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2014-07-17  Joseph Myers  <joseph@codesourcery.com>
 
+	* sysdeps/unix/sysv/linux/s390/kernel-features.h: New file.
+	* sysdeps/unix/sysv/linux/kernel-features.h [__s390__]
+	(__ASSUME_SOCKETCALL): Do not define.
+
 	* sysdeps/unix/sysv/linux/sh/kernel-features.h: New file.
 	* sysdeps/unix/sysv/linux/kernel-features.h [__sh__]
 	(__ASSUME_SOCKETCALL): Do not define.
diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index e5ca8d1d3f..85fc2f1615 100644
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -44,9 +44,6 @@
    socket-related operations, via a socket.S file in glibc, instead of
    separate syscalls.  __ASSUME_SOCKETCALL is defined for such
    architectures.  */
-#ifdef __s390__
-# 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
diff --git a/sysdeps/unix/sysv/linux/s390/kernel-features.h b/sysdeps/unix/sysv/linux/s390/kernel-features.h
new file mode 100644
index 0000000000..8570e2f1a9
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/s390/kernel-features.h
@@ -0,0 +1,23 @@
+/* Set flags signalling availability of kernel features based on given
+   kernel version number.  S/390 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/>.  */
+
+/* S/390 uses socketcall.  */
+#define __ASSUME_SOCKETCALL		1
+
+#include_next <kernel-features.h>