From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <libc-hacker-return-5690-listarch-libc-hacker=sourceware.cygnus.com@sources.redhat.com>
Received: (qmail 8023 invoked by alias); 5 Oct 2002 03:02:23 -0000
Mailing-List: contact libc-hacker-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:libc-hacker-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/libc-hacker/>
List-Post: <mailto:libc-hacker@sources.redhat.com>
List-Help: <mailto:libc-hacker-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: libc-hacker-owner@sources.redhat.com
Received: (qmail 8007 invoked from network); 5 Oct 2002 03:02:22 -0000
Received: from unknown (HELO r-rr.iij4u.or.jp) (210.130.0.76)
  by sources.redhat.com with SMTP; 5 Oct 2002 03:02:22 -0000
Received: from localhost (frgw.3in.ne.jp [210.251.121.226])
	by r-rr.iij4u.or.jp (8.11.6+IIJ/8.11.6) with ESMTP id g9532GO02850;
	Sat, 5 Oct 2002 12:02:17 +0900 (JST)
Message-Id: <200210050302.g9532GO02850@r-rr.iij4u.or.jp>
To: libc-hacker@sources.redhat.com
Cc: hp@bitrange.com, stephen.clarke@superh.com, joern.rennecke@superh.com
Subject: SH TLS macros fix
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Date: Sat, 05 Oct 2002 14:55:00 -0000
From: kaz Kojima <kkojima@rr.iij4u.or.jp>
X-Dispatcher: imput version 971024
X-SW-Source: 2002-10/txt/msg00029.txt.bz2

Hi,

Uli pointed out to me that now SH TLS ABI doesn't need R_SH_TLS_*_MOV
relocations. I've fixed binutils and then found the current macros
for SH in elf/tls-macros.h don't match ABI. Here is a fix.

BTW, I've revised my tiny TLS memo
<URL:http://dodo.nurs.or.jp/~kkojima/gnu-on-sh/tls-sh-memo.txt>.
I'll send binutils changes to binutils mailing list ASAP.

Regards,
	kaz
--
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.

--- ORIG/libc/elf/tls-macros.h	Thu Oct  3 19:42:19 2002
+++ LOCAL/libc/elf/tls-macros.h	Sat Oct  5 10:10:52 2002
@@ -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