This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch roland/arm-elf_machine_dynamic created. glibc-2.17-608-gf2d4bec
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 6 May 2013 21:07:42 -0000
- Subject: GNU C Library master sources branch roland/arm-elf_machine_dynamic created. glibc-2.17-608-gf2d4bec
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, roland/arm-elf_machine_dynamic has been created
at f2d4bec746c133a4e7fedbb456bba3a1a33561e8 (commit)
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f2d4bec746c133a4e7fedbb456bba3a1a33561e8
commit f2d4bec746c133a4e7fedbb456bba3a1a33561e8
Author: Roland McGrath <roland@hack.frob.com>
Date: Mon May 6 14:01:04 2013 -0700
ARM: Rewrite elf_machine_dynamic in pure C.
diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
index 25981d7..acc1474 100644
--- a/ports/ChangeLog.arm
+++ b/ports/ChangeLog.arm
@@ -1,5 +1,10 @@
2013-05-06 Roland McGrath <roland@hack.frob.com>
+ * sysdeps/arm/dl-machine.h (elf_machine_dynamic): Use a plain C
+ reference to _GLOBAL_OFFSET_TABLE_ with an STV_HIDDEN declaration.
+
+2013-05-06 Roland McGrath <roland@hack.frob.com>
+
* sysdeps/arm/dl-tlsdesc.S (_dl_tlsdesc_dynamic): Add missing sfi_breg.
2013-04-19 Roland McGrath <roland@hack.frob.com>
diff --git a/ports/sysdeps/arm/dl-machine.h b/ports/sysdeps/arm/dl-machine.h
index 5a424f8..6e09aa1 100644
--- a/ports/sysdeps/arm/dl-machine.h
+++ b/ports/sysdeps/arm/dl-machine.h
@@ -39,30 +39,13 @@ elf_machine_matches_host (const Elf32_Ehdr *ehdr)
/* Return the link-time address of _DYNAMIC. Conveniently, this is the
- first element of the GOT. We used to use the PIC register to do this
- without a constant pool reference, but GCC 4.2 will use a pseudo-register
- for the PIC base, so it may not be in r10. */
+ first element of the GOT. */
static inline Elf32_Addr __attribute__ ((unused))
elf_machine_dynamic (void)
{
- Elf32_Addr dynamic;
-#ifdef __thumb2__
- long tmp;
- asm ("ldr\t%0, 1f\n\t"
- "adr\t%1, 1f\n\t"
- "ldr\t%0, [%0, %1]\n\t"
- "b 2f\n"
- ".align 2\n"
- "1: .word _GLOBAL_OFFSET_TABLE_ - 1b\n"
- "2:" : "=r" (dynamic), "=r"(tmp));
-#else
- asm ("ldr %0, 2f\n"
- "1: ldr %0, [pc, %0]\n"
- "b 3f\n"
- "2: .word _GLOBAL_OFFSET_TABLE_ - (1b+8)\n"
- "3:" : "=r" (dynamic));
-#endif
- return dynamic;
+ /* Declaring this hidden ensures that a PC-relative reference is used. */
+ extern const Elf32_Addr _GLOBAL_OFFSET_TABLE_[] attribute_hidden;
+ return _GLOBAL_OFFSET_TABLE_[0];
}
-----------------------------------------------------------------------
hooks/post-receive
--
GNU C Library master sources