From 39fb308fd2e20c6bec7b70835cdde43c24055e0e Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 11 May 2005 17:32:13 +0000
Subject: [PATCH] * 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.
---
 ChangeLog                   | 3 +++
 elf/dl-support.c            | 4 ++--
 sysdeps/generic/dl-sysdep.c | 8 ++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5f542c0783..91247fabd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 
 	* 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>
 
diff --git a/elf/dl-support.c b/elf/dl-support.c
index d145a7b44c..c3b6350ed3 100644
--- a/elf/dl-support.c
+++ b/elf/dl-support.c
@@ -173,7 +173,7 @@ _dl_aux_init (ElfW(auxv_t) *av)
 	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;
@@ -188,7 +188,7 @@ _dl_aux_init (ElfW(auxv_t) *av)
 #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:
diff --git a/sysdeps/generic/dl-sysdep.c b/sysdeps/generic/dl-sysdep.c
index 1fae16efce..6ac0d95ea6 100644
--- a/sysdeps/generic/dl-sysdep.c
+++ b/sysdeps/generic/dl-sysdep.c
@@ -119,7 +119,7 @@ _dl_sysdep_start (void **start_argptr,
     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;
@@ -152,7 +152,7 @@ _dl_sysdep_start (void **start_argptr,
 	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;
@@ -170,7 +170,7 @@ _dl_sysdep_start (void **start_argptr,
 #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
@@ -312,7 +312,7 @@ _dl_show_auxv (void)
       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,