diff options
| author | Andreas Krebbel <krebbel@linux.vnet.ibm.com> | 2013-11-29 09:57:04 +0100 |
|---|---|---|
| committer | Andreas Krebbel <krebbel@linux.vnet.ibm.com> | 2013-11-29 09:57:04 +0100 |
| commit | acd98a8ed1460497e788c701eb92616f1df9b446 (patch) | |
| tree | cc50555e7ba16b16ac0e43366f4f1747980353b9 /sysdeps/s390/s390-32 | |
| parent | 7475aef5fa2b5ca414117bd667520ba64ad75807 (diff) | |
[BZ #16214] S/390: Fix TLS GOT pointer setup.
Diffstat (limited to 'sysdeps/s390/s390-32')
| -rw-r--r-- | sysdeps/s390/s390-32/tls-macros.h | 13 |
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) \ |