| Message ID | 8b3784bd-fdfb-bc98-9b9b-49e1c11482b@codesourcery.com |
|---|---|
| State | New |
| Headers | show |
| Series | Ignore MAP_VARIABLE in tst-mman-consts.py | expand |
On 2/22/23 12:56, Joseph Myers wrote: > 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). Confirmed that with 71bdea6f798b425bc0003780b13e3fdecb16a010 the MAP_VARIABLE define to 0 is removed. LGTM. Reviewed-by: Carlos O'Donell <carlos@redhat.com> > 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)) > >
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))