[commits] r9124 - in /branches/eglibc-2_10/ports: ChangeLog.arm sysdeps/arm/elf/start.S

[joseph@xxxxxxxxxx]

Author: joseph
Date: Thu Oct 22 12:52:51 2009
New Revision: 9124

Log:
Merge changes between r8872 and r9123 from /fsf/glibc-2_10-branch.

Modified:
    branches/eglibc-2_10/ports/ChangeLog.arm
    branches/eglibc-2_10/ports/sysdeps/arm/elf/start.S

Modified: branches/eglibc-2_10/ports/ChangeLog.arm
==============================================================================
--- branches/eglibc-2_10/ports/ChangeLog.arm (original)
+++ branches/eglibc-2_10/ports/ChangeLog.arm Thu Oct 22 12:52:51 2009
@@ -1,3 +1,8 @@
+2009-10-22  Julian Brown  <julian@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/arm/elf/start.S (_start): Avoid dependency on PC pipeline
+	offset.
+
 2009-07-29  Aurelien Jarno  <aurelien@xxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/arm/kernel-features.h: Define

Modified: branches/eglibc-2_10/ports/sysdeps/arm/elf/start.S
==============================================================================
--- branches/eglibc-2_10/ports/sysdeps/arm/elf/start.S (original)
+++ branches/eglibc-2_10/ports/sysdeps/arm/elf/start.S Thu Oct 22 12:52:51 2009
@@ -87,8 +87,8 @@
 
 #ifdef SHARED
 	ldr sl, .L_GOT
-.L_GOT_OFF:
-	add sl, pc, sl
+	adr a4, .L_GOT
+	add sl, sl, a4
 
 	ldr ip, .L_GOT+4	/* __libc_csu_fini */
 	ldr ip, [sl, ip]
@@ -125,7 +125,7 @@
 
 #ifdef SHARED
 .L_GOT:
-	.word _GLOBAL_OFFSET_TABLE_-(.L_GOT_OFF+8)
+	.word _GLOBAL_OFFSET_TABLE_ - .L_GOT
 	.word __libc_csu_fini(GOT)
 	.word __libc_csu_init(GOT)
 	.word main(GOT)