This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.28.9000-167-gd0e91e8


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  d0e91e8c4ef77997c940538eaa752799c9dda2d3 (commit)
      from  c52944e8ccb15158b7e44cbb75fb46d81400d75c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=d0e91e8c4ef77997c940538eaa752799c9dda2d3

commit d0e91e8c4ef77997c940538eaa752799c9dda2d3
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Mon Oct 1 20:30:57 2018 +0000

    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.

diff --git a/ChangeLog b/ChangeLog
index 0776029..1fdd50a 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 70edeb6..09b118b 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 d15ba95..54823e3 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 1c7d370..fd07a65 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 */

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                  |   12 ++++++++++++
 sysdeps/unix/sysv/linux/bits/mman-linux.h  |    6 ------
 sysdeps/unix/sysv/linux/bits/mman-shared.h |    4 ++++
 sysdeps/unix/sysv/linux/hppa/bits/mman.h   |    6 ------
 4 files changed, 16 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]