This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.22-3-g182d609
- From: vapier at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 5 Aug 2015 08:38:59 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.22-3-g182d609
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 182d6096fe76b3d63b1151090cd07e60eca39302 (commit)
from 3fad53ec87945e61015913f2d09271573504a1e9 (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=182d6096fe76b3d63b1151090cd07e60eca39302
commit 182d6096fe76b3d63b1151090cd07e60eca39302
Author: Mike Frysinger <vapier@gentoo.org>
Date: Wed Jul 29 11:35:37 2015 -0400
mmap64: fix undef warnings
The only target that defines this is m68k, so move the existing fallback
define up to avoid warnings on other systems.
diff --git a/ChangeLog b/ChangeLog
index 37a825e..a05d262 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2015-08-05 Mike Frysinger <vapier@gentoo.org>
+ * sysdeps/unix/sysv/linux/mmap64.c: Move MMAP2_PAGE_SHIFT define
+ before first use.
+
+2015-08-05 Mike Frysinger <vapier@gentoo.org>
+
* nptl/allocatestack.c (allocate_stack): Move stacktop decl down to
bottom and under _STACK_GROWS_DOWN. Move the stacktop assignment
in there too.
diff --git a/sysdeps/unix/sysv/linux/mmap64.c b/sysdeps/unix/sysv/linux/mmap64.c
index a8da641..0b160b6 100644
--- a/sysdeps/unix/sysv/linux/mmap64.c
+++ b/sysdeps/unix/sysv/linux/mmap64.c
@@ -25,12 +25,12 @@
#include <sys/syscall.h>
/* This is always 12, even on architectures where PAGE_SHIFT != 12. */
+#ifndef MMAP2_PAGE_SHIFT
+# define MMAP2_PAGE_SHIFT 12
+#endif
#if MMAP2_PAGE_SHIFT == -1
static int page_shift;
#else
-# ifndef MMAP2_PAGE_SHIFT
-# define MMAP2_PAGE_SHIFT 12
-# endif
#define page_shift MMAP2_PAGE_SHIFT
#endif
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
sysdeps/unix/sysv/linux/mmap64.c | 6 +++---
2 files changed, 8 insertions(+), 3 deletions(-)
hooks/post-receive
--
GNU C Library master sources