about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--elf/rtld.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ef6c9def3c..7485ec5429 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-05  Roland McGrath  <roland@redhat.com>
+
+	* elf/rtld.c (dl_main) [HAVE_AUX_VECTOR]: Add a cast.
+
 2010-04-05  Ulrich Drepper  <drepper@redhat.com>
 
 	* po/nl.po: Update from translation team.
diff --git a/elf/rtld.c b/elf/rtld.c
index 3c414461e9..e26b2b9e1b 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -1091,7 +1091,7 @@ of this helper program; chances are you did not intend to run this program.\n\
 	switch (av->a_type)
 	  {
 	  case AT_PHDR:
-	    av->a_un.a_val = phdr;
+	    av->a_un.a_val = (uintptr_t) phdr;
 	    break;
 	  case AT_PHNUM:
 	    av->a_un.a_val = phnum;