AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-13 00:30:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up _dl_pagesize initialization.

Browse Source
This commit is contained in:
Roland McGrath 2013-03-15 14:35:17 -07:00
parent bc16e260d0
commit aefc9b8c7c
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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.

6
elf/dl-support.c
View File

@ -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,