mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-22 19:00:07 +00:00
fix powerpc macros in tls-macros.h
This commit is contained in:
Alan Modra
Ulrich Drepper
parent
a3dc465852
commit
c62cf60c6b
@ -1,3 +1,12 @@
|
||||
2010-02-12 Alan Modra <amodra@gmail.com>
|
||||
|
||||
* elf/tls-macros.h (__TLS_CALL_CLOBBERS <__powerpc__>): Remove r3.
|
||||
Define and use for __powerpc64__ too.
|
||||
(TLS_LD <__powerpc__>): Add r3 to clobbers.
|
||||
(TLS_GD <__powerpc__>): Set asm output. Make __result r3 reg.
|
||||
(TLS_GD <__powerpc64__>): Make __result r3 reg.
|
||||
(TLS_IE <__powerpc64__>): Relax output constraint.
|
||||
|
||||
2010-02-11 Andreas Krebbel <Andreas.Krebbel@de.ibm.com>
|
||||
|
||||
* sysdeps/s390/s390-64/utf8-utf16-z9.c: Disable hardware
|
||||
|
||||
234
elf/tls-macros.h
234
elf/tls-macros.h
@ -701,154 +701,146 @@ register void *__gp __asm__("$29");
|
||||
(int *) (__builtin_thread_pointer() + __offset); })
|
||||
# endif
|
||||
|
||||
#elif defined __powerpc__ && !defined __powerpc64__
|
||||
#elif defined __powerpc__
|
||||
|
||||
#include "config.h"
|
||||
|
||||
# define __TLS_CALL_CLOBBERS \
|
||||
"0", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", \
|
||||
# define __TLS_CALL_CLOBBERS \
|
||||
"0", "4", "5", "6", "7", "8", "9", "10", "11", "12", \
|
||||
"lr", "ctr", "cr0", "cr1", "cr5", "cr6", "cr7"
|
||||
|
||||
# ifndef __powerpc64__
|
||||
|
||||
# include "config.h"
|
||||
|
||||
/* PowerPC32 Local Exec TLS access. */
|
||||
# define TLS_LE(x) \
|
||||
({ int *__result; \
|
||||
asm ("addi %0,2," #x "@tprel" \
|
||||
: "=r" (__result)); \
|
||||
# define TLS_LE(x) \
|
||||
({ int *__result; \
|
||||
asm ("addi %0,2," #x "@tprel" \
|
||||
: "=r" (__result)); \
|
||||
__result; })
|
||||
|
||||
/* PowerPC32 Initial Exec TLS access. */
|
||||
# ifdef HAVE_ASM_PPC_REL16
|
||||
# define TLS_IE(x) \
|
||||
({ int *__result; \
|
||||
asm ("bcl 20,31,1f\n1:\t" \
|
||||
"mflr %0\n\t" \
|
||||
"addis %0,%0,_GLOBAL_OFFSET_TABLE_-1b@ha\n\t" \
|
||||
"addi %0,%0,_GLOBAL_OFFSET_TABLE_-1b@l\n\t" \
|
||||
"lwz %0," #x "@got@tprel(%0)\n\t" \
|
||||
"add %0,%0," #x "@tls" \
|
||||
: "=b" (__result) : \
|
||||
: "lr"); \
|
||||
# ifdef HAVE_ASM_PPC_REL16
|
||||
# define TLS_IE(x) \
|
||||
({ int *__result; \
|
||||
asm ("bcl 20,31,1f\n1:\t" \
|
||||
"mflr %0\n\t" \
|
||||
"addis %0,%0,_GLOBAL_OFFSET_TABLE_-1b@ha\n\t" \
|
||||
"addi %0,%0,_GLOBAL_OFFSET_TABLE_-1b@l\n\t" \
|
||||
"lwz %0," #x "@got@tprel(%0)\n\t" \
|
||||
"add %0,%0," #x "@tls" \
|
||||
: "=b" (__result) : \
|
||||
: "lr"); \
|
||||
__result; })
|
||||
# else
|
||||
# define TLS_IE(x) \
|
||||
({ int *__result; \
|
||||
asm ("bl _GLOBAL_OFFSET_TABLE_@local-4\n\t" \
|
||||
"mflr %0\n\t" \
|
||||
"lwz %0," #x "@got@tprel(%0)\n\t" \
|
||||
"add %0,%0," #x "@tls" \
|
||||
: "=b" (__result) : \
|
||||
: "lr"); \
|
||||
# else
|
||||
# define TLS_IE(x) \
|
||||
({ int *__result; \
|
||||
asm ("bl _GLOBAL_OFFSET_TABLE_@local-4\n\t" \
|
||||
"mflr %0\n\t" \
|
||||
"lwz %0," #x "@got@tprel(%0)\n\t" \
|
||||
"add %0,%0," #x "@tls" \
|
||||
: "=b" (__result) : \
|
||||
: "lr"); \
|
||||
__result; })
|
||||
# endif
|
||||
# endif
|
||||
|
||||
/* PowerPC32 Local Dynamic TLS access. */
|
||||
# ifdef HAVE_ASM_PPC_REL16
|
||||
# define TLS_LD(x) \
|
||||
({ int *__result; \
|
||||
asm ("bcl 20,31,1f\n1:\t" \
|
||||
"mflr 3\n\t" \
|
||||
"addis 3,3,_GLOBAL_OFFSET_TABLE_-1b@ha\n\t" \
|
||||
"addi 3,3,_GLOBAL_OFFSET_TABLE_-1b@l\n\t" \
|
||||
"addi 3,3," #x "@got@tlsld\n\t" \
|
||||
"bl __tls_get_addr@plt\n\t" \
|
||||
"addi %0,3," #x "@dtprel" \
|
||||
: "=r" (__result) : \
|
||||
: __TLS_CALL_CLOBBERS); \
|
||||
# ifdef HAVE_ASM_PPC_REL16
|
||||
# define TLS_LD(x) \
|
||||
({ int *__result; \
|
||||
asm ("bcl 20,31,1f\n1:\t" \
|
||||
"mflr 3\n\t" \
|
||||
"addis 3,3,_GLOBAL_OFFSET_TABLE_-1b@ha\n\t" \
|
||||
"addi 3,3,_GLOBAL_OFFSET_TABLE_-1b@l\n\t" \
|
||||
"addi 3,3," #x "@got@tlsld\n\t" \
|
||||
"bl __tls_get_addr@plt\n\t" \
|
||||
"addi %0,3," #x "@dtprel" \
|
||||
: "=r" (__result) : \
|
||||
: "3", __TLS_CALL_CLOBBERS); \
|
||||
__result; })
|
||||
# else
|
||||
# define TLS_LD(x) \
|
||||
({ int *__result; \
|
||||
asm ("bl _GLOBAL_OFFSET_TABLE_@local-4\n\t" \
|
||||
"mflr 3\n\t" \
|
||||
"addi 3,3," #x "@got@tlsld\n\t" \
|
||||
"bl __tls_get_addr@plt\n\t" \
|
||||
"addi %0,3," #x "@dtprel" \
|
||||
: "=r" (__result) : \
|
||||
: __TLS_CALL_CLOBBERS); \
|
||||
# else
|
||||
# define TLS_LD(x) \
|
||||
({ int *__result; \
|
||||
asm ("bl _GLOBAL_OFFSET_TABLE_@local-4\n\t" \
|
||||
"mflr 3\n\t" \
|
||||
"addi 3,3," #x "@got@tlsld\n\t" \
|
||||
"bl __tls_get_addr@plt\n\t" \
|
||||
"addi %0,3," #x "@dtprel" \
|
||||
: "=r" (__result) : \
|
||||
: "3", __TLS_CALL_CLOBBERS); \
|
||||
__result; })
|
||||
# endif
|
||||
# endif
|
||||
|
||||
/* PowerPC32 General Dynamic TLS access. */
|
||||
# ifdef HAVE_ASM_PPC_REL16
|
||||
# define TLS_GD(x) \
|
||||
({ register int *__result __asm__ ("r3"); \
|
||||
asm ("bcl 20,31,1f\n1:\t" \
|
||||
"mflr 3\n\t" \
|
||||
"addis 3,3,_GLOBAL_OFFSET_TABLE_-1b@ha\n\t" \
|
||||
"addi 3,3,_GLOBAL_OFFSET_TABLE_-1b@l\n\t" \
|
||||
"addi 3,3," #x "@got@tlsgd\n\t" \
|
||||
"bl __tls_get_addr@plt" \
|
||||
: : \
|
||||
: __TLS_CALL_CLOBBERS); \
|
||||
# ifdef HAVE_ASM_PPC_REL16
|
||||
# define TLS_GD(x) \
|
||||
({ register int *__result __asm__ ("r3"); \
|
||||
asm ("bcl 20,31,1f\n1:\t" \
|
||||
"mflr 3\n\t" \
|
||||
"addis 3,3,_GLOBAL_OFFSET_TABLE_-1b@ha\n\t" \
|
||||
"addi 3,3,_GLOBAL_OFFSET_TABLE_-1b@l\n\t" \
|
||||
"addi 3,3," #x "@got@tlsgd\n\t" \
|
||||
"bl __tls_get_addr@plt" \
|
||||
: "=r" (__result) : \
|
||||
: __TLS_CALL_CLOBBERS); \
|
||||
__result; })
|
||||
# else
|
||||
# define TLS_GD(x) \
|
||||
({ register int *__result __asm__ ("r3"); \
|
||||
asm ("bl _GLOBAL_OFFSET_TABLE_@local-4\n\t" \
|
||||
"mflr 3\n\t" \
|
||||
"addi 3,3," #x "@got@tlsgd\n\t" \
|
||||
"bl __tls_get_addr@plt" \
|
||||
: : \
|
||||
: __TLS_CALL_CLOBBERS); \
|
||||
# else
|
||||
# define TLS_GD(x) \
|
||||
({ register int *__result __asm__ ("r3"); \
|
||||
asm ("bl _GLOBAL_OFFSET_TABLE_@local-4\n\t" \
|
||||
"mflr 3\n\t" \
|
||||
"addi 3,3," #x "@got@tlsgd\n\t" \
|
||||
"bl __tls_get_addr@plt" \
|
||||
: "=r" (__result) : \
|
||||
: __TLS_CALL_CLOBBERS); \
|
||||
__result; })
|
||||
# endif
|
||||
# endif
|
||||
|
||||
#elif defined __powerpc__ && defined __powerpc64__
|
||||
# else
|
||||
|
||||
/* PowerPC64 Local Exec TLS access. */
|
||||
# define TLS_LE(x) \
|
||||
({ int * __result; \
|
||||
asm ( \
|
||||
" addis %0,13," #x "@tprel@ha\n" \
|
||||
" addi %0,%0," #x "@tprel@l\n" \
|
||||
: "=b" (__result) ); \
|
||||
__result; \
|
||||
# define TLS_LE(x) \
|
||||
({ int * __result; \
|
||||
asm ("addis %0,13," #x "@tprel@ha\n\t" \
|
||||
"addi %0,%0," #x "@tprel@l" \
|
||||
: "=b" (__result) ); \
|
||||
__result; \
|
||||
})
|
||||
/* PowerPC64 Initial Exec TLS access. */
|
||||
# define TLS_IE(x) \
|
||||
({ int * __result; \
|
||||
asm ( \
|
||||
" ld %0," #x "@got@tprel(2)\n" \
|
||||
" add %0,%0," #x "@tls\n" \
|
||||
: "=b" (__result) ); \
|
||||
__result; \
|
||||
# define TLS_IE(x) \
|
||||
({ int * __result; \
|
||||
asm ("ld %0," #x "@got@tprel(2)\n\t" \
|
||||
"add %0,%0," #x "@tls" \
|
||||
: "=r" (__result) ); \
|
||||
__result; \
|
||||
})
|
||||
# ifdef HAVE_ASM_GLOBAL_DOT_NAME
|
||||
# define __TLS_GET_ADDR ".__tls_get_addr"
|
||||
# else
|
||||
# define __TLS_GET_ADDR "__tls_get_addr"
|
||||
# endif
|
||||
# ifdef HAVE_ASM_GLOBAL_DOT_NAME
|
||||
# define __TLS_GET_ADDR ".__tls_get_addr"
|
||||
# else
|
||||
# define __TLS_GET_ADDR "__tls_get_addr"
|
||||
# endif
|
||||
/* PowerPC64 Local Dynamic TLS access. */
|
||||
# define TLS_LD(x) \
|
||||
({ int * __result; \
|
||||
asm ( \
|
||||
" addi 3,2," #x "@got@tlsld\n" \
|
||||
" bl " __TLS_GET_ADDR "\n" \
|
||||
" nop \n" \
|
||||
" addis %0,3," #x "@dtprel@ha\n" \
|
||||
" addi %0,%0," #x "@dtprel@l\n" \
|
||||
: "=b" (__result) : \
|
||||
: "0", "3", "4", "5", "6", "7", \
|
||||
"8", "9", "10", "11", "12", \
|
||||
"lr", "ctr", \
|
||||
"cr0", "cr1", "cr5", "cr6", "cr7"); \
|
||||
__result; \
|
||||
# define TLS_LD(x) \
|
||||
({ int * __result; \
|
||||
asm ("addi 3,2," #x "@got@tlsld\n\t" \
|
||||
"bl " __TLS_GET_ADDR "\n\t" \
|
||||
"nop \n\t" \
|
||||
"addis %0,3," #x "@dtprel@ha\n\t" \
|
||||
"addi %0,%0," #x "@dtprel@l" \
|
||||
: "=b" (__result) : \
|
||||
: "3", __TLS_CALL_CLOBBERS); \
|
||||
__result; \
|
||||
})
|
||||
/* PowerPC64 General Dynamic TLS access. */
|
||||
# define TLS_GD(x) \
|
||||
({ int * __result; \
|
||||
asm ( \
|
||||
" addi 3,2," #x "@got@tlsgd\n" \
|
||||
" bl " __TLS_GET_ADDR "\n" \
|
||||
" nop \n" \
|
||||
" mr %0,3\n" \
|
||||
: "=b" (__result) : \
|
||||
: "0", "3", "4", "5", "6", "7", \
|
||||
"8", "9", "10", "11", "12", \
|
||||
"lr", "ctr", \
|
||||
"cr0", "cr1", "cr5", "cr6", "cr7"); \
|
||||
__result; \
|
||||
# define TLS_GD(x) \
|
||||
({ register int *__result __asm__ ("r3"); \
|
||||
asm ("addi 3,2," #x "@got@tlsgd\n\t" \
|
||||
"bl " __TLS_GET_ADDR "\n\t" \
|
||||
"nop " \
|
||||
: "=r" (__result) : \
|
||||
: __TLS_CALL_CLOBBERS); \
|
||||
__result; \
|
||||
})
|
||||
# endif
|
||||
|
||||
#elif !defined TLS_LE || !defined TLS_IE \
|
||||
|| !defined TLS_LD || !defined TLS_GD
|
||||
|
||||
Loading…
Reference in New Issue
Block a user