From: Joseph Myers Date: Tue, 6 Nov 2018 17:22:50 +0000 (+0000) Subject: Correct SH kernel-features.h undefines (bug 23862). X-Git-Tag: glibc-2.29~328 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=e143ceba564a94922f6e46bb3a22d7a53a909a03;p=glibc.git Correct SH kernel-features.h undefines (bug 23862). The SH kernel-features.h undefines __ASSUME_RENAMEAT2 for kernel versions before 4.8, but fails to undefine __ASSUME_EXECVEAT, __ASSUME_MLOCK2 and __ASSUME_COPY_FILE_RANGE, although all those syscalls (and several others) were added for SH in the same Linux kernel commit (first released in 4.8). This patch adds the proper undefines of those macros. Tested with build-many-glibcs.py for its SH configurations. [BZ #23862] * sysdeps/unix/sysv/linux/sh/kernel-features.h [__LINUX_KERNEL_VERSION < 0x040800] (__ASSUME_EXECVEAT): Undefine. [__LINUX_KERNEL_VERSION < 0x040800] (__ASSUME_MLOCK2): Likewise. [__LINUX_KERNEL_VERSION < 0x040800] (__ASSUME_COPY_FILE_RANGE): Likewise. --- diff --git a/ChangeLog b/ChangeLog index 9b8f6f2db9..4ff4c136b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2018-11-06 Joseph Myers + + [BZ #23862] + * sysdeps/unix/sysv/linux/sh/kernel-features.h + [__LINUX_KERNEL_VERSION < 0x040800] (__ASSUME_EXECVEAT): Undefine. + [__LINUX_KERNEL_VERSION < 0x040800] (__ASSUME_MLOCK2): Likewise. + [__LINUX_KERNEL_VERSION < 0x040800] (__ASSUME_COPY_FILE_RANGE): + Likewise. + 2018-11-06 Florian Weimer [BZ #17405] diff --git a/sysdeps/unix/sysv/linux/sh/kernel-features.h b/sysdeps/unix/sysv/linux/sh/kernel-features.h index b8ccb01518..60b6a8126b 100644 --- a/sysdeps/unix/sysv/linux/sh/kernel-features.h +++ b/sysdeps/unix/sysv/linux/sh/kernel-features.h @@ -51,9 +51,12 @@ /* sh only supports ipc syscall. */ #undef __ASSUME_DIRECT_SYSVIPC_SYSCALLS -/* Support for the renameat2 syscall was added in 4.8. */ +/* Support for several syscalls was added in 4.8. */ #if __LINUX_KERNEL_VERSION < 0x040800 # undef __ASSUME_RENAMEAT2 +# undef __ASSUME_EXECVEAT +# undef __ASSUME_MLOCK2 +# undef __ASSUME_COPY_FILE_RANGE #endif /* sh does not support the statx system call. */