qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

2002-02-01  Ulrich Drepper  <drepper@redhat.com>

	* elf/rtld.c (_dl_start): Mark as internal_function.
	* sysdeps/i386/dl-machine.h (RTLD_START): Pass parameter for _dl_start
	in register.
	(elf_machine_rel): Cleanup and minor optimization for RTLD_BOOTSTRAP.
	General pretty printing.
This commit is contained in:
Ulrich Drepper 2002-02-01 09:36:26 +00:00
parent ccdf0cab1d
commit 50746436e1
3 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2002-02-01 Ulrich Drepper <drepper@redhat.com>
* elf/rtld.c (_dl_start): Mark as internal_function.
* sysdeps/i386/dl-machine.h (RTLD_START): Pass parameter for _dl_start
in register.
(elf_machine_rel): Cleanup and minor optimization for RTLD_BOOTSTRAP.
General pretty printing.
2002-01-31 Ulrich Drepper <drepper@redhat.com> 2002-01-31 Ulrich Drepper <drepper@redhat.com>
* elf/dl-minimal.c: Define _itoa for 32-bit machines with HP timing. * elf/dl-minimal.c: Define _itoa for 32-bit machines with HP timing.

2
elf/rtld.c
View File

@ -125,7 +125,7 @@ RTLD_START
# error "sysdeps/MACHINE/dl-machine.h fails to define RTLD_START" # error "sysdeps/MACHINE/dl-machine.h fails to define RTLD_START"
#endif #endif
static ElfW(Addr) __attribute_used__ static ElfW(Addr) __attribute_used__ internal_function
_dl_start (void *arg) _dl_start (void *arg)
{ {
struct link_map bootstrap_map; struct link_map bootstrap_map;

28
sysdeps/i386/dl-machine.h
View File

@ -207,9 +207,9 @@ _dl_runtime_profile:\n\
.globl _start\n\ .globl _start\n\
.globl _dl_start_user\n\ .globl _dl_start_user\n\
_start:\n\ _start:\n\
pushl %esp\n\ # Note that _dl_start gets the parameter in %eax.\n\
movl %esp, %eax\n\
call _dl_start\n\ call _dl_start\n\
popl %ebx\n\
_dl_start_user:\n\ _dl_start_user:\n\
# Save the user entry point address in %edi.\n\ # Save the user entry point address in %edi.\n\
movl %eax, %edi\n\ movl %eax, %edi\n\
@ -252,7 +252,7 @@ _dl_start_user:\n\
"); ");
#ifndef RTLD_START_SPECIAL_INIT #ifndef RTLD_START_SPECIAL_INIT
#define RTLD_START_SPECIAL_INIT /* nothing */ # define RTLD_START_SPECIAL_INIT /* nothing */
#endif #endif
/* ELF_RTYPE_CLASS_PLT iff TYPE describes relocation of a PLT entry, so /* ELF_RTYPE_CLASS_PLT iff TYPE describes relocation of a PLT entry, so
@ -305,7 +305,7 @@ elf_machine_plt_value (struct link_map *map, const Elf32_Rel *reloc,
/* The i386 never uses Elf32_Rela relocations for the dynamic linker. /* The i386 never uses Elf32_Rela relocations for the dynamic linker.
Prelinked libraries may use Elf32_Rela though. */ Prelinked libraries may use Elf32_Rela though. */
#ifdef RTLD_BOOTSTRAP #ifdef RTLD_BOOTSTRAP
#define ELF_MACHINE_NO_RELA 1 # define ELF_MACHINE_NO_RELA 1
#endif #endif
/* Perform the relocation specified by RELOC and SYM (which is fully resolved). /* Perform the relocation specified by RELOC and SYM (which is fully resolved).
@ -342,17 +342,19 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
else else
#endif #endif
{ {
#ifndef RTLD_BOOTSTRAP #ifdef RTLD_BOOTSTRAP
Elf32_Addr value;
assert (r_type == R_386_GLOB_DAT || r_type == R_386_JMP_SLOT);
value = RESOLVE (&sym, version, r_type);
*reloc_addr = value + sym->st_value;
#else
const Elf32_Sym *const refsym = sym; const Elf32_Sym *const refsym = sym;
#endif
Elf32_Addr value = RESOLVE (&sym, version, r_type); Elf32_Addr value = RESOLVE (&sym, version, r_type);
if (sym) if (sym)
value += sym->st_value; value += sym->st_value;
#ifdef RTLD_BOOTSTRAP
assert (r_type == R_386_GLOB_DAT || r_type == R_386_JMP_SLOT);
*reloc_addr = value;
#else
switch (r_type) switch (r_type)
{ {
case R_386_GLOB_DAT: case R_386_GLOB_DAT:
@ -403,7 +405,6 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
*reloc_addr = map->l_addr + reloc->r_addend; *reloc_addr = map->l_addr + reloc->r_addend;
else if (ELF32_R_TYPE (reloc->r_info) != R_386_NONE) else if (ELF32_R_TYPE (reloc->r_info) != R_386_NONE)
{ {
/* const Elf32_Sym *const refsym = sym; */
Elf32_Addr value = RESOLVE (&sym, version, ELF32_R_TYPE (reloc->r_info)); Elf32_Addr value = RESOLVE (&sym, version, ELF32_R_TYPE (reloc->r_info));
if (sym) if (sym)
value += sym->st_value; value += sym->st_value;
@ -457,9 +458,8 @@ elf_machine_lazy_rel (struct link_map *map,
if (__builtin_expect (map->l_mach.plt, 0) == 0) if (__builtin_expect (map->l_mach.plt, 0) == 0)
*reloc_addr += l_addr; *reloc_addr += l_addr;
else else
*reloc_addr = *reloc_addr = (map->l_mach.plt
map->l_mach.plt + (((Elf32_Addr) reloc_addr) - map->l_mach.gotplt) * 4);
+ (((Elf32_Addr) reloc_addr) - map->l_mach.gotplt) * 4;
} }
else else
_dl_reloc_bad_type (map, r_type, 1); _dl_reloc_bad_type (map, r_type, 1);