about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2023-02-22 21:36:34 +0000
committerAurelien Jarno <aurelien@aurel32.net>2023-05-17 11:32:17 +0200
commitb4f76ecc9eab5d0e278530361d00e48f4c871387 (patch)
tree3812e9fa9a469e67e31fbd41c646be8754a7452b
parent7c32cb7dd88cf100b0b412163896e30aa2ee671a (diff)
downloadglibc-b4f76ecc9eab5d0e278530361d00e48f4c871387.tar.gz
glibc-b4f76ecc9eab5d0e278530361d00e48f4c871387.tar.xz
glibc-b4f76ecc9eab5d0e278530361d00e48f4c871387.zip
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).

(cherry picked from commit 01e09ab0574758e0afff4333511866278ce7c84f)
-rw-r--r--sysdeps/unix/sysv/linux/tst-mman-consts.py7
1 files 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))