diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/sh/dl-machine.h | 10 |
2 files changed, 6 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index 79f63385ca..64bae1f182 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-07-14 Kaz Kojima <kkojima@rr.iij4u.or.jp> + + * sysdeps/sh/dl-machine.h: Don't reset _dl_starting_up here. + (elf_machine_rela_relative): Remove unused valiable. + 2004-07-12 Paul Eggert <eggert@cs.ucla.edu> [BZ #263] diff --git a/sysdeps/sh/dl-machine.h b/sysdeps/sh/dl-machine.h index 834b81a4c9..d3cd73762e 100644 --- a/sysdeps/sh/dl-machine.h +++ b/sysdeps/sh/dl-machine.h @@ -364,12 +364,7 @@ _dl_start_user:\n\ add r1,r0\n\ jsr @r0\n\ nop\n\ -1: ! Clear the startup flag.\n\ - mov.l .L_dl_starting_up,r0\n\ - mov.l @(r0,r12),r0\n\ - mov #0,r2\n\ - mov.l r2,@r0\n\ - ! Pass our finalizer function to the user in r4, as per ELF ABI.\n\ +1: ! Pass our finalizer function to the user in r4, as per ELF ABI.\n\ mov.l .L_dl_fini,r0\n\ mov.l @(r0,r12),r4\n\ ! Jump to the user's entry point.\n\ @@ -384,8 +379,6 @@ _dl_start_user:\n\ .long _dl_init_internal@PLT\n\ .L_dl_loaded:\n\ .long _rtld_local@GOT\n\ -.L_dl_starting_up:\n\ - .long _dl_starting_up@GOT\n\ .L_dl_fini:\n\ .long _dl_fini@GOT\n\ .previous\n\ @@ -629,7 +622,6 @@ static inline void elf_machine_rela_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc, void *const reloc_addr_arg) { - Elf32_Addr *const reloc_addr = reloc_addr_arg; Elf32_Addr value; if (reloc->r_addend) |