Add MAP_FIXED_NOREPLACE from Linux 4.17 to bits/mman.h.

Linux 4.17 adds MAP_FIXED_NOREPLACE (value 0x100000 on most
architectures, 0x200000 on alpha).  This patch adds that macro to
glibc's bits/mman.h headers.

Tested for x86_64.

	* sysdeps/unix/sysv/linux/aarch64/bits/mman.h [__USE_MISC]
	(MAP_FIXED_NOREPLACE): New macro.
	* sysdeps/unix/sysv/linux/alpha/bits/mman.h [__USE_MISC]
	(MAP_FIXED_NOREPLACE): Likewise.
	* sysdeps/unix/sysv/linux/arm/bits/mman.h [__USE_MISC]
	(MAP_FIXED_NOREPLACE): Likewise.
	* sysdeps/unix/sysv/linux/hppa/bits/mman.h [__USE_MISC]
	(MAP_FIXED_NOREPLACE): Likewise.
	* sysdeps/unix/sysv/linux/ia64/bits/mman.h [__USE_MISC]
	(MAP_FIXED_NOREPLACE): Likewise.
	* sysdeps/unix/sysv/linux/m68k/bits/mman.h [__USE_MISC]
	(MAP_FIXED_NOREPLACE): Likewise.
	* sysdeps/unix/sysv/linux/microblaze/bits/mman.h [__USE_MISC]
	(MAP_FIXED_NOREPLACE): Likewise.
	* sysdeps/unix/sysv/linux/mips/bits/mman.h [__USE_MISC]
	(MAP_FIXED_NOREPLACE): Likewise.
	* sysdeps/unix/sysv/linux/nios2/bits/mman.h [__USE_MISC]
	(MAP_FIXED_NOREPLACE): Likewise.
	* sysdeps/unix/sysv/linux/powerpc/bits/mman.h [__USE_MISC]
	(MAP_FIXED_NOREPLACE): Likewise.
	* sysdeps/unix/sysv/linux/riscv/bits/mman.h [__USE_MISC]
	(MAP_FIXED_NOREPLACE): Likewise.
	* sysdeps/unix/sysv/linux/s390/bits/mman.h [__USE_MISC]
	(MAP_FIXED_NOREPLACE): Likewise.
	* sysdeps/unix/sysv/linux/sh/bits/mman.h [__USE_MISC]
	(MAP_FIXED_NOREPLACE): Likewise.
	* sysdeps/unix/sysv/linux/sparc/bits/mman.h [__USE_MISC]
	(MAP_FIXED_NOREPLACE): Likewise.
	* sysdeps/unix/sysv/linux/x86/bits/mman.h [__USE_MISC]
	(MAP_FIXED_NOREPLACE): Likewise.

diff --git a/ChangeLog b/ChangeLog
index bc23518aa60f86f2ef60697ca2f46ebf3308bb31..ce40d41c8baf70a02e69f8f5fec4ed9e0c5a6c5f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,36 @@
 2018-06-05  Joseph Myers  <joseph@codesourcery.com>
 
+       * sysdeps/unix/sysv/linux/aarch64/bits/mman.h [__USE_MISC]
+       (MAP_FIXED_NOREPLACE): New macro.
+       * sysdeps/unix/sysv/linux/alpha/bits/mman.h [__USE_MISC]
+       (MAP_FIXED_NOREPLACE): Likewise.
+       * sysdeps/unix/sysv/linux/arm/bits/mman.h [__USE_MISC]
+       (MAP_FIXED_NOREPLACE): Likewise.
+       * sysdeps/unix/sysv/linux/hppa/bits/mman.h [__USE_MISC]
+       (MAP_FIXED_NOREPLACE): Likewise.
+       * sysdeps/unix/sysv/linux/ia64/bits/mman.h [__USE_MISC]
+       (MAP_FIXED_NOREPLACE): Likewise.
+       * sysdeps/unix/sysv/linux/m68k/bits/mman.h [__USE_MISC]
+       (MAP_FIXED_NOREPLACE): Likewise.
+       * sysdeps/unix/sysv/linux/microblaze/bits/mman.h [__USE_MISC]
+       (MAP_FIXED_NOREPLACE): Likewise.
+       * sysdeps/unix/sysv/linux/mips/bits/mman.h [__USE_MISC]
+       (MAP_FIXED_NOREPLACE): Likewise.
+       * sysdeps/unix/sysv/linux/nios2/bits/mman.h [__USE_MISC]
+       (MAP_FIXED_NOREPLACE): Likewise.
+       * sysdeps/unix/sysv/linux/powerpc/bits/mman.h [__USE_MISC]
+       (MAP_FIXED_NOREPLACE): Likewise.
+       * sysdeps/unix/sysv/linux/riscv/bits/mman.h [__USE_MISC]
+       (MAP_FIXED_NOREPLACE): Likewise.
+       * sysdeps/unix/sysv/linux/s390/bits/mman.h [__USE_MISC]
+       (MAP_FIXED_NOREPLACE): Likewise.
+       * sysdeps/unix/sysv/linux/sh/bits/mman.h [__USE_MISC]
+       (MAP_FIXED_NOREPLACE): Likewise.
+       * sysdeps/unix/sysv/linux/sparc/bits/mman.h [__USE_MISC]
+       (MAP_FIXED_NOREPLACE): Likewise.
+       * sysdeps/unix/sysv/linux/x86/bits/mman.h [__USE_MISC]
+       (MAP_FIXED_NOREPLACE): Likewise.
+
        * sysdeps/unix/sysv/linux/syscall-names.list: Update kernel
        version to 4.17.
 

diff --git a/sysdeps/unix/sysv/linux/aarch64/bits/mman.h b/sysdeps/unix/sysv/linux/aarch64/bits/mman.h
index 9ad8a601f9a43fce54f58b12d57c82f4af394098..577566044dbf49db7b9655b7a4788a1677b0c443 100644 (file)
--- a/sysdeps/unix/sysv/linux/aarch64/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/aarch64/bits/mman.h
@@ -38,6 +38,8 @@
 # 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/alpha/bits/mman.h b/sysdeps/unix/sysv/linux/alpha/bits/mman.h
index 935804b84c96e7701976ab95d026ac9ced44fc37..3abfd8449f5ffa9ccd8794a986726041e2e82aa9 100644 (file)
--- a/sysdeps/unix/sysv/linux/alpha/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/mman.h
@@ -36,6 +36,8 @@
 # define MAP_NONBLOCK    0x40000       /* Do not block on IO.  */
 # define MAP_STACK       0x80000       /* Allocation is for a stack.  */
 # define MAP_HUGETLB     0x100000      /* Create huge page mapping.  */
+# define MAP_FIXED_NOREPLACE 0x200000  /* MAP_FIXED but do not unmap
+                                          underlying mapping.  */
 #endif
 
 /* Flags for `mlockall'.  */

diff --git a/sysdeps/unix/sysv/linux/arm/bits/mman.h b/sysdeps/unix/sysv/linux/arm/bits/mman.h
index be71c82e16f60f0533aeb3616f53d7a4f6a3209c..63813dcee74dd386177d58f1a013f59c38f08a14 100644 (file)
--- a/sysdeps/unix/sysv/linux/arm/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/arm/bits/mman.h
@@ -36,6 +36,8 @@
 # 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
 
 /* Include generic Linux declarations.  */

diff --git a/sysdeps/unix/sysv/linux/hppa/bits/mman.h b/sysdeps/unix/sysv/linux/hppa/bits/mman.h
index 380be7b789e7e346f501852aba258496be573b57..1d2a175239ae27f25dd61332b856593a758b9840 100644 (file)
--- a/sysdeps/unix/sysv/linux/hppa/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/hppa/bits/mman.h
@@ -62,6 +62,8 @@
 # define MAP_NONBLOCK  0x20000         /* Do not block on IO */
 # define MAP_STACK     0x40000         /* Create for process/thread stacks */
 # define MAP_HUGETLB   0x80000         /* Create a huge page mapping */
+# define MAP_FIXED_NOREPLACE 0x100000  /* MAP_FIXED but do not unmap
+                                          underlying mapping.  */
 #endif
 
 /* Flags to "msync"  */

diff --git a/sysdeps/unix/sysv/linux/ia64/bits/mman.h b/sysdeps/unix/sysv/linux/ia64/bits/mman.h
index 0f00a1a342765e4b0f8719ff7905762e3166844e..51071fda56bc4718f7bfa99885d2d0d4e264e0be 100644 (file)
--- a/sysdeps/unix/sysv/linux/ia64/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/ia64/bits/mman.h
@@ -37,6 +37,8 @@
 # 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
 
 /* Include generic Linux declarations.  */

diff --git a/sysdeps/unix/sysv/linux/m68k/bits/mman.h b/sysdeps/unix/sysv/linux/m68k/bits/mman.h
index 80cc2a677dcf0fffe327100f75d1a430a9236676..8d355feda9603e7b7d68b0dc4de5f1d44b6db78d 100644 (file)
--- a/sysdeps/unix/sysv/linux/m68k/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/m68k/bits/mman.h
@@ -36,6 +36,8 @@
 # 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
 
 /* Include generic Linux declarations.  */

diff --git a/sysdeps/unix/sysv/linux/microblaze/bits/mman.h b/sysdeps/unix/sysv/linux/microblaze/bits/mman.h
index 8ca77b6b8fbf23abe7b5463d771b57f1eb77b84c..fe1b376720bd93fa022a4251ebcd804966c04dc1 100644 (file)
--- a/sysdeps/unix/sysv/linux/microblaze/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/microblaze/bits/mman.h
@@ -38,6 +38,8 @@
 # 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
 
 /* Include generic Linux declarations.  */

diff --git a/sysdeps/unix/sysv/linux/mips/bits/mman.h b/sysdeps/unix/sysv/linux/mips/bits/mman.h
index ed8287fb009430aa5777ed1569ffbb7fa1289e9d..102bc6dd033cbafb4a29297cb50b736fd507ba4d 100644 (file)
--- a/sysdeps/unix/sysv/linux/mips/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/mman.h
@@ -34,6 +34,8 @@
 # define MAP_NONBLOCK   0x20000         /* do not block on IO */
 # define MAP_STACK     0x40000         /* Allocation is for a stack.  */
 # define MAP_HUGETLB   0x80000         /* Create huge page mapping.  */
+# define MAP_FIXED_NOREPLACE 0x100000  /* MAP_FIXED but do not unmap
+                                          underlying mapping.  */
 #endif
 
 #define __MAP_ANONYMOUS 0x0800

diff --git a/sysdeps/unix/sysv/linux/nios2/bits/mman.h b/sysdeps/unix/sysv/linux/nios2/bits/mman.h
index 987e47951c39e6e72e282b2ae009359f2064abf4..50f92b4a861681458bb520e89bed40c839ca73bd 100644 (file)
--- a/sysdeps/unix/sysv/linux/nios2/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/nios2/bits/mman.h
@@ -38,6 +38,8 @@
 # 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
 
 /* Include generic Linux declarations.  */

diff --git a/sysdeps/unix/sysv/linux/powerpc/bits/mman.h b/sysdeps/unix/sysv/linux/powerpc/bits/mman.h
index b8a01fad7210f7ab07f55cdbfbcd4ead7acd7182..e652467c8c091381216a801016c06a150d23a1fa 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_FIXED_NOREPLACE 0x100000  /* MAP_FIXED but do not unmap
+                                          underlying mapping.  */
 #endif
 
 /* Flags for `mlockall'.  */

diff --git a/sysdeps/unix/sysv/linux/riscv/bits/mman.h b/sysdeps/unix/sysv/linux/riscv/bits/mman.h
index 84257723b40211f972eb774e629d938faa8e1167..c01fb007281ef5dba02eda1944ec92c897b94e93 100644 (file)
--- a/sysdeps/unix/sysv/linux/riscv/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/riscv/bits/mman.h
@@ -32,6 +32,8 @@
 # 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
 
 /* Include generic Linux declarations.  */

diff --git a/sysdeps/unix/sysv/linux/s390/bits/mman.h b/sysdeps/unix/sysv/linux/s390/bits/mman.h
index cdd7a635309d11ed3d8fe5a5b41c88a31670e654..f103c1a65bc78132b6e0028c4628959151730c69 100644 (file)
--- a/sysdeps/unix/sysv/linux/s390/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/mman.h
@@ -37,6 +37,8 @@
 # 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
 
 /* Include generic Linux declarations.  */

diff --git a/sysdeps/unix/sysv/linux/sh/bits/mman.h b/sysdeps/unix/sysv/linux/sh/bits/mman.h
index e22be1068234e5fd01b4e581d70ec84690b2a508..9015957e65311c860d87409ffabebbef126b2467 100644 (file)
--- a/sysdeps/unix/sysv/linux/sh/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/sh/bits/mman.h
@@ -36,6 +36,8 @@
 # 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
 
 /* Include generic Linux declarations.  */

diff --git a/sysdeps/unix/sysv/linux/sparc/bits/mman.h b/sysdeps/unix/sysv/linux/sparc/bits/mman.h
index f0a4797d8b3ba5adb9078a8b20dece18f8841c14..3a3ffb994631e2b6630fa10d1bbaa4e321665c46 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_FIXED_NOREPLACE 0x100000  /* MAP_FIXED but do not unmap
+                                          underlying mapping.  */
 #endif
 
 /* Flags for `mlockall'.  */

diff --git a/sysdeps/unix/sysv/linux/x86/bits/mman.h b/sysdeps/unix/sysv/linux/x86/bits/mman.h
index ebfc0c7bd1ab232cc469c15f1d766c6ea10dbba6..d897b8a2b27fbd1e2f9752bf7d16fd4f4113cce0 100644 (file)
--- a/sysdeps/unix/sysv/linux/x86/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/x86/bits/mman.h
@@ -41,6 +41,8 @@
 # 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
 
 /* Include generic Linux declarations.  */