diff options
author | Ulrich Drepper <drepper@redhat.com> | 1997-05-24 22:55:45 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1997-05-24 22:55:45 +0000 |
commit | 6cfad513039800286444b95b53fa2e621d5a33de (patch) | |
tree | e420e190273cb28d2f290dea52c9eef0e6762486 | |
parent | 88c3891b7aaeaf0fb33f601786db91958c09026f (diff) |
(elf_machine_runtime_setup): Return lazy.
-rw-r--r-- | sysdeps/i386/dl-machine.h | 9 | ||||
-rw-r--r-- | sysdeps/m68k/dl-machine.h | 11 | ||||
-rw-r--r-- | sysdeps/mips/dl-machine.h | 6 | ||||
-rw-r--r-- | sysdeps/sparc/dl-machine.h | 12 |
4 files changed, 22 insertions, 16 deletions
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h index c9299e9b67..aff58c8215 100644 --- a/sysdeps/i386/dl-machine.h +++ b/sysdeps/i386/dl-machine.h @@ -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. */ diff --git a/sysdeps/m68k/dl-machine.h b/sysdeps/m68k/dl-machine.h index a4b1edcdd9..41d57b59aa 100644 --- a/sysdeps/m68k/dl-machine.h +++ b/sysdeps/m68k/dl-machine.h @@ -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, diff --git a/sysdeps/mips/dl-machine.h b/sysdeps/mips/dl-machine.h index 9e80426ee3..f01dd759bd 100644 --- a/sysdeps/mips/dl-machine.h +++ b/sysdeps/mips/dl-machine.h @@ -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. */ diff --git a/sysdeps/sparc/dl-machine.h b/sysdeps/sparc/dl-machine.h index ad288e15b2..b81d306c3b 100644 --- a/sysdeps/sparc/dl-machine.h +++ b/sysdeps/sparc/dl-machine.h @@ -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, |