aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1997-05-24 02:15:43 +0000
committerUlrich Drepper <drepper@redhat.com>1997-05-24 02:15:43 +0000
commite295f619934794a482ac2d00b0e23c8b0cfebc92 (patch)
tree0338f59367d89265c8e14638037e817d5c897a10
parent76a2c2cb6a805e4040768af74abbcbb0b15d791e (diff)
downloadglibc-e295f619934794a482ac2d00b0e23c8b0cfebc92.tar.xz
glibc-e295f619934794a482ac2d00b0e23c8b0cfebc92.zip
(elf_machine_runtime_setup): Return lazy.
-rw-r--r--sysdeps/m68k/dl-machine.h10
-rw-r--r--sysdeps/mips/dl-machine.h4
2 files changed, 9 insertions, 5 deletions
diff --git a/sysdeps/m68k/dl-machine.h b/sysdeps/m68k/dl-machine.h
index e6b8f9e362..dee2a4653b 100644
--- a/sysdeps/m68k/dl-machine.h
+++ b/sysdeps/m68k/dl-machine.h
@@ -75,7 +75,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;
@@ -96,8 +96,11 @@ 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
@@ -120,7 +123,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 39a1cc8be6..422179c47d 100644
--- a/sysdeps/mips/dl-machine.h
+++ b/sysdeps/mips/dl-machine.h
@@ -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);
+
+ return lazy;
}
/* Get link_map for this object. */