From 64d3d6215afd196cd18db6bbde1189496c1a3bf4 Mon Sep 17 00:00:00 2001 From: mycroft Date: Tue, 24 Sep 2002 15:04:48 +0000 Subject: [PATCH] Ignore JMP_SLOT relocs when doing non-PLT relocations. The relalim trimming hack doesn't always work, because ld(1) sometimes puts the sections in the wrong order. --- libexec/ld.elf_so/arch/powerpc/ppc_reloc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c b/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c index de662505bc6e..c44d81138f4a 100644 --- a/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c +++ b/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c @@ -1,4 +1,4 @@ -/* $NetBSD: ppc_reloc.c,v 1.25 2002/09/12 23:11:37 mycroft Exp $ */ +/* $NetBSD: ppc_reloc.c,v 1.26 2002/09/24 15:04:48 mycroft Exp $ */ /*- * Copyright (C) 1998 Tsubai Masanari @@ -205,6 +205,9 @@ _rtld_relocate_nonplt_objects(obj, self) symnum = ELF_R_SYM(rela->r_info); switch (ELF_R_TYPE(rela->r_info)) { +#if 1 /* XXX Should not be necessary. */ + case R_TYPE(JMP_SLOT): +#endif case R_TYPE(NONE): break;