[src/trunk]: src/libexec/ld.elf_so/arch Repair a slight biff I made earlier -...

[mycroft <mycroft%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cae799094a56
branches:  trunk
changeset: 536065:cae799094a56
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Fri Sep 06 02:01:39 2002 +0000

description:
Repair a slight biff I made earlier -- do not exit the loop in
_rtld_relocate_nonplt_objects() early.

diffstat:

 libexec/ld.elf_so/arch/sparc/mdreloc.c   |  10 +++++-----
 libexec/ld.elf_so/arch/sparc64/mdreloc.c |  10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diffs (74 lines):

diff -r 145f69fdf0b4 -r cae799094a56 libexec/ld.elf_so/arch/sparc/mdreloc.c
--- a/libexec/ld.elf_so/arch/sparc/mdreloc.c    Thu Sep 05 23:02:18 2002 +0000
+++ b/libexec/ld.elf_so/arch/sparc/mdreloc.c    Fri Sep 06 02:01:39 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mdreloc.c,v 1.16 2002/09/05 21:31:35 mycroft Exp $     */
+/*     $NetBSD: mdreloc.c,v 1.17 2002/09/06 02:01:39 mycroft Exp $     */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -258,15 +258,15 @@
 
                type = ELF_R_TYPE(rela->r_info);
                if (type == R_TYPE(NONE))
-                       return (0);
+                       continue;
 
                /* We do JMP_SLOTs in relocate_plt_object() below */
                if (type == R_TYPE(JMP_SLOT))
-                       return (0);
+                       continue;
 
                /* COPY relocs are also handled elsewhere */
                if (type == R_TYPE(COPY))
-                       return (0);
+                       continue;
 
                /*
                 * We use the fact that relocation types are an `enum'
@@ -283,7 +283,7 @@
                 */
                if (!dodebug && type == R_TYPE(RELATIVE)) {
                        *where += (Elf_Addr)(obj->relocbase + value);
-                       return (0);
+                       continue;
                }
 
                if (RELOC_RESOLVE_SYMBOL(type)) {
diff -r 145f69fdf0b4 -r cae799094a56 libexec/ld.elf_so/arch/sparc64/mdreloc.c
--- a/libexec/ld.elf_so/arch/sparc64/mdreloc.c  Thu Sep 05 23:02:18 2002 +0000
+++ b/libexec/ld.elf_so/arch/sparc64/mdreloc.c  Fri Sep 06 02:01:39 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mdreloc.c,v 1.11 2002/09/05 21:31:35 mycroft Exp $     */
+/*     $NetBSD: mdreloc.c,v 1.12 2002/09/06 02:01:40 mycroft Exp $     */
 
 /*-
  * Copyright (c) 2000 Eduardo Horvath.
@@ -540,15 +540,15 @@
 
                type = ELF_R_TYPE(rela->r_info);
                if (type == R_TYPE(NONE))
-                       return (0);
+                       continue;
 
                /* We do JMP_SLOTs in relocate_plt_object() below */
                if (type == R_TYPE(JMP_SLOT))
-                       return (0);
+                       continue;
 
                /* COPY relocs are also handled elsewhere */
                if (type == R_TYPE(COPY))
-                       return (0);
+                       continue;
 
                /*
                 * We use the fact that relocation types are an `enum'
@@ -566,7 +566,7 @@
                if (!dodebug && type == R_TYPE(RELATIVE)) {
                        /* XXXX -- apparently we ignore the preexisting value */
                        *where = (Elf_Addr)(obj->relocbase + value);
-                       return (0);
+                       continue;
                }
 
                if (RELOC_RESOLVE_SYMBOL(type)) {