lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-07 06:43:00 +03:00
Code Activity

* sysdeps/mips/dl-machine.h (elf_machine_dynamic): New function.

Browse Source 
(elf_machine_got): Removed, not needed anymore. 
(ELF_MACHINE_RELOC_NOPLT): Removed. 
(ELF_MACHINE_JMP_SLOT): Added. 
(_RTLD_PROLOGUE): We use gcc, no need to check for __STDC__. 
(_RTLD_EPILOGUE): Likewise. 
(RESOLVE_GOTSYM): Use R_MIPS_REL32. 
(ELF_MACHINE_RUNTIME_TRAMPOLINE): Likewise. 
Based on patches from Maciej W. Rozycki <macro@ds2.pg.gda.pl> and 
Ralf Baechle <baechle@uni-koblenz.de>.
This commit is contained in:
Andreas Jaeger
1999-11-23 15:49:22 +00:00
parent e46309e103
commit fd96475e57
1 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
sysdeps/mips/dl-machine.h
View File

@@ -32,25 +32,19 @@
#endif #endif
#ifndef _RTLD_PROLOGUE #ifndef _RTLD_PROLOGUE
#ifdef __STDC__
# define _RTLD_PROLOGUE(entry) "\n\t.globl " #entry \ # define _RTLD_PROLOGUE(entry) "\n\t.globl " #entry \
"\n\t.ent " #entry \ "\n\t.ent " #entry \
"\n\t" #entry ":\n\t" "\n\t" #entry ":\n\t"
#else
#define _RTLD_PROLOGUE(entry) "\n\t.globl entry\n\t.ent entry\n\t entry:\n\t"
#endif
#endif #endif
#ifndef _RTLD_EPILOGUE #ifndef _RTLD_EPILOGUE
#ifdef __STDC__
# define _RTLD_EPILOGUE(entry) "\t.end " #entry "\n" # define _RTLD_EPILOGUE(entry) "\t.end " #entry "\n"
#else
#define _RTLD_EPILOGUE(entry) "\t.end entry\n"
#endif
#endif #endif
/* I have no idea what I am doing. */ /* A reloc type used for ld.so cmdline arg lookups to reject PLT entries.
#define ELF_MACHINE_RELOC_NOPLT -1 This makes no sense on MIPS but we have to define this to R_MIPS_REL32
to avoid the asserts in dl-lookup.c from blowing. */
#define ELF_MACHINE_JMP_SLOT R_MIPS_REL32
#define elf_machine_lookup_noplt_p(type) (1) #define elf_machine_lookup_noplt_p(type) (1)
#define elf_machine_lookup_noexec_p(type) (0) #define elf_machine_lookup_noexec_p(type) (0)
@@ -104,14 +98,13 @@ elf_mips_got_from_gpreg (ElfW(Addr) gpreg)
return (ElfW(Addr) *) (gpreg - 0x7ff0); return (ElfW(Addr) *) (gpreg - 0x7ff0);
} }
/* Return the run-time address of the _GLOBAL_OFFSET_TABLE_. /* Return the link-time address of _DYNAMIC. Conveniently, this is the
Must be inlined in a function which uses global data. */ first element of the GOT. This must be inlined in a function which
static inline ElfW(Addr) * uses global data. */
elf_machine_got (void) static inline ElfW(Addr)
elf_machine_dynamic (void)
{ {
ElfW(Addr) gp; register ElfW(Addr) gp __asm__ ("$28");
__asm__ __volatile__("move %0, $28\n\t" : "=r" (gp));
return elf_mips_got_from_gpreg (gp); return elf_mips_got_from_gpreg (gp);
} }
@@ -151,7 +144,7 @@ elf_machine_got_rel (struct link_map *map, int lazy)
ElfW(Addr) sym_loadaddr; \ ElfW(Addr) sym_loadaddr; \
sym_loadaddr = _dl_lookup_symbol (strtab + sym->st_name, &ref, \ sym_loadaddr = _dl_lookup_symbol (strtab + sym->st_name, &ref, \
map->l_scope, \ map->l_scope, \
map->l_name, ELF_MACHINE_RELOC_NOPLT);\ map->l_name, R_MIPS_REL32);\
(ref)? sym_loadaddr + ref->st_value: 0; \ (ref)? sym_loadaddr + ref->st_value: 0; \
}) })
@@ -361,7 +354,7 @@ __dl_runtime_resolve (ElfW(Word) sym_index, \
\ \
loadbase = _dl_lookup_symbol (strtab + definer->st_name, &definer, \ loadbase = _dl_lookup_symbol (strtab + definer->st_name, &definer, \
l->l_scope, l->l_name, \ l->l_scope, l->l_name, \
ELF_MACHINE_RELOC_NOPLT); \ R_MIPS_REL32); \
\ \
/* Apply the relocation with that value. */ \ /* Apply the relocation with that value. */ \
funcaddr = loadbase + definer->st_value; \ funcaddr = loadbase + definer->st_value; \