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.28.9000-269-g596cc36


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  596cc360aa9f0484d6621fd9dfa5de83c3a24dc5 (commit)
      from  00c86a37d1b63044e3169d1f2ebec23447c73f79 (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=596cc360aa9f0484d6621fd9dfa5de83c3a24dc5

commit 596cc360aa9f0484d6621fd9dfa5de83c3a24dc5
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Wed Nov 7 16:27:35 2018 +0000

    Fix __ASSUME_MLOCK2 for ARM, MicroBlaze (bug 23867).
    
    The generic kernel-features.h defines __ASSUME_MLOCK2 for 4.4 and
    later kernels.  However, for 32-bit ARM binaries running on 64-bit ARM
    kernels, and for MicroBlaze, the syscall was only wired up in the 4.7
    kernel.  (32-bit ARM kernels did have the syscall from 4.4 onwards.)
    This patch duly arranges for the macro to be undefined for those
    architectures for kernels before 4.7.
    
    Tested with build-many-glibcs.py for its ARM and MicroBlaze
    configurations.
    
    	[BZ #23867]
    	* sysdeps/unix/sysv/linux/arm/kernel-features.h
    	[__LINUX_KERNEL_VERSION < 0x040700] (__ASSUME_MLOCK2): Undefine.
    	* sysdeps/unix/sysv/linux/microblaze/kernel-features.h
    	[__LINUX_KERNEL_VERSION < 0x040700] (__ASSUME_MLOCK2): Undefine.

diff --git a/ChangeLog b/ChangeLog
index 3dcf4b3..b259e3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2018-11-07  Joseph Myers  <joseph@codesourcery.com>
+
+	[BZ #23867]
+	* sysdeps/unix/sysv/linux/arm/kernel-features.h
+	[__LINUX_KERNEL_VERSION < 0x040700] (__ASSUME_MLOCK2): Undefine.
+	* sysdeps/unix/sysv/linux/microblaze/kernel-features.h
+	[__LINUX_KERNEL_VERSION < 0x040700] (__ASSUME_MLOCK2): Undefine.
+
 2018-11-07  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
 	* support/support_test_compare_string.c
diff --git a/sysdeps/unix/sysv/linux/arm/kernel-features.h b/sysdeps/unix/sysv/linux/arm/kernel-features.h
index 7831ab1..c6e7452 100644
--- a/sysdeps/unix/sysv/linux/arm/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/arm/kernel-features.h
@@ -40,5 +40,12 @@
 #define __ASSUME_RECV_SYSCALL   1
 #define __ASSUME_SEND_SYSCALL	1
 
+/* Support for the mlock2 syscall was added to the compat syscall
+   table for 64-bit kernels in 4.7, although present in 32-bit kernels
+   from 4.4.  */
+#if __LINUX_KERNEL_VERSION < 0x040700
+# undef __ASSUME_MLOCK2
+#endif
+
 #undef __ASSUME_CLONE_DEFAULT
 #define __ASSUME_CLONE_BACKWARDS	1
diff --git a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
index e8e2ac6..dfee428 100644
--- a/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/microblaze/kernel-features.h
@@ -58,6 +58,11 @@
 # undef __ASSUME_EXECVEAT
 #endif
 
+/* Support for the mlock2 syscall was added in 4.7.  */
+#if __LINUX_KERNEL_VERSION < 0x040700
+# undef __ASSUME_MLOCK2
+#endif
+
 /* Support for the copy_file_range syscall was added in 4.10.  */
 #if __LINUX_KERNEL_VERSION < 0x040A00
 # undef __ASSUME_COPY_FILE_RANGE

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

Summary of changes:
 ChangeLog                                          |    8 ++++++++
 sysdeps/unix/sysv/linux/arm/kernel-features.h      |    7 +++++++
 .../unix/sysv/linux/microblaze/kernel-features.h   |    5 +++++
 3 files changed, 20 insertions(+), 0 deletions(-)


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]