This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]
GNU C Library master sources branch master updated. glibc-2.19-824-g5be44ea

From: jsm28 at sourceware dot org
To: glibc-cvs at sourceware dot org
Date: 17 Jul 2014 17:50:13 -0000
Subject: GNU C Library master sources branch master updated. glibc-2.19-824-g5be44ea
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  5be44ea623bf5ccfb06b8ea4f6b1fabdf6021b93 (commit)
      from  d95ffd4cfd1c277779ea960ed851ee667f1f8e96 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5be44ea623bf5ccfb06b8ea4f6b1fabdf6021b93

commit 5be44ea623bf5ccfb06b8ea4f6b1fabdf6021b93
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Thu Jul 17 17:49:45 2014 +0000

    [PATCH 1/6] Split x86_64 out of main Linux kernel-features.h.
    
    This patch splits x86_64 out of the main Linux kernel-features.h.
    
    Tested x86_64 that there are no changes to disassembly of installed
    shared libraries.
    
    	* sysdeps/unix/sysv/linux/x86_64/kernel-features.h: New file.
    	* sysdeps/unix/sysv/linux/kernel-features.h [__x86_64__]
    	(__ASSUME_ACCEPT4_SYSCALL): Do not define.
    	[__LINUX_KERNEL_VERSION >= 0x020621 && __x86_64__]
    	(__ASSUME_RECVMMSG_SYSCALL): Likewise.
    	[__LINUX_KERNEL_VERSION >= 0x030000 && __x86_64__]
    	(__ASSUME_SENDMMSG_SYSCALL): Likewise.
    	[__x86_64__ && __LINUX_KERNEL_VERSION >= 0x030100]
    	(__ASSUME_GETCPU_SYSCALL): Likewise.

diff --git a/ChangeLog b/ChangeLog
index f82353c..dd9744a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2014-07-17  Joseph Myers  <joseph@codesourcery.com>
 
+	* sysdeps/unix/sysv/linux/x86_64/kernel-features.h: New file.
+	* sysdeps/unix/sysv/linux/kernel-features.h [__x86_64__]
+	(__ASSUME_ACCEPT4_SYSCALL): Do not define.
+	[__LINUX_KERNEL_VERSION >= 0x020621 && __x86_64__]
+	(__ASSUME_RECVMMSG_SYSCALL): Likewise.
+	[__LINUX_KERNEL_VERSION >= 0x030000 && __x86_64__]
+	(__ASSUME_SENDMMSG_SYSCALL): Likewise.
+	[__x86_64__ && __LINUX_KERNEL_VERSION >= 0x030100]
+	(__ASSUME_GETCPU_SYSCALL): Likewise.
+
 	* aclocal.m4 (LIBC_SLIBDIR_RTLDDIR): New macro.
 	* sysdeps/gnu/configure.ac: Use LIBC_SLIBDIR_RTLDDIR.  Remove
 	cases for individual architectures.
diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index 665c348..3592671 100644
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -137,7 +137,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 (defined __x86_64__ || defined __sparc__)		\
+#if defined __sparc__					\
     || (__LINUX_KERNEL_VERSION >= 0x020625		\
 	&& (defined __powerpc__ || defined __sh__))
 # define __ASSUME_ACCEPT4_SYSCALL	1
@@ -173,7 +173,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 >= 0x020621			\
-     && (defined __i386__ || defined __x86_64__ || defined __sparc__))	\
+     && (defined __i386__ || defined __sparc__))	\
     || (__LINUX_KERNEL_VERSION >= 0x020625		\
 	&& (defined __powerpc__ || defined __sh__))
 # define __ASSUME_RECVMMSG_SYSCALL	1
@@ -210,8 +210,8 @@
 
 /* The sendmmsg syscall was added for i386, x86_64, PowerPC, SH and
    SPARC in 3.0.  */
-#if __LINUX_KERNEL_VERSION >= 0x030000					\
-    && (defined __i386__ || defined __x86_64__ || defined __powerpc__	\
+#if __LINUX_KERNEL_VERSION >= 0x030000		\
+    && (defined __i386__ || defined __powerpc__	\
 	|| defined __sh__ || defined __sparc__)
 # define __ASSUME_SENDMMSG_SYSCALL	1
 #endif
@@ -223,8 +223,3 @@
 #if defined __ASSUME_SENDMMSG_SOCKETCALL || defined __ASSUME_SENDMMSG_SYSCALL
 # define __ASSUME_SENDMMSG	1
 #endif
-
-/* getcpu is a syscall for x86-64 since 3.1.  */
-#if defined __x86_64__ && __LINUX_KERNEL_VERSION >= 0x030100
-# define __ASSUME_GETCPU_SYSCALL	1
-#endif
diff --git a/sysdeps/unix/sysv/linux/x86_64/kernel-features.h b/sysdeps/unix/sysv/linux/x86_64/kernel-features.h
new file mode 100644
index 0000000..562dd87
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/x86_64/kernel-features.h
@@ -0,0 +1,38 @@
+/* Set flags signalling availability of kernel features based on given
+   kernel version number.  x86-64 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/>.  */
+
+/* The accept4 syscall was added for x86-64 in 2.6.28.  */
+#define __ASSUME_ACCEPT4_SYSCALL	1
+
+/* The recvmmsg syscall was added for x86-64 in 2.6.33.  */
+#if __LINUX_KERNEL_VERSION >= 0x020621
+# define __ASSUME_RECVMMSG_SYSCALL	1
+#endif
+
+/* The sendmmsg syscall was added for x86-64 in 3.0.  */
+#if __LINUX_KERNEL_VERSION >= 0x030000
+# define __ASSUME_SENDMMSG_SYSCALL	1
+#endif
+
+/* getcpu is a syscall for x86-64 since 3.1.  */
+#if __LINUX_KERNEL_VERSION >= 0x030100
+# define __ASSUME_GETCPU_SYSCALL	1
+#endif
+
+#include_next <kernel-features.h>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                          |   10 +++++++++
 sysdeps/unix/sysv/linux/kernel-features.h          |   13 +++--------
 .../sysv/linux/{ia64 => x86_64}/kernel-features.h  |   22 +++++++++----------
 3 files changed, 24 insertions(+), 21 deletions(-)
 copy sysdeps/unix/sysv/linux/{ia64 => x86_64}/kernel-features.h (66%)


hooks/post-receive
-- 
GNU C Library master sources
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]