From b567aa1258efe86abc8d4093aae0b663ea855783 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 8 May 2000 15:40:26 +0000 Subject: [PATCH] 2000-05-08 Jakub Jelinek * sysdeps/alpha/dl-machine.h (elf_machine_rela): Fix arguments in call to elf_machine_fixup_plt. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela): Likewise. * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Likewise. --- sysdeps/alpha/dl-machine.h | 4 ++-- sysdeps/sparc/sparc32/dl-machine.h | 6 +++--- sysdeps/sparc/sparc64/dl-machine.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sysdeps/alpha/dl-machine.h b/sysdeps/alpha/dl-machine.h index 814e355..e20493b 100644 --- a/sysdeps/alpha/dl-machine.h +++ b/sysdeps/alpha/dl-machine.h @@ -252,7 +252,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile) .end " #tramp_name) #ifndef PROF -#define ELF_MACHINE_RUNTIME_TRAMPOLINE \ +#define ELF_MACHINE_RUNTIME_TRAMPOLINE \ TRAMPOLINE_TEMPLATE (_dl_runtime_resolve, fixup, imb); \ TRAMPOLINE_TEMPLATE (_dl_runtime_profile, profile_fixup, /* nop */); #else @@ -497,7 +497,7 @@ elf_machine_rela (struct link_map *map, if (r_type == R_ALPHA_GLOB_DAT) *reloc_addr = sym_value; else if (r_type == R_ALPHA_JMP_SLOT) - elf_machine_fixup_plt (map, reloc, reloc_addr, sym_value); + elf_machine_fixup_plt (map, NULL, reloc, reloc_addr, sym_value); else if (r_type == R_ALPHA_REFQUAD) { sym_value += *reloc_addr; diff --git a/sysdeps/sparc/sparc32/dl-machine.h b/sysdeps/sparc/sparc32/dl-machine.h index 83deb16..e771676 100644 --- a/sysdeps/sparc/sparc32/dl-machine.h +++ b/sysdeps/sparc/sparc32/dl-machine.h @@ -125,7 +125,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile) /* The beginning of the PLT does: - save %sp, -64, %sp + save %sp, -64, %sp pltpc: call _dl_runtime_resolve nop .word MAP @@ -168,7 +168,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile) .previous") #ifndef PROF -#define ELF_MACHINE_RUNTIME_TRAMPOLINE \ +#define ELF_MACHINE_RUNTIME_TRAMPOLINE \ TRAMPOLINE_TEMPLATE (_dl_runtime_resolve, fixup); \ TRAMPOLINE_TEMPLATE (_dl_runtime_profile, profile_fixup); #else @@ -396,7 +396,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc, *reloc_addr = value; break; case R_SPARC_JMP_SLOT: - elf_machine_fixup_plt(map, reloc, reloc_addr, value); + elf_machine_fixup_plt(map, NULL, reloc, reloc_addr, value); break; case R_SPARC_8: *(char *) reloc_addr = value; diff --git a/sysdeps/sparc/sparc64/dl-machine.h b/sysdeps/sparc/sparc64/dl-machine.h index 4e84472..552076a 100644 --- a/sysdeps/sparc/sparc64/dl-machine.h +++ b/sysdeps/sparc/sparc64/dl-machine.h @@ -313,7 +313,7 @@ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc, break; case R_SPARC_JMP_SLOT: - elf_machine_fixup_plt(map, reloc, reloc_addr, value); + elf_machine_fixup_plt(map, NULL, reloc, reloc_addr, value); break; default: @@ -486,7 +486,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile) .previous"); #ifndef PROF -#define ELF_MACHINE_RUNTIME_TRAMPOLINE \ +#define ELF_MACHINE_RUNTIME_TRAMPOLINE \ TRAMPOLINE_TEMPLATE (_dl_runtime_resolve, fixup); \ TRAMPOLINE_TEMPLATE (_dl_runtime_profile, profile_fixup); #else -- 2.7.4