diff options
| author |   Joseph Myers <joseph@codesourcery.com> | 2023-02-22 21:36:34 +0000 |
|---|---|---|
| committer |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2023-07-28 23:44:31 +0200 |
| commit | 36bcdec84705182d522000817504ea8515417ad4 (patch) | |
| tree | 06f0698e23c9a58129b6524bdddef30d359a4720 | |
| parent | gmon: Revert addition of tunables to the manual (diff) | |
| download | glibc-36bcdec84705182d522000817504ea8515417ad4.tar.gz glibc-36bcdec84705182d522000817504ea8515417ad4.tar.bz2 glibc-36bcdec84705182d522000817504ea8515417ad4.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)
(cherry picked from commit b4f76ecc9eab5d0e278530361d00e48f4c871387)
| -rw-r--r-- | sysdeps/unix/sysv/linux/tst-mman-consts.py | 7 |
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)) |