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.17-420-gaefc9b8
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 15 Mar 2013 21:36:12 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.17-420-gaefc9b8
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 aefc9b8c7c62ec25568ae9241db333436ae6860b (commit)
from bc16e260d0e74b36e48d30edc6ea4f1152700c09 (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://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=aefc9b8c7c62ec25568ae9241db333436ae6860b
commit aefc9b8c7c62ec25568ae9241db333436ae6860b
Author: Roland McGrath <roland@hack.frob.com>
Date: Fri Mar 15 14:35:17 2013 -0700
Clean up _dl_pagesize initialization.
diff --git a/ChangeLog b/ChangeLog
index f3eea73..4afd5f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2013-03-15 Roland McGrath <roland@hack.frob.com>
+ * elf/dl-support.c (_dl_aux_init): Ignore zero value for AT_PAGESZ.
+ (_dl_non_dynamic_init): Don't set _dl_pagesize; it will never be
+ zero since it's initialized to EXEC_PAGESIZE.
+
* sysdeps/unix/sysv/linux/ldsodefs.h
(_dl_non_dynamic_init, _dl_aux_init): Move declarations to ...
* sysdeps/generic/ldsodefs.h: ... here.
diff --git a/elf/dl-support.c b/elf/dl-support.c
index b2bf312..ad9b4c4 100644
--- a/elf/dl-support.c
+++ b/elf/dl-support.c
@@ -198,7 +198,8 @@ _dl_aux_init (ElfW(auxv_t) *av)
switch (av->a_type)
{
case AT_PAGESZ:
- GLRO(dl_pagesize) = av->a_un.a_val;
+ if (av->a_un.a_val != 0)
+ GLRO(dl_pagesize) = av->a_un.a_val;
break;
case AT_CLKTCK:
GLRO(dl_clktck) = av->a_un.a_val;
@@ -266,9 +267,6 @@ _dl_non_dynamic_init (void)
if (HP_TIMING_AVAIL)
HP_TIMING_NOW (_dl_cpuclock_offset);
- if (!_dl_pagesize)
- _dl_pagesize = __getpagesize ();
-
_dl_verbose = *(getenv ("LD_WARN") ?: "") == '\0' ? 0 : 1;
/* Set up the data structures for the system-supplied DSO early,
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 ++++
elf/dl-support.c | 6 ++----
2 files changed, 6 insertions(+), 4 deletions(-)
hooks/post-receive
--
GNU C Library master sources