aboutsummaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-10-02 06:22:02 +0000
committerUlrich Drepper <drepper@redhat.com>2002-10-02 06:22:02 +0000
commitaa298c0874c545acf0fc40f8d544cb96f0270990 (patch)
tree6c96da4360d92f1976c4d952d4db77f0235b02e8 /elf
parent0674eb08eee7e4f8c9c31877b9579e7ab7a23f72 (diff)
downloadglibc-aa298c0874c545acf0fc40f8d544cb96f0270990.tar
glibc-aa298c0874c545acf0fc40f8d544cb96f0270990.tar.gz
glibc-aa298c0874c545acf0fc40f8d544cb96f0270990.tar.bz2
glibc-aa298c0874c545acf0fc40f8d544cb96f0270990.zip
Update.
2002-10-02 Kaz Kojima <kkojima@rr.iij4u.or.jp> * sysdeps/sh/pt-machine.h: Make C code ifndef'ed with __ASSEMBLER__. * sysdeps/sh/tls.h: Likewise. * sysdeps/unix/sysv/linux/sh/smp.h: New file.
Diffstat (limited to 'elf')
-rw-r--r--elf/elf.h28
-rw-r--r--elf/tls-macros.h6
2 files changed, 15 insertions, 19 deletions
diff --git a/elf/elf.h b/elf/elf.h
index 2d79be2f65..416a7959ea 100644
--- a/elf/elf.h
+++ b/elf/elf.h
@@ -2201,21 +2201,19 @@ 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_TLS_GD_32 144
+#define R_SH_TLS_LD_32 145
+#define R_SH_TLS_LDO_32 146
+#define R_SH_TLS_IE_32 147
+#define R_SH_TLS_LE_32 148
+#define R_SH_TLS_DTPMOD32 149
+#define R_SH_TLS_DTPOFF32 150
+#define R_SH_TLS_TPOFF32 151
+#define R_SH_TLS_GD_MOV 152
+#define R_SH_TLS_LDM_MOV 153
+#define R_SH_TLS_LDO_MOV 154
+#define R_SH_TLS_IE_MOV 155
+#define R_SH_TLS_LE_MOV 156
#define R_SH_GOT32 160
#define R_SH_PLT32 161
#define R_SH_COPY 162
diff --git a/elf/tls-macros.h b/elf/tls-macros.h
index 6497903a9b..1f9cf4448a 100644
--- a/elf/tls-macros.h
+++ b/elf/tls-macros.h
@@ -166,12 +166,11 @@
"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" \
+ " add r12,r4\n\t" \
"mov.l 3f,%0\n\t" \
"bra 4f\n\t" \
" add r0,%0\n\t" \
@@ -191,12 +190,11 @@
"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" \
+ " add r12,r4\n\t" \
"bra 3f\n\t" \
" mov r0,%0\n\t" \
".align 2\n\t" \