(elf_machine_runtime_setup): Return lazy.

This commit is contained in:
Ulrich Drepper 1997-05-24 22:55:45 +00:00
parent 88c3891b7a
commit 6cfad51303
4 changed files with 22 additions and 16 deletions

View File

@ -84,7 +84,7 @@ static ElfW(Addr) fixup (struct link_map *l, ElfW(Word) reloc_offset)
/* Set up the loaded object described by L so its unrelocated PLT
entries will jump to the on-demand fixup code in dl-runtime.c. */
static inline void __attribute__ ((unused))
static inline int
elf_machine_runtime_setup (struct link_map *l, int lazy)
{
Elf32_Addr *got;
@ -103,9 +103,11 @@ elf_machine_runtime_setup (struct link_map *l, int lazy)
got[2] = (Elf32_Addr) &_dl_runtime_resolve;
}
return lazy;
}
/* This code is used in dl-runtime.c to call the `fixup' function
and then redirect to the address it returns. */
/* This code is used in dl-runtime.c to call the `fixup' function
and then redirect to the address it returns. */
#ifndef PROF
# define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\
.globl _dl_runtime_resolve
@ -147,7 +149,6 @@ _dl_runtime_resolve:
#endif
/* The PLT uses Elf32_Rel relocs. */
#define elf_machine_relplt elf_machine_rel
}
/* Mask identifying addresses reserved for the user program,
where the dynamic linker should not map anything. */

View File

@ -1,5 +1,5 @@
/* Machine-dependent ELF dynamic relocation inline functions. m68k version.
Copyright (C) 1996 Free Software Foundation, Inc.
Copyright (C) 1996, 1997 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -73,7 +73,7 @@ elf_machine_load_address (void)
/* Set up the loaded object described by L so its unrelocated PLT
entries will jump to the on-demand fixup code in dl-runtime.c. */
static inline void
static inline int
elf_machine_runtime_setup (struct link_map *l, int lazy)
{
Elf32_Addr *got;
@ -94,8 +94,10 @@ elf_machine_runtime_setup (struct link_map *l, int lazy)
got[2] = (Elf32_Addr) &_dl_runtime_resolve;
}
/* This code is used in dl-runtime.c to call the `fixup' function
and then redirect to the address it returns. */
return lazy;
}
/* This code is used in dl-runtime.c to call the `fixup' function
and then redirect to the address it returns. */
#define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\
| Trampoline for _dl_runtime_resolver
.globl _dl_runtime_resolve
@ -118,7 +120,6 @@ _dl_runtime_resolve:
#define ELF_MACHINE_RUNTIME_FIXUP_ARGS long int save_a0, long int save_a1
/* The PLT uses Elf32_Rela relocs. */
#define elf_machine_relplt elf_machine_rela
}
/* Mask identifying addresses reserved for the user program,

View File

@ -1,5 +1,5 @@
/* Machine-dependent ELF dynamic relocation inline functions. MIPS version.
Copyright (C) 1996 Free Software Foundation, Inc.
Copyright (C) 1996, 1997 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Kazumoto Kojima <kkojima@info.kanagawa-u.ac.jp>.
@ -183,7 +183,7 @@ elf_machine_got_rel (struct link_map *map)
/* Set up the loaded object described by L so its stub function
will jump to the on-demand fixup code in dl-runtime.c. */
static inline void
static inline int
elf_machine_runtime_setup (struct link_map *l, int lazy)
{
ElfW(Addr) *got;
@ -213,6 +213,8 @@ elf_machine_runtime_setup (struct link_map *l, int lazy)
/* Relocate global offset table. */
elf_machine_got_rel (l);
retunr lazy;
}
/* Get link_map for this object. */

View File

@ -1,5 +1,5 @@
/* Machine-dependent ELF dynamic relocation inline functions. SPARC version.
Copyright (C) 1996 Free Software Foundation, Inc.
Copyright (C) 1996, 1997 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@ -183,7 +183,7 @@ elf_machine_lazy_rel (struct link_map *map, const Elf32_Rela *reloc)
/* Set up the loaded object described by L so its unrelocated PLT
entries will jump to the on-demand fixup code in dl-runtime.c. */
static inline void
static inline int
elf_machine_runtime_setup (struct link_map *l, int lazy)
{
Elf32_Addr *plt;
@ -216,8 +216,10 @@ elf_machine_runtime_setup (struct link_map *l, int lazy)
plt[3] = l;
}
/* This code is used in dl-runtime.c to call the `fixup' function
and then redirect to the address it returns. */
return lazy;
}
/* This code is used in dl-runtime.c to call the `fixup' function
and then redirect to the address it returns. */
#define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\
| Trampoline for _dl_runtime_resolver
.globl _dl_runtime_resolve
@ -235,9 +237,9 @@ _dl_runtime_resolve:
restore
.size _dl_runtime_resolve, . - _dl_runtime_resolve
");
/* The PLT uses Elf32_Rela relocs. */
#define elf_machine_relplt elf_machine_rela
}
/* Mask identifying addresses reserved for the user program,