From: Joseph Myers Date: Wed, 7 Nov 2018 16:27:35 +0000 (+0000) Subject: Fix __ASSUME_MLOCK2 for ARM, MicroBlaze (bug 23867). X-Git-Tag: glibc-2.29~324 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=596cc360aa9f0484d6621fd9dfa5de83c3a24dc5;p=thirdparty%2Fglibc.git 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 3dcf4b30b0c..b259e3a24e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2018-11-07 Joseph Myers + + [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 * 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 7831ab1e0f8..c6e745227c8 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 e8e2ac6a873..dfee428f49f 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