about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2018-10-01 20:30:57 +0000
committerJoseph Myers <joseph@codesourcery.com>2018-10-01 20:30:57 +0000
commitd0e91e8c4ef77997c940538eaa752799c9dda2d3 (patch)
treeceaf4c77ba9e116ace69db2ccd14e2da197d50d9
parentc52944e8ccb15158b7e44cbb75fb46d81400d75c (diff)
downloadglibc-d0e91e8c4ef77997c940538eaa752799c9dda2d3.tar.gz
glibc-d0e91e8c4ef77997c940538eaa752799c9dda2d3.tar.xz
glibc-d0e91e8c4ef77997c940538eaa752799c9dda2d3.zip
Move MREMAP_* to bits/mman-shared.h.
The MREMAP_* flags are identical between bits/mman-linux.h and the
hppa bits/mman.h; thus, they should be in bits/mman-shared.h instead
to avoid unnecessary duplication.  This patch moves them there.

Tested for x86_64, and with build-many-glibcs.py.

	* sysdeps/unix/sysv/linux/bits/mman-linux.h [__USE_GNU]
	(MREMAP_MAYMOVE): Do not define here.
	[__USE_GNU] (MREMAP_FIXED): Likewise.
	* sysdeps/unix/sysv/linux/bits/mman-shared.h [__USE_GNU]
	(MREMAP_MAYMOVE): Define here instead.
	[__USE_GNU] (MREMAP_FIXED): Likewise.
	* sysdeps/unix/sysv/linux/hppa/bits/mman.h [__USE_GNU]
	(MREMAP_MAYMOVE): Remove.
	[__USE_GNU] (MREMAP_FIXED): Likewise.
-rw-r--r--ChangeLog12
-rw-r--r--sysdeps/unix/sysv/linux/bits/mman-linux.h6
-rw-r--r--sysdeps/unix/sysv/linux/bits/mman-shared.h4
-rw-r--r--sysdeps/unix/sysv/linux/hppa/bits/mman.h6
4 files changed, 16 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 07760299e6..1fdd50a24c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2018-10-01  Joseph Myers  <joseph@codesourcery.com>
+
+	* sysdeps/unix/sysv/linux/bits/mman-linux.h [__USE_GNU]
+	(MREMAP_MAYMOVE): Do not define here.
+	[__USE_GNU] (MREMAP_FIXED): Likewise.
+	* sysdeps/unix/sysv/linux/bits/mman-shared.h [__USE_GNU]
+	(MREMAP_MAYMOVE): Define here instead.
+	[__USE_GNU] (MREMAP_FIXED): Likewise.
+	* sysdeps/unix/sysv/linux/hppa/bits/mman.h [__USE_GNU]
+	(MREMAP_MAYMOVE): Remove.
+	[__USE_GNU] (MREMAP_FIXED): Likewise.
+
 2018-09-28  Joseph Myers  <joseph@codesourcery.com>
 
 	* math/fromfp.h: Do not include <math_private.h>.
diff --git a/sysdeps/unix/sysv/linux/bits/mman-linux.h b/sysdeps/unix/sysv/linux/bits/mman-linux.h
index 70edeb6d60..09b118bb70 100644
--- a/sysdeps/unix/sysv/linux/bits/mman-linux.h
+++ b/sysdeps/unix/sysv/linux/bits/mman-linux.h
@@ -67,12 +67,6 @@
 #define MS_SYNC		4		/* Synchronous memory sync.  */
 #define MS_INVALIDATE	2		/* Invalidate the caches.  */
 
-/* Flags for `mremap'.  */
-#ifdef __USE_GNU
-# define MREMAP_MAYMOVE	1
-# define MREMAP_FIXED	2
-#endif
-
 /* Advice to `madvise'.  */
 #ifdef __USE_MISC
 # define MADV_NORMAL	  0	/* No further special treatment.  */
diff --git a/sysdeps/unix/sysv/linux/bits/mman-shared.h b/sysdeps/unix/sysv/linux/bits/mman-shared.h
index d15ba95c9d..54823e3724 100644
--- a/sysdeps/unix/sysv/linux/bits/mman-shared.h
+++ b/sysdeps/unix/sysv/linux/bits/mman-shared.h
@@ -21,6 +21,10 @@
 #endif
 
 #ifdef __USE_GNU
+/* Flags for mremap.  */
+# define MREMAP_MAYMOVE	1
+# define MREMAP_FIXED	2
+
 /* Flags for memfd_create.  */
 # ifndef MFD_CLOEXEC
 #  define MFD_CLOEXEC 1U
diff --git a/sysdeps/unix/sysv/linux/hppa/bits/mman.h b/sysdeps/unix/sysv/linux/hppa/bits/mman.h
index 1c7d3708e6..fd07a65868 100644
--- a/sysdeps/unix/sysv/linux/hppa/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/hppa/bits/mman.h
@@ -76,12 +76,6 @@
 #define MCL_FUTURE	2		/* Lock all future mappings */
 #define MCL_ONFAULT	4		/* Lock all pages that are faulted in */
 
-/* Flags for `mremap'.  */
-#ifdef __USE_GNU
-# define MREMAP_MAYMOVE 1
-# define MREMAP_FIXED	2
-#endif
-
 /* Advice to "madvise"  */
 #ifdef __USE_MISC
 # define MADV_NORMAL	  0	/* No further special treatment */