From patchwork Tue Nov 6 01:19:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 30033 Received: (qmail 74672 invoked by alias); 6 Nov 2018 01:19:15 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 74507 invoked by uid 89); 6 Nov 2018 01:19:14 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: relay1.mentorg.com Date: Tue, 6 Nov 2018 01:19:06 +0000 From: Joseph Myers To: Subject: Correct SH kernel-features.h undefines (bug 23862) Message-ID: User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 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. 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. 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. */