diff options
| author | Stefan Liebler <stli@linux.vnet.ibm.com> | 2017-04-04 13:16:28 +0200 |
|---|---|---|
| committer | Stefan Liebler <stli@linux.vnet.ibm.com> | 2017-04-04 13:16:28 +0200 |
| commit | fce3da82e56a66bdafcef437abef0fa7b82b8d2b (patch) | |
| tree | d4a95276b96532152b8aa4414974b328f10bea1d /sysdeps/s390 | |
| parent | 83f0ad2bc63f26dab10f47c8741245d93eb4077a (diff) | |
| download | glibc-fce3da82e56a66bdafcef437abef0fa7b82b8d2b.tar.gz | |
S390: Clobber also r14 in TLS_LD, TLS_GD macros on 31bit.
This patch also clobbers r14 in TLS_LD, TLS_GD macros on 31bit.
This ensures that r14 isn't used to save and restore r12 while
r14 is clobbered by the bas-instruction.
As note:
r12 can't be added to clobber list as gcc would fail with:
error: PIC register clobbered by ‘12’ in ‘asm’
For 64bit this fix was already done in 2004 in the
commit b80af23ac6973e69df6cd23d221fa44fffb21e17.
ChangeLog:
* sysdeps/s390/s390-32/tls-macros.h (TLS_LD, TLS_GD):
Clobber also r14.
Diffstat (limited to 'sysdeps/s390')
| -rw-r--r-- | sysdeps/s390/s390-32/tls-macros.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sysdeps/s390/s390-32/tls-macros.h b/sysdeps/s390/s390-32/tls-macros.h index 09b42aa37a..a4c5fffa33 100644 --- a/sysdeps/s390/s390-32/tls-macros.h +++ b/sysdeps/s390/s390-32/tls-macros.h @@ -47,7 +47,7 @@ "alr %0,%%r2\n\t" \ "lr %%r12,%1" \ : "=&a" (__offset), "=&a" (__save12) \ - : : "cc", "0", "1", "2", "3", "4", "5" ); \ + : : "cc", "0", "1", "2", "3", "4", "5", "14"); \ (int *) (__builtin_thread_pointer() + __offset); }) #else # define TLS_LD(x) \ @@ -63,7 +63,8 @@ "bas %%r14,0(%%r1):tls_ldcall:" #x "\n\t" \ "l %0,12(%0)\n\t" \ "alr %0,%%r2" \ - : "=&a" (__offset) : : "cc", "0", "1", "2", "3", "4", "5", "12" ); \ + : "=&a" (__offset) \ + : : "cc", "0", "1", "2", "3", "4", "5", "12", "14"); \ (int *) (__builtin_thread_pointer() + __offset); }) #endif @@ -83,7 +84,7 @@ "lr %0,%%r2\n\t" \ "lr %%r12,%1" \ : "=&a" (__offset), "=&a" (__save12) \ - : : "cc", "0", "1", "2", "3", "4", "5" ); \ + : : "cc", "0", "1", "2", "3", "4", "5", "14"); \ (int *) (__builtin_thread_pointer() + __offset); }) #else # define TLS_GD(x) \ @@ -97,6 +98,7 @@ "l %%r2,8(%0)\n\t" \ "bas %%r14,0(%%r1):tls_gdcall:" #x "\n\t" \ "lr %0,%%r2" \ - : "=&a" (__offset) : : "cc", "0", "1", "2", "3", "4", "5", "12" ); \ + : "=&a" (__offset) \ + : : "cc", "0", "1", "2", "3", "4", "5", "12", "14"); \ (int *) (__builtin_thread_pointer() + __offset); }) #endif |