From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1105) id 01E8F3858C83; Wed, 22 Feb 2023 21:36:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 01E8F3858C83 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1677101812; bh=xzhlY/YG1sKOfSQlZL1jrcj4DLnMF8vVRr6UaJmlMug=; h=From:To:Subject:Date:From; b=xGPlX7DOr6KKhUu4Vqxh0s1HnerNYezvohGwqR06aJvAQPJEAOvvoxl2V9wGWkTY9 Yb+yazp6pcKb5TwD/287XeGuirfDgzMkkCWUjheyCxtF3IttgFAXRrBbByAE031YdS ILWDvzHehxsJovBKGNxykVRSY6w6KDWI+4lJfcQ0= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Joseph Myers To: glibc-cvs@sourceware.org Subject: [glibc] Ignore MAP_VARIABLE in tst-mman-consts.py X-Act-Checkin: glibc X-Git-Author: Joseph Myers X-Git-Refname: refs/heads/master X-Git-Oldrev: 311a7e0256975275d97077f1af338bc9caf0c837 X-Git-Newrev: 01e09ab0574758e0afff4333511866278ce7c84f Message-Id: <20230222213652.01E8F3858C83@sourceware.org> Date: Wed, 22 Feb 2023 21:36:52 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=01e09ab0574758e0afff4333511866278ce7c84f commit 01e09ab0574758e0afff4333511866278ce7c84f Author: Joseph Myers Date: Wed Feb 22 21:36:34 2023 +0000 Ignore MAP_VARIABLE in tst-mman-consts.py Linux 6.2 removed the hppa compatibility MAP_VARIABLE define. That means that, whether or not we remove it in glibc, it needs to be ignored in tst-mman-consts.py (since this macro comparison infrastructure expects that new kernel header versions only add new macros, not remove old ones). Tested with build-many-glibcs.py for hppa-linux-gnu (Linux 6.2 headers). Diff: --- sysdeps/unix/sysv/linux/tst-mman-consts.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sysdeps/unix/sysv/linux/tst-mman-consts.py b/sysdeps/unix/sysv/linux/tst-mman-consts.py index 0bba893064..92b78a877c 100644 --- a/sysdeps/unix/sysv/linux/tst-mman-consts.py +++ b/sysdeps/unix/sysv/linux/tst-mman-consts.py @@ -47,9 +47,12 @@ def main(): # MAP_ANON alias for MAP_ANONYMOUS. MAP_RENAME, MAP_AUTOGROW, # MAP_LOCAL and MAP_AUTORSRV are in the kernel header for # MIPS, marked as "not used by linux"; SPARC has MAP_INHERIT - # in the kernel header, but does not use it. + # in the kernel header, but does not use it. The kernel + # header for HPPA removed a define of MAP_VARIABLE to 0 in + # Linux 6.2. 'MAP_HUGE_[0-9].*|MAP_UNINITIALIZED|MAP_FAILED|MAP_ANON' - '|MAP_RENAME|MAP_AUTOGROW|MAP_LOCAL|MAP_AUTORSRV|MAP_INHERIT', + '|MAP_RENAME|MAP_AUTOGROW|MAP_LOCAL|MAP_AUTORSRV|MAP_INHERIT' + '|MAP_VARIABLE', linux_version_glibc > linux_version_headers, linux_version_headers > linux_version_glibc))