summary refs log tree commit diff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-10-05 06:52:02 +0000
committerUlrich Drepper <drepper@redhat.com>2002-10-05 06:52:02 +0000
commit05a5122742c8519f28628cf16129a5a3d65a957d (patch)
tree943055c83a651f499fe6923cc71ce82aede6efce /elf
parent7edd1b564cbcdf4fa7481eb8cbe1354eb5a686ff (diff)
downloadglibc-05a5122742c8519f28628cf16129a5a3d65a957d.tar.gz
glibc-05a5122742c8519f28628cf16129a5a3d65a957d.tar.xz
glibc-05a5122742c8519f28628cf16129a5a3d65a957d.zip
Update.
2002-10-05  Kaz Kojima  <kkojima@rr.iij4u.or.jp>

	* elf/tls-macros.h: Fix SH version of macros so as to match ABI syntax.

2002-10-03  Ulrich Drepper  <drepper@redhat.com>

	* version.h (RELEASE): Change to stable.

See ChangeLog.13 for earlier changes.
Diffstat (limited to 'elf')
-rw-r--r--elf/tls-macros.h19
1 files changed, 11 insertions, 8 deletions
diff --git a/elf/tls-macros.h b/elf/tls-macros.h
index 1f9cf4448a..846da91080 100644
--- a/elf/tls-macros.h
+++ b/elf/tls-macros.h
@@ -154,8 +154,8 @@
 	  "bra 2f\n\t"							      \
 	  " add %1,%0\n\t"						      \
 	  ".align 2\n\t"						      \
-	  "0: .long _GLOBAL_OFFSET_TABLE_\n\t"				      \
 	  "1: .long " #x "@gottpoff\n\t"				      \
+	  "0: .long _GLOBAL_OFFSET_TABLE_\n\t"				      \
 	  "2:"								      \
 	  : "=r" (__l), "=r" (__tp) : : "r0", "r12");			      \
      __l; })
@@ -171,17 +171,20 @@
 	  "add r0,r1\n\t"						      \
 	  "jsr @r1\n\t"							      \
 	  " add r12,r4\n\t"						      \
-	  "mov.l 3f,%0\n\t"						      \
 	  "bra 4f\n\t"							      \
-	  " add r0,%0\n\t"						      \
+	  " nop\n\t"							      \
 	  ".align 2\n\t"						      \
-	  "0: .long _GLOBAL_OFFSET_TABLE_\n\t"				      \
 	  "1: .long " #x "@tlsldm\n\t"					      \
 	  "2: .long __tls_get_addr@plt\n\t"				      \
+	  "0: .long _GLOBAL_OFFSET_TABLE_\n\t"				      \
+	  "4: mov.l 3f,%0\n\t"						      \
+	  "bra 5f\n\t"							      \
+	  " add r0,%0\n\t"						      \
+	  ".align 2\n\t"						      \
 	  "3: .long " #x "@dtpoff\n\t"					      \
-	  "4:"								      \
+	  "5:"								      \
 	  : "=r" (__l) : : "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",    \
-			   "r12", "pr", "t");					      \
+			   "r12", "pr", "t");				      \
      __l; })
 
 # define TLS_GD(x) \
@@ -198,12 +201,12 @@
 	  "bra 3f\n\t"							      \
 	  " mov r0,%0\n\t"						      \
 	  ".align 2\n\t"						      \
-	  "0: .long _GLOBAL_OFFSET_TABLE_\n\t"				      \
 	  "1: .long " #x "@tlsgd\n\t"					      \
 	  "2: .long __tls_get_addr@plt\n\t"				      \
+	  "0: .long _GLOBAL_OFFSET_TABLE_\n\t"				      \
 	  "3:"								      \
 	  : "=r" (__l) : : "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",    \
-			   "r12", "pr", "t");					      \
+			   "r12", "pr", "t");				      \
      __l; })
 
 #else