From 05a5122742c8519f28628cf16129a5a3d65a957d Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 5 Oct 2002 06:52:02 +0000 Subject: Update. 2002-10-05 Kaz Kojima * elf/tls-macros.h: Fix SH version of macros so as to match ABI syntax. 2002-10-03 Ulrich Drepper * version.h (RELEASE): Change to stable. See ChangeLog.13 for earlier changes. --- elf/tls-macros.h | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'elf/tls-macros.h') 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 -- cgit v1.2.3