GNU C Library master sources branch master updated. glibc-2.22-36-gef086ef

[vapier 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  ef086ef8baada5bd485f3f21dde1c9bc10bd6bd5 (commit)
      from  04ece7d2dec91fe870c5f1a38032875915f44633 (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=ef086ef8baada5bd485f3f21dde1c9bc10bd6bd5

commit ef086ef8baada5bd485f3f21dde1c9bc10bd6bd5
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Wed Aug 5 05:17:29 2015 -0400

    hppa: put custom madvise defines behind __USE_MISC
    
    No other arch exports these defines, and having them in the default
    namespace causes conformance header tests to fail.  Put them behind
    the __USE_MISC define as that is what other arches seem to use.

diff --git a/ChangeLog b/ChangeLog
index c9f6dfa..7b14475 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-09  Mike Frysinger  <vapier@gentoo.org>
+
+	* sysdeps/unix/sysv/linux/hppa/bits/mman.h [__USE_MISC]: Move all
+	MADV_*_PAGES defines behind this feature check.
+
 2015-08-09  John David Anglin  <danglin@gcc.gnu.org>
 
 	[BZ #18480]
diff --git a/sysdeps/unix/sysv/linux/hppa/bits/mman.h b/sysdeps/unix/sysv/linux/hppa/bits/mman.h
index e7ee5b8..cbde4b8 100644
--- a/sysdeps/unix/sysv/linux/hppa/bits/mman.h
+++ b/sysdeps/unix/sysv/linux/hppa/bits/mman.h
@@ -93,14 +93,17 @@
 #endif
 
 /* The range 12-64 is reserved for page size specification. */
-#define MADV_4K_PAGES   12              /* Use 4K pages  */
-#define MADV_16K_PAGES  14              /* Use 16K pages */
-#define MADV_64K_PAGES  16              /* Use 64K pages */
-#define MADV_256K_PAGES 18              /* Use 256K pages */
-#define MADV_1M_PAGES   20              /* Use 1 Megabyte pages */
-#define MADV_4M_PAGES   22              /* Use 4 Megabyte pages */
-#define MADV_16M_PAGES  24              /* Use 16 Megabyte pages */
-#define MADV_64M_PAGES  26              /* Use 64 Megabyte pages */
+/* These are Linux-specific.  */
+#ifdef __USE_MISC
+# define MADV_4K_PAGES		12	/* Use 4K pages.  */
+# define MADV_16K_PAGES		14	/* Use 16K pages.  */
+# define MADV_64K_PAGES		16	/* Use 64K pages.  */
+# define MADV_256K_PAGES	18	/* Use 256K pages.  */
+# define MADV_1M_PAGES		20	/* Use 1 Megabyte pages.  */
+# define MADV_4M_PAGES		22	/* Use 4 Megabyte pages.  */
+# define MADV_16M_PAGES		24	/* Use 16 Megabyte pages.  */
+# define MADV_64M_PAGES		26	/* Use 64 Megabyte pages.  */
+#endif
 
 /* The POSIX people had to invent similar names for the same things.  */
 #ifdef __USE_XOPEN2K

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

Summary of changes:
 ChangeLog                                |    5 +++++
 sysdeps/unix/sysv/linux/hppa/bits/mman.h |   19 +++++++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)


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