Merge changes between r23363 and r23421 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@23422 7b3dc134-2b1b-0410-93df-9e9f96275f8d

1 files changed, 7 insertions, 0 deletions

diff --git a/libc/locale/locarchive.h b/libc/locale/locarchive.h
index db05603df..f2d84771a 100644
--- a/libc/locale/locarchive.h
+++ b/libc/locale/locarchive.h
@@ -84,6 +84,13 @@ struct locarhandle
   void *addr;
   size_t mmaped;
   size_t reserved;
+  /* If this mmap required adjustment (such as re-aligning), then this is the
+     real address that was returned from mmap and thus should be passed to the
+     munmap call.  The addr field above is the first usable address.  */
+  void *mmap_base;
+  /* Same as above for mmap_base vs addr, but this is the real length of the
+     map rather than the usable (which is what reserved represents).  */
+  size_t mmap_len;
 };