about summary refs log tree commit diff
path: root/sysdeps/s390/s390-32/tls-macros.h
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/s390/s390-32/tls-macros.h')
-rw-r--r--sysdeps/s390/s390-32/tls-macros.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/sysdeps/s390/s390-32/tls-macros.h b/sysdeps/s390/s390-32/tls-macros.h
index 8a0ad5863c..a592d81585 100644
--- a/sysdeps/s390/s390-32/tls-macros.h
+++ b/sysdeps/s390/s390-32/tls-macros.h
@@ -8,12 +8,15 @@
 
 #ifdef PIC
 # define TLS_IE(x) \
-  ({ unsigned long __offset;						      \
+  ({ unsigned long __offset, __got;					      \
      asm ("bras %0,1f\n"						      \
-	  "0:\t.long " #x "@gotntpoff\n"				      \
-	  "1:\tl %0,0(%0)\n\t"						      \
-	  "l %0,0(%0,%%r12):tls_load:" #x				      \
-	  : "=&a" (__offset) : : "cc" );				      \
+	  "0:\t.long _GLOBAL_OFFSET_TABLE_-0b\n\t"			      \
+	  ".long " #x "@gotntpoff\n"					      \
+	  "1:\tl %1,0(%0)\n\t"						      \
+	  "la %1,0(%1,%0)\n\t"						      \
+	  "l %0,4(%0)\n\t"						      \
+	  "l %0,0(%0,%1):tls_load:" #x "\n"				      \
+	  : "=&a" (__offset), "=&a" (__got) : : "cc" );			      \
      (int *) (__builtin_thread_pointer() + __offset); })
 #else
 # define TLS_IE(x) \