[commits] r3060 - in /trunk/ports: ChangeLog.eglibc sysdeps/arm/dl-machine.h

[joseph@xxxxxxxxxx]

Author: joseph
Date: Mon Aug  6 05:43:20 2007
New Revision: 3060

Log:
2007-08-06  Paul Brook  <paul@xxxxxxxxxxxxxxxx>

	* sysdeps/arm/dl-machine.h (elf_machine_dynamic): Add missing
	indirection in Thumb assembly code.
	(elf_machine_load_address): Clear T bit of PLT entry contents.
	(RTLD_START): Mark function symbols as such.  Tweak pc-relative
	addressing to avoid depending on pc read pipeline offset.

Modified:
    trunk/ports/ChangeLog.eglibc
    trunk/ports/sysdeps/arm/dl-machine.h

Modified: trunk/ports/ChangeLog.eglibc
==============================================================================
--- trunk/ports/ChangeLog.eglibc (original)
+++ trunk/ports/ChangeLog.eglibc Mon Aug  6 05:43:20 2007
@@ -1,3 +1,11 @@
+2007-08-06  Paul Brook  <paul@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/arm/dl-machine.h (elf_machine_dynamic): Add missing
+	indirection in Thumb assembly code.
+	(elf_machine_load_address): Clear T bit of PLT entry contents.
+	(RTLD_START): Mark function symbols as such.  Tweak pc-relative
+	addressing to avoid depending on pc read pipeline offset.
+
 2007-06-12  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/mips/nptl/bits/local_lim.h: Copy from

Modified: trunk/ports/sysdeps/arm/dl-machine.h
==============================================================================
--- trunk/ports/sysdeps/arm/dl-machine.h (original)
+++ trunk/ports/sysdeps/arm/dl-machine.h Mon Aug  6 05:43:20 2007
@@ -57,7 +57,7 @@
   long tmp;
   asm ("ldr\t%0, 1f\n\t"
        "adr\t%1, 1f\n\t"
-       "add\t%0, %1\n\t"
+       "ldr\t%0, [%0, %1]\n\t"
        "b 2f\n"
        ".align 2\n"
        "1: .word _GLOBAL_OFFSET_TABLE_ - 1b\n"
@@ -80,6 +80,10 @@
   extern void __dl_start asm ("_dl_start");
   Elf32_Addr got_addr = (Elf32_Addr) &__dl_start;
   Elf32_Addr pcrel_addr;
+#ifdef __thumb__
+  /* Clear the low bit of the funciton address.  */
+  got_addr &= ~(Elf32_Addr) 1;
+#endif
   asm ("adr %0, _dl_start" : "=r" (pcrel_addr));
   return pcrel_addr - got_addr;
 }
@@ -151,7 +155,9 @@
 #define RTLD_START asm ("\
 .text\n\
 .globl _start\n\
+.type _start, %function\n\
 .globl _dl_start_user\n\
+.type _dl_start_user, %function\n\
 _start:\n\
 	@ we are PIC code, so get global offset table\n\
 	ldr	sl, .L_GET_GOT\n\
@@ -163,8 +169,8 @@
 	bl	_dl_start\n\
 	@ returns user entry point in r0\n\
 _dl_start_user:\n\
-	add	sl, pc, sl\n\
-.L_GOT_GOT:\n\
+	adr	r6, .L_GET_GOT\n\
+	add	sl, sl, r6\n\
 	ldr	r4, [sl, r4]\n\
 	@ save the entry point in another register\n\
 	mov	r6, r0\n\
@@ -221,7 +227,7 @@
 	b	.L_done_fixup\n\
 \n\
 .L_GET_GOT:\n\
-	.word	_GLOBAL_OFFSET_TABLE_ - .L_GOT_GOT - 4\n\
+	.word	_GLOBAL_OFFSET_TABLE_ - .L_GET_GOT\n\
 .L_SKIP_ARGS:\n\
 	.word	_dl_skip_args(GOTOFF)\n\
 .L_FINI_PROC:\n\