GNU C Library master sources branch master updated. glibc-2.19-192-g7d37530

[roland at sourceware dot org]

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  7d375303f23668ebc7542fe8e331bd4eab749627 (commit)
      from  0283ecca51d2206f2644c1b1b0ecbb42fab7ac45 (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=7d375303f23668ebc7542fe8e331bd4eab749627

commit 7d375303f23668ebc7542fe8e331bd4eab749627
Author: Roland McGrath <roland@hack.frob.com>
Date:   Tue Mar 18 14:58:15 2014 -0700

    Add comments about non-Linux use of bits/mman-linux.h.

diff --git a/ChangeLog b/ChangeLog
index eed1ce9..9db957d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2014-03-18  Roland McGrath  <roland@hack.frob.com>
 
+	* bits/mman-linux.h: Add comment about non-Linux use.
+	* sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Add comment about
+	bits/mman-linux.h resting place.
+
 	* sysdeps/unix/sysv/linux/bits/mman-linux.h: Moved to ...
 	* bits/mman-linux.h: ... here.
 
diff --git a/bits/mman-linux.h b/bits/mman-linux.h
index 45f76f5..a594f86 100644
--- a/bits/mman-linux.h
+++ b/bits/mman-linux.h
@@ -21,7 +21,10 @@
 #endif
 
 /* The following definitions basically come from the kernel headers.
-   But the kernel header is not namespace clean.  */
+   But the kernel header is not namespace clean.
+
+   This file is also used by some non-Linux configurations of the
+   GNU C Library, for other systems that use these same bit values.  */
 
 
 /* Protections are chosen from these bits, OR'd together.  The
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 234d5a7..0def37e 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -25,6 +25,13 @@ sysdep_routines += clone llseek umount umount2 readahead \
 CFLAGS-gethostid.c = -fexceptions
 CFLAGS-tst-writev.c += "-DARTIFICIAL_LIMIT=0x80000000-__getpagesize()"
 
+# Note that bits/mman-linux.h is listed here though the file lives in the
+# top-level bits/ subdirectory instead of here in sysdeps/.../linux/bits/.
+# That is just so that other (non-Linux) configurations for whom the
+# bits/mman-linux.h definitions work well do not have to duplicate the
+# contents of the file.  The file must still be listed in sysdep_headers
+# here and in any non-Linux configuration that uses it; other
+# configurations will not install the file.
 sysdep_headers += sys/mount.h sys/acct.h sys/sysctl.h \
 		  sys/klog.h sys/kdaemon.h \
 		  sys/user.h sys/procfs.h sys/prctl.h \

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

Summary of changes:
 ChangeLog                        |    4 ++++
 bits/mman-linux.h                |    5 ++++-
 sysdeps/unix/sysv/linux/Makefile |    7 +++++++
 3 files changed, 15 insertions(+), 1 deletions(-)


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