lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

* sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Adjust for

Browse Source 
removal of a_ptr element in ElfXX_auxv_t.
	* elf/dl-support.c (_dl_aux_init): Likewise.
This commit is contained in:
Ulrich Drepper
2005-05-11 17:32:13 +00:00
parent eac3813bea
commit 39fb308fd2
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -2,6 +2,9 @@
* elf/elf.h (Elf32_auxv_t): Make cross-compile safe. * elf/elf.h (Elf32_auxv_t): Make cross-compile safe.
(Elf64_auxv_t): Likewise. (Elf64_auxv_t): Likewise.
* sysdeps/generic/dl-sysdep.c (_dl_sysdep_start): Adjust for
removal of a_ptr element in ElfXX_auxv_t.
* elf/dl-support.c (_dl_aux_init): Likewise.
2005-05-09 Daniel Jacobowitz <dan@codesourcery.com> 2005-05-09 Daniel Jacobowitz <dan@codesourcery.com>

4
elf/dl-support.c
View File

@ -173,7 +173,7 @@ _dl_aux_init (ElfW(auxv_t) *av)
GLRO(dl_clktck) = av->a_un.a_val; GLRO(dl_clktck) = av->a_un.a_val;
break; break;
case AT_PHDR: case AT_PHDR:
GL(dl_phdr) = av->a_un.a_ptr; GL(dl_phdr) = (void *) av->a_un.a_val;
break; break;
case AT_PHNUM: case AT_PHNUM:
GL(dl_phnum) = av->a_un.a_val; GL(dl_phnum) = av->a_un.a_val;
@ -188,7 +188,7 @@ _dl_aux_init (ElfW(auxv_t) *av)
#endif #endif
#if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO #if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO
case AT_SYSINFO_EHDR: case AT_SYSINFO_EHDR:
GL(dl_sysinfo_dso) = av->a_un.a_ptr; GL(dl_sysinfo_dso) = (void *) av->a_un.a_val;
break; break;
#endif #endif
case AT_UID: case AT_UID:

8
sysdeps/generic/dl-sysdep.c
View File

@ -119,7 +119,7 @@ _dl_sysdep_start (void **start_argptr,
switch (av->a_type) switch (av->a_type)
{ {
case AT_PHDR: case AT_PHDR:
phdr = av->a_un.a_ptr; phdr = (void *) av->a_un.a_val;
break; break;
case AT_PHNUM: case AT_PHNUM:
phnum = av->a_un.a_val; phnum = av->a_un.a_val;
@ -152,7 +152,7 @@ _dl_sysdep_start (void **start_argptr,
INTUSE(__libc_enable_secure) = av->a_un.a_val; INTUSE(__libc_enable_secure) = av->a_un.a_val;
break; break;
case AT_PLATFORM: case AT_PLATFORM:
GLRO(dl_platform) = av->a_un.a_ptr; GLRO(dl_platform) = (void *) av->a_un.a_val;
break; break;
case AT_HWCAP: case AT_HWCAP:
GLRO(dl_hwcap) = (unsigned long int) av->a_un.a_val; GLRO(dl_hwcap) = (unsigned long int) av->a_un.a_val;
@ -170,7 +170,7 @@ _dl_sysdep_start (void **start_argptr,
#endif #endif
#if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO #if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO
case AT_SYSINFO_EHDR: case AT_SYSINFO_EHDR:
GLRO(dl_sysinfo_dso) = av->a_un.a_ptr; GLRO(dl_sysinfo_dso) = (void *) av->a_un.a_val;
break; break;
#endif #endif
#ifdef DL_PLATFORM_AUXV #ifdef DL_PLATFORM_AUXV
@ -312,7 +312,7 @@ _dl_show_auxv (void)
if (idx < sizeof (auxvars) / sizeof (auxvars[0]) if (idx < sizeof (auxvars) / sizeof (auxvars[0])
&& auxvars[idx].form != unknown) && auxvars[idx].form != unknown)
{ {
const char *val = av->a_un.a_ptr; const char *val = (char *) av->a_un.a_val;
if (__builtin_expect (auxvars[idx].form, dec) == dec) if (__builtin_expect (auxvars[idx].form, dec) == dec)
val = _itoa ((unsigned long int) av->a_un.a_val, val = _itoa ((unsigned long int) av->a_un.a_val,