about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2004-06-11 09:56:02 +0000
committerRoland McGrath <roland@gnu.org>2004-06-11 09:56:02 +0000
commitb80af23ac6973e69df6cd23d221fa44fffb21e17 (patch)
tree668499346eedafb528bc44b5f9663a2987c6115c
parentf05a089da96014435cce5c9f17f386ba846a1a6e (diff)
downloadglibc-b80af23ac6973e69df6cd23d221fa44fffb21e17.tar.gz
glibc-b80af23ac6973e69df6cd23d221fa44fffb21e17.tar.xz
glibc-b80af23ac6973e69df6cd23d221fa44fffb21e17.zip
* elf/tls-macros.h [__s390x__] (TLS_LD, TLS_GD): Clobber also r14.
-rw-r--r--ChangeLog4
-rw-r--r--elf/tls-macros.h10
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 13ee51fed7..c8b8c92969 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-10  Jakub Jelinek  <jakub@redhat.com>
+
+	* elf/tls-macros.h [__s390x__] (TLS_LD, TLS_GD): Clobber also r14.
+
 2004-06-08  Jakub Jelinek  <jakub@redhat.com>
 
 	[BZ #199]
diff --git a/elf/tls-macros.h b/elf/tls-macros.h
index d02e9b2d90..bed2e14899 100644
--- a/elf/tls-macros.h
+++ b/elf/tls-macros.h
@@ -484,7 +484,7 @@ register void *__gp __asm__("$29");
 	  "algr %0,%%r2\n\t"						      \
           "lgr %%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) \
@@ -497,7 +497,8 @@ register void *__gp __asm__("$29");
 	  "brasl %%r14,__tls_get_offset@plt:tls_ldcall:" #x "\n\t"	      \
 	  "lg %0,8(%0)\n\t"						      \
 	  "algr %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
 
@@ -513,7 +514,7 @@ register void *__gp __asm__("$29");
           "lgr %0,%%r2\n\t"						      \
           "lgr %%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) \
@@ -524,7 +525,8 @@ register void *__gp __asm__("$29");
 	  "lg %%r2,0(%0)\n\t"						      \
 	  "brasl %%r14,__tls_get_offset@plt:tls_gdcall:" #x "\n\t"	      \
           "lgr %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