This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.21-198-gcdaf79d
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 13 Mar 2015 17:10:27 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.21-198-gcdaf79d
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, master has been updated
via cdaf79d0af439ade496a1f6235f503e491502cd6 (commit)
from cf9313e7d1dd42addd6cf8c9277f0f18a62cdeff (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=cdaf79d0af439ade496a1f6235f503e491502cd6
commit cdaf79d0af439ade496a1f6235f503e491502cd6
Author: Roland McGrath <roland@hack.frob.com>
Date: Fri Mar 13 10:10:09 2015 -0700
ARM: Rewrite sysdeps/arm/tls-macros.h
diff --git a/ChangeLog b/ChangeLog
index f5545b1..fb1591f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-03-13 Roland McGrath <roland@hack.frob.com>
+
+ * sysdeps/arm/tls-macros.h: Include <sysdep.h>.
+ (GET_SPECIAL_RELOC, GET_SPECIAL_PCREL): New macros to encapsulate
+ all the necessary asm magic in one place.
+ (TLS_LE, TLS_IE, TLS_LD, TLS_GD): Rewritten as C expressions
+ using those.
+
2015-03-13 Carlos O'Donell <carlos@redhat.com>
[BZ #14906]
diff --git a/sysdeps/arm/tls-macros.h b/sysdeps/arm/tls-macros.h
index e41d3bc..25cd849 100644
--- a/sysdeps/arm/tls-macros.h
+++ b/sysdeps/arm/tls-macros.h
@@ -1,78 +1,72 @@
+#include <sysdep.h> /* For ARCH_HAS_T2. */
+
#ifdef __thumb2__
-#define ARM_PC_OFFSET "4"
+# define ARM_PC_OFFSET "4"
#else
-#define ARM_PC_OFFSET "8"
+# define ARM_PC_OFFSET "8"
#endif
-#define TLS_LE(x) \
- ({ int *__result; \
- void *tp = __builtin_thread_pointer (); \
- asm ("ldr %0, 1f; " \
- "add %0, %1, %0; " \
- "b 2f; " \
- ".align 2; " \
- "1: .word " #x "(tpoff); " \
- "2: " \
- : "=&r" (__result) : "r" (tp)); \
- __result; })
-
-#ifdef __thumb2__
-#define TLS_IE(x) \
- ({ int *__result; \
- void *tp = __builtin_thread_pointer (); \
- asm ("ldr %0, 1f; " \
- "3: add %0, pc, %0;" \
- "ldr %0, [%0];" \
- "add %0, %1, %0; " \
- "b 2f; " \
- ".align 2; " \
- "1: .word " #x "(gottpoff) + (. - 3b - 4); " \
- "2: " \
- : "=&r" (__result) : "r" (tp)); \
- __result; })
+/* Returns the address of data containing ".word SYMBOL(RELOC)". */
+#if defined (ARCH_HAS_T2) && !defined (PIC)
+# define GET_SPECIAL_RELOC(symbol, reloc) \
+ ({ \
+ int *__##symbol##_rodata; \
+ asm ("movw %0, #:lower16:1f\n" \
+ "movt %0, #:upper16:1f\n" \
+ ".pushsection .rodata.cst4, \"aM\", %%progbits, 4\n" \
+ ".balign 4\n" \
+ "1: .word " #symbol "(" #reloc ")\n" \
+ ".popsection" \
+ : "=r" (__##symbol##_rodata)); \
+ __##symbol##_rodata; \
+ })
+#elif defined (ARCH_HAS_T2) && defined (PIC) && ARM_PCREL_MOVW_OK
+# define GET_SPECIAL_RELOC(symbol, reloc) \
+ ({ \
+ int *__##symbol##_rodata; \
+ asm ("movw %0, #:lower16:1f - 2f - " ARM_PC_OFFSET "\n" \
+ "movt %0, #:upper16:1f - 2f - " ARM_PC_OFFSET "\n" \
+ ".pushsection .rodata.cst4, \"aM\", %%progbits, 4\n" \
+ ".balign 4\n" \
+ "1: .word " #symbol "(" #reloc ")\n" \
+ ".popsection\n" \
+ "2: add %0, %0, pc" \
+ : "=r" (__##symbol##_rodata)); \
+ __##symbol##_rodata; \
+ })
#else
-#define TLS_IE(x) \
- ({ int *__result; \
- void *tp = __builtin_thread_pointer (); \
- asm ("ldr %0, 1f; " \
- "3: ldr %0, [pc, %0];" \
- "add %0, %1, %0; " \
- "b 2f; " \
- ".align 2; " \
- "1: .word " #x "(gottpoff) + (. - 3b - 8); " \
- "2: " \
- : "=&r" (__result) : "r" (tp)); \
- __result; })
+# define GET_SPECIAL_RELOC(symbol, reloc) \
+ ({ \
+ int *__##symbol##_rodata; \
+ asm ("adr %0, 1f\n" \
+ "b 2f\n" \
+ ".balign 4\n" \
+ "1: .word " #symbol "(" #reloc ")\n" \
+ "2:" \
+ : "=r" (__##symbol##_rodata)); \
+ __##symbol##_rodata; \
+ })
#endif
-#define TLS_LD(x) \
- ({ char *__result; \
- int __offset; \
- extern void *__tls_get_addr (void *); \
- asm ("ldr %0, 2f; " \
- "1: add %0, pc, %0; " \
- "b 3f; " \
- ".align 2; " \
- "2: .word " #x "(tlsldm) + (. - 1b - "ARM_PC_OFFSET"); " \
- "3: " \
- : "=r" (__result)); \
- __result = (char *)__tls_get_addr (__result); \
- asm ("ldr %0, 1f; " \
- "b 2f; " \
- ".align 2; " \
- "1: .word " #x "(tlsldo); " \
- "2: " \
- : "=r" (__offset)); \
- (int *) (__result + __offset); })
+/* Returns the pointer value (SYMBOL(RELOC) + pc - PC_OFS). */
+#define GET_SPECIAL_PCREL(symbol, reloc) \
+ ({ \
+ int *__##symbol##_rodata = GET_SPECIAL_RELOC (symbol, reloc); \
+ (void *) ((int) __##symbol##_rodata + *__##symbol##_rodata); \
+ })
+
+#define TLS_LE(x) \
+ (__builtin_thread_pointer () + *GET_SPECIAL_RELOC (x, tpoff))
+
+#define TLS_IE(x) \
+ ((int *) (__builtin_thread_pointer () \
+ + *(int *) GET_SPECIAL_PCREL (x, gottpoff)))
+
+extern void *__tls_get_addr (void *);
+
+#define TLS_LD(x) \
+ ((int *) (__tls_get_addr (GET_SPECIAL_PCREL (x, tlsldm)) \
+ + *GET_SPECIAL_RELOC (x, tlsldo)))
-#define TLS_GD(x) \
- ({ int *__result; \
- extern void *__tls_get_addr (void *); \
- asm ("ldr %0, 2f; " \
- "1: add %0, pc, %0; " \
- "b 3f; " \
- ".align 2; " \
- "2: .word " #x "(tlsgd) + (. - 1b - "ARM_PC_OFFSET"); " \
- "3: " \
- : "=r" (__result)); \
- (int *)__tls_get_addr (__result); })
+#define TLS_GD(x) \
+ ((int *) __tls_get_addr (GET_SPECIAL_PCREL (x, tlsgd)))
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 8 +++
sysdeps/arm/tls-macros.h | 134 ++++++++++++++++++++++------------------------
2 files changed, 72 insertions(+), 70 deletions(-)
hooks/post-receive
--
GNU C Library master sources