aboutsummaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-04-08 21:05:48 +0000
committerUlrich Drepper <drepper@redhat.com>2002-04-08 21:05:48 +0000
commit3632a260206ba5ea8d5d6a37af54aedac774e20d (patch)
treeacb99aad042203f4bbedde299c444d4275fc28dc /elf
parent403e0597cd0cd4ba489614bf2bea72465ce899b9 (diff)
downloadglibc-3632a260206ba5ea8d5d6a37af54aedac774e20d.tar
glibc-3632a260206ba5ea8d5d6a37af54aedac774e20d.tar.gz
glibc-3632a260206ba5ea8d5d6a37af54aedac774e20d.tar.bz2
glibc-3632a260206ba5ea8d5d6a37af54aedac774e20d.zip
Update.
2002-04-08 kaz Kojima <kkojima@rr.iij4u.or.jp> * elf/elf.h: Define R_SH_TLS_xxx macros. * elf/rtld.c: Remove an extra parenthesis. * elf/tls-macros.h: Define SH version TLS_LE, TLS_IE, TLS_LD and TLS_GD macros. * sysdeps/generic/dl-tls.c: Add a missing semi-colon. * sysdeps/sh/dl-lookupcfg.h: New file. * sysdeps/sh/dl-tls.h: New file. * sysdeps/sh/dl-machine.h (elf_machine_type_class): Set ELF_RTYPE_CLASS_PLT also for the three TLS relocations. (elf_machine_rela): Handle R_SH_TLS_DTPMOD32, R_SH_TLS_DTPOFF32 and R_SH_TLS_TPOFF32 relocations.
Diffstat (limited to 'elf')
-rw-r--r--elf/elf.h15
-rw-r--r--elf/rtld.c2
-rw-r--r--elf/tls-macros.h78
3 files changed, 94 insertions, 1 deletions
diff --git a/elf/elf.h b/elf/elf.h
index 70c0d498ab..4a11a72cc4 100644
--- a/elf/elf.h
+++ b/elf/elf.h
@@ -2123,6 +2123,21 @@ typedef Elf32_Addr Elf32_Conflict;
#define R_SH_SWITCH8 33
#define R_SH_GNU_VTINHERIT 34
#define R_SH_GNU_VTENTRY 35
+#define R_SH_TLS_GD_32 128
+#define R_SH_TLS_LD_32 129
+#define R_SH_TLS_LDO_32 130
+#define R_SH_TLS_IE_32 131
+#define R_SH_TLS_LE_32 132
+#define R_SH_TLS_DTPMOD32 133
+#define R_SH_TLS_DTPOFF32 134
+#define R_SH_TLS_TPOFF32 135
+#define R_SH_TLS_GD_MOV 136
+#define R_SH_TLS_GD_CALLMOV 137
+#define R_SH_TLS_LDM_MOV 138
+#define R_SH_TLS_LDO_MOV 139
+#define R_SH_TLS_LD_CALLMOV 140
+#define R_SH_TLS_IE_MOV 141
+#define R_SH_TLS_LE_MOV 142
#define R_SH_GOT32 160
#define R_SH_PLT32 161
#define R_SH_COPY 162
diff --git a/elf/rtld.c b/elf/rtld.c
index 575e6f7ddc..968b37040a 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -303,7 +303,7 @@ _dl_start_final (void *arg, struct link_map *bootstrap_map_p,
# elif TLS_DTV_AT_TP
GL(dl_rtld_map).l_tls_offset = roundup (TLS_INIT_TCB_SIZE,
GL(dl_rtld_map).l_tls_align);
- initdtv[2].pointer = (char *) tlsblock + GL(dl_rtld_map).l_tls_offset);
+ initdtv[2].pointer = (char *) tlsblock + GL(dl_rtld_map).l_tls_offset;
# else
# error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined"
# endif
diff --git a/elf/tls-macros.h b/elf/tls-macros.h
index 26745e9e21..877581198c 100644
--- a/elf/tls-macros.h
+++ b/elf/tls-macros.h
@@ -95,6 +95,84 @@
__l; })
# endif
+#elif defined __sh__
+# define TLS_LE(x) \
+ ({ int *__l; void *__tp; \
+ asm ("stc gbr,%1\n\t" \
+ "mov.l 1f,%0\n\t" \
+ "bra 2f\n\t" \
+ " add %1,%0\n\t" \
+ ".align 2\n\t" \
+ "1: .long " #x "@tpoff\n\t" \
+ "2:" \
+ : "=r" (__l), "=r" (__tp)); \
+ __l; })
+
+# define TLS_IE(x) \
+ ({ int *__l; void *__tp; \
+ asm ("mova 0f,r0\n\t" \
+ "mov.l 0f,r12\n\t" \
+ "add r0,r12\n\t" \
+ "mov.l 1f,r0\n\t" \
+ "stc gbr,%1\n\t" \
+ "mov.l @(r0,r12),%0\n\t" \
+ "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" \
+ "2:" \
+ : "=r" (__l), "=r" (__tp) : : "r0", "r12"); \
+ __l; })
+
+# define TLS_LD(x) \
+ ({ int *__l; \
+ asm ("mova 0f,r0\n\t" \
+ "mov.l 0f,r12\n\t" \
+ "add r0,r12\n\t" \
+ "mov.l 1f,r4\n\t" \
+ "add r12,r4\n\t" \
+ "mova 2f,r0\n\t" \
+ "mov.l 2f,r1\n\t" \
+ "add r0,r1\n\t" \
+ "jsr @r1\n\t" \
+ " nop\n\t" \
+ "mov.l 3f,%0\n\t" \
+ "bra 4f\n\t" \
+ " add r0,%0\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" \
+ "3: .long " #x "@dtpoff\n\t" \
+ "4:" \
+ : "=r" (__l) : : "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", \
+ "r12", "pr", "t"); \
+ __l; })
+
+# define TLS_GD(x) \
+ ({ int *__l; \
+ asm ("mova 0f,r0\n\t" \
+ "mov.l 0f,r12\n\t" \
+ "add r0,r12\n\t" \
+ "mov.l 1f,r4\n\t" \
+ "add r12,r4\n\t" \
+ "mova 2f,r0\n\t" \
+ "mov.l 2f,r1\n\t" \
+ "add r0,r1\n\t" \
+ "jsr @r1\n\t" \
+ " nop\n\t" \
+ "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" \
+ "3:" \
+ : "=r" (__l) : : "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", \
+ "r12", "pr", "t"); \
+ __l; })
+
#else
# error "No support for this architecture so far."
#endif