Update bits/mman.h constants and tst-mman-consts.py for Linux 5.3.

The Linux 5.3 uapi headers have some rearrangement relating to MAP_*
constants, which includes the effect of adding definitions of MAP_SYNC
on powerpc and sparc.  This patch updates the corresponding glibc
bits/mman.h headers accordingly, and updates the Linux kernel version
number in tst-mman-consts.py to reflect that these constants are now
current with that kernel version.

Tested with build-many-glibcs.py.

	* sysdeps/unix/sysv/linux/powerpc/bits/mman.h [__USE_MISC]
	(MAP_SYNC): New macro.
	* sysdeps/unix/sysv/linux/sparc/bits/mman.h [__USE_MISC]
	(MAP_SYNC): Likewise.
	* sysdeps/unix/sysv/linux/tst-mman-consts.py (main): Update Linux
	kernel version number to 5.3.

diff --git a/ChangeLog b/ChangeLog
index d9ea94ad703a47d213ca386d76f16366e9a71ac7..17391d67e53d399e768babacdd98f2b0c0c03127 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2019-09-30  Joseph Myers  <joseph@codesourcery.com>
+
+       * sysdeps/unix/sysv/linux/powerpc/bits/mman.h [__USE_MISC]
+       (MAP_SYNC): New macro.
+       * sysdeps/unix/sysv/linux/sparc/bits/mman.h [__USE_MISC]
+       (MAP_SYNC): Likewise.
+       * sysdeps/unix/sysv/linux/tst-mman-consts.py (main): Update Linux
+       kernel version number to 5.3.
+
 2019-09-27  Paul A. Clarke  <pc@us.ibm.com>
 
        * sysdeps/powerpc/fpu/fenv_libc.h (fesetenv_mode): Rename to

diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/mman.h b/sysdeps/unix/sysv/linux/powerpc/bits/mman.h
index 198600e34b5c8df8627c182692709047c5bacf21..db850f1ea4d2f53b8adf3cf9c06e4afcf9814c02 100644 (file)
--- a/sysdeps/unix/sysv/linux/powerpc/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/powerpc/bits/mman.h
@@ -36,6 +36,8 @@
 # define MAP_NONBLOCK  0x10000         /* Do not block on IO.  */
 # define MAP_STACK     0x20000         /* Allocation is for a stack.  */
 # define MAP_HUGETLB   0x40000         /* Create huge page mapping.  */
+# define MAP_SYNC      0x80000         /* Perform synchronous page
+                                          faults for the mapping.  */
 # define MAP_FIXED_NOREPLACE 0x100000  /* MAP_FIXED but do not unmap
                                           underlying mapping.  */
 #endif

diff --git a/sysdeps/unix/sysv/linux/sparc/bits/mman.h b/sysdeps/unix/sysv/linux/sparc/bits/mman.h
index 732289bd4e4ad5a0f9a315251bf279f36dbd19eb..9eb83dcf3f9c01ced440b729ebbf2af884ce6c7f 100644 (file)
--- a/sysdeps/unix/sysv/linux/sparc/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/mman.h
@@ -36,6 +36,8 @@
 # define MAP_NONBLOCK  0x10000         /* Do not block on IO.  */
 # define MAP_STACK     0x20000         /* Allocation is for a stack.  */
 # define MAP_HUGETLB   0x40000         /* Create huge page mapping.  */
+# define MAP_SYNC      0x80000         /* Perform synchronous page
+                                          faults for the mapping.  */
 # define MAP_FIXED_NOREPLACE 0x100000  /* MAP_FIXED but do not unmap
                                           underlying mapping.  */
 #endif

diff --git a/sysdeps/unix/sysv/linux/tst-mman-consts.py b/sysdeps/unix/sysv/linux/tst-mman-consts.py
index ea88888405a02a23e490cab69bc402c2467526ae..c11e2ea4ac902a1cda8e52d7e874287bc53f9a08 100644 (file)
--- a/sysdeps/unix/sysv/linux/tst-mman-consts.py
+++ b/sysdeps/unix/sysv/linux/tst-mman-consts.py
@@ -41,7 +41,7 @@ def main():
                         help='C compiler (including options) to use')
     args = parser.parse_args()
     linux_version_headers = linux_kernel_version(args.cc)
-    linux_version_glibc = (5, 2)
+    linux_version_glibc = (5, 3)
     sys.exit(glibcextract.compare_macro_consts(
         '#define _GNU_SOURCE 1\n'
         '#include <sys/mman.h>\n',