|
|
@@ -5,16 +5,11 @@
|
|
|
: "=r" (__l)); \
|
|
|
__l; })
|
|
|
|
|
|
-#ifdef __PIC__
|
|
|
-# define TLS_IE(x) \
|
|
|
- ({ int *__l; \
|
|
|
- __asm__ ("movl %%gs:0,%0\n\t" \
|
|
|
- "subl " #x "@gottpoff(%%ebx),%0" \
|
|
|
- : "=r" (__l)); \
|
|
|
- __l; })
|
|
|
-#else
|
|
|
-# define TLS_IE(x) \
|
|
|
- ({ int *__l; \
|
|
|
+/* The GOT-using sequences load %ebx themselves and must reserve it via
|
|
|
+ a dummy "b" output, or gcc may keep a live value there across the asm. */
|
|
|
+
|
|
|
+#define TLS_IE(x) \
|
|
|
+ ({ int *__l, __b; \
|
|
|
__asm__ ("call 1f\n\t" \
|
|
|
".subsection 1\n" \
|
|
|
"1:\tmovl (%%esp), %%ebx\n\t" \
|
|
|
@@ -23,20 +18,10 @@
|
|
|
"addl $_GLOBAL_OFFSET_TABLE_, %%ebx\n\t" \
|
|
|
"movl %%gs:0,%0\n\t" \
|
|
|
"subl " #x "@gottpoff(%%ebx),%0" \
|
|
|
- : "=r" (__l)); \
|
|
|
+ : "=r" (__l), "=&b" (__b)); \
|
|
|
__l; })
|
|
|
-#endif
|
|
|
|
|
|
-#ifdef __PIC__
|
|
|
-# define TLS_LD(x) \
|
|
|
- ({ int *__l, __c, __d; \
|
|
|
- __asm__ ("leal " #x "@tlsldm(%%ebx),%%eax\n\t" \
|
|
|
- "call ___tls_get_addr@plt\n\t" \
|
|
|
- "leal " #x "@dtpoff(%%eax), %%eax" \
|
|
|
- : "=a" (__l), "=&c" (__c), "=&d" (__d)); \
|
|
|
- __l; })
|
|
|
-#else
|
|
|
-# define TLS_LD(x) \
|
|
|
+#define TLS_LD(x) \
|
|
|
({ int *__l, __b, __c, __d; \
|
|
|
__asm__ ("call 1f\n\t" \
|
|
|
".subsection 1\n" \
|
|
|
@@ -49,19 +34,9 @@
|
|
|
"leal " #x "@dtpoff(%%eax), %%eax" \
|
|
|
: "=a" (__l), "=&b" (__b), "=&c" (__c), "=&d" (__d)); \
|
|
|
__l; })
|
|
|
-#endif
|
|
|
|
|
|
-#ifdef __PIC__
|
|
|
-# define TLS_GD(x) \
|
|
|
- ({ int *__l, __c, __d; \
|
|
|
- __asm__ ("leal " #x "@tlsgd(%%ebx),%%eax\n\t" \
|
|
|
- "call ___tls_get_addr@plt\n\t" \
|
|
|
- "nop" \
|
|
|
- : "=a" (__l), "=&c" (__c), "=&d" (__d)); \
|
|
|
- __l; })
|
|
|
-#else
|
|
|
-# define TLS_GD(x) \
|
|
|
- ({ int *__l, __c, __d; \
|
|
|
+#define TLS_GD(x) \
|
|
|
+ ({ int *__l, __b, __c, __d; \
|
|
|
__asm__ ("call 1f\n\t" \
|
|
|
".subsection 1\n" \
|
|
|
"1:\tmovl (%%esp), %%ebx\n\t" \
|
|
|
@@ -71,6 +46,5 @@
|
|
|
"leal " #x "@tlsgd(%%ebx),%%eax\n\t" \
|
|
|
"call ___tls_get_addr@plt\n\t" \
|
|
|
"nop" \
|
|
|
- : "=a" (__l), "=&c" (__c), "=&d" (__d)); \
|
|
|
+ : "=a" (__l), "=&b" (__b), "=&c" (__c), "=&d" (__d)); \
|
|
|
__l; })
|
|
|
-#endif
|