diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/s390/s390-32/tls-macros.h | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 940bcbf64f..74f56c2b74 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2017-04-04 Stefan Liebler <stli@linux.vnet.ibm.com> + + * sysdeps/s390/s390-32/tls-macros.h (TLS_LD, TLS_GD): + Clobber also r14. + 2017-04-03 Mike Frysinger <vapier@gentoo.org> [BZ #21253] 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 |