[PATCH] Fix IA-64 tls-macros.h

[PATCH] Fix IA-64 tls-macros.h

[Jakub Jelinek]

Hi!

We have to tell gc those 3 asm's use gp, because otherwise when optimizing
there might be a gp value from last called function in gp instead of current
function's got pointer.

2003-04-01  Jakub Jelinek  <jakub@redhat.com>

	* elf/tls-macros.h [__ia64__] (TLS_IE, TLS_LD, TLS_GD): Add gp
	register as input to asm.

--- libc/elf/tls-macros.h.jj	2003-03-02 06:41:54.000000000 -0500
+++ libc/elf/tls-macros.h	2003-04-01 14:31:13.000000000 -0500
@@ -316,13 +316,14 @@ register void *__gp __asm__("$29");
 
 # define TLS_IE(x) \
   ({ void *__l;								      \
+     register long __gp asm ("gp");					      \
      asm (";;\n\t"							      \
 	 "addl r16=@ltoff(@tprel(" #x ")),gp\n\t"			      \
          ";;\n\t"							      \
          "ld8 r17=[r16]\n\t"						      \
          ";;\n\t"							      \
          "add %0=r13,r17\n\t"						      \
-         : "=r" (__l) : : "r16", "r17" ); __l; })
+         : "=r" (__l) : "r" (__gp) : "r16", "r17" ); __l; })
 
 # define __TLS_CALL_CLOBBERS \
   "r2", "r3", "r8", "r9", "r10", "r11", "r14", "r15", "r16", "r17",	      \
@@ -335,6 +336,7 @@ register void *__gp __asm__("$29");
 
 # define TLS_LD(x) \
   ({ void *__l;								      \
+     register long __gp asm ("gp");					      \
      asm (";;\n\t"							      \
 	 "mov loc0=gp\n\t"						      \
          "addl r16=@ltoff(@dtpmod(" #x ")),gp\n\t"			      \
@@ -345,11 +347,12 @@ register void *__gp __asm__("$29");
          ";;\n\t"							      \
          "mov gp=loc0\n\t"						      \
          "mov %0=r8\n\t"						      \
-         : "=r" (__l) : : "loc0", __TLS_CALL_CLOBBERS);			      \
+         : "=r" (__l) : "r" (__gp) : "loc0", __TLS_CALL_CLOBBERS);	      \
      __l; })
 
 # define TLS_GD(x) \
   ({ void *__l;								      \
+     register long __gp asm ("gp");					      \
      asm (";;\n\t"							      \
 	 "mov loc0=gp\n\t"						      \
          "addl r16=@ltoff(@dtpmod(" #x ")),gp\n\t"			      \
@@ -361,7 +364,7 @@ register void *__gp __asm__("$29");
          ";;\n\t"							      \
          "mov gp=loc0\n\t"						      \
          "mov %0=r8\n\t"						      \
-          : "=r" (__l) : : "loc0", __TLS_CALL_CLOBBERS);		      \
+         : "=r" (__l) : "r" (__gp) : "loc0", __TLS_CALL_CLOBBERS);	      \
      __l; })
 
 #elif defined __sparc__ && !defined __arch64__

	Jakub

Re: [PATCH] Fix IA-64 tls-macros.h

[Ulrich Drepper]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Jakub Jelinek wrote:

> We have to tell gc those 3 asm's use gp, because otherwise when optimizing
> there might be a gp value from last called function in gp instead of current
> function's got pointer.

Since I assume you've tested this I applied the patch.  Thanks,

- -- 
- --------------.                        ,-.            444 Castro Street
Ulrich Drepper \    ,-----------------'   \ Mountain View, CA 94041 USA
Red Hat         `--' drepper at redhat.com `---------------------------
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQE+ifJk2ijCOnn/RHQRAqX6AKCiimyykkginYbKTZQk6qxzVfbazgCfY0LV
r0rR3O/efQkh/BYSOas2DUY=
=ZZdq
-----END PGP SIGNATURE-----