about summary refs log tree commit diff
path: root/ports
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2012-08-08 11:03:47 -0700
committerRoland McGrath <roland@hack.frob.com>2012-08-08 11:03:47 -0700
commit9b5281b65e2ce654610c0809aa829b4b18213b27 (patch)
tree5c8b9845b77fe9036fc83c8156825fcbd38afcf6 /ports
parenta2433aac7e3524f5c65c557e8ddba760b196f856 (diff)
downloadglibc-9b5281b65e2ce654610c0809aa829b4b18213b27.tar.gz
glibc-9b5281b65e2ce654610c0809aa829b4b18213b27.tar.xz
glibc-9b5281b65e2ce654610c0809aa829b4b18213b27.zip
Fix __dl_start declaration to avoid warning.
Diffstat (limited to 'ports')
-rw-r--r--ports/ChangeLog.arm5
-rw-r--r--ports/sysdeps/arm/dl-machine.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
index 842bbea5b2..2f1aa6174c 100644
--- a/ports/ChangeLog.arm
+++ b/ports/ChangeLog.arm
@@ -1,3 +1,8 @@
+2012-08-08  Roland McGrath  <roland@hack.frob.com>
+
+	* sysdeps/arm/dl-machine.h (elf_machine_load_address): Use proper type
+	for __dl_start declaration.
+
 2012-08-07  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/unix/sysv/linux/arm/configure.in (arch_minimum_kernel):
diff --git a/ports/sysdeps/arm/dl-machine.h b/ports/sysdeps/arm/dl-machine.h
index 442fc3ddcd..fe39a5e682 100644
--- a/ports/sysdeps/arm/dl-machine.h
+++ b/ports/sysdeps/arm/dl-machine.h
@@ -70,7 +70,7 @@ elf_machine_dynamic (void)
 static inline Elf32_Addr __attribute__ ((unused))
 elf_machine_load_address (void)
 {
-  extern void __dl_start asm ("_dl_start");
+  extern Elf32_Addr internal_function __dl_start (void *) asm ("_dl_start");
   Elf32_Addr got_addr = (Elf32_Addr) &__dl_start;
   Elf32_Addr pcrel_addr;
 #ifdef __thumb__