* elf/elf.h (Elf32_auxv_t): Make cross-compile safe.
(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>
GLRO(dl_clktck) = av->a_un.a_val;
break;
case AT_PHDR:
- GL(dl_phdr) = av->a_un.a_ptr;
+ GL(dl_phdr) = (void *) av->a_un.a_val;
break;
case AT_PHNUM:
GL(dl_phnum) = av->a_un.a_val;
#endif
#if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO
case AT_SYSINFO_EHDR:
- GL(dl_sysinfo_dso) = av->a_un.a_ptr;
+ GL(dl_sysinfo_dso) = (void *) av->a_un.a_val;
break;
#endif
case AT_UID:
switch (av->a_type)
{
case AT_PHDR:
- phdr = av->a_un.a_ptr;
+ phdr = (void *) av->a_un.a_val;
break;
case AT_PHNUM:
phnum = av->a_un.a_val;
INTUSE(__libc_enable_secure) = av->a_un.a_val;
break;
case AT_PLATFORM:
- GLRO(dl_platform) = av->a_un.a_ptr;
+ GLRO(dl_platform) = (void *) av->a_un.a_val;
break;
case AT_HWCAP:
GLRO(dl_hwcap) = (unsigned long int) av->a_un.a_val;
#endif
#if defined NEED_DL_SYSINFO || defined NEED_DL_SYSINFO_DSO
case AT_SYSINFO_EHDR:
- GLRO(dl_sysinfo_dso) = av->a_un.a_ptr;
+ GLRO(dl_sysinfo_dso) = (void *) av->a_un.a_val;
break;
#endif
#ifdef DL_PLATFORM_AUXV
if (idx < sizeof (auxvars) / sizeof (auxvars[0])
&& 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)
val = _itoa ((unsigned long int) av->a_un.a_val,