Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/libexec/ld.elf_so/reloc.c,v rcsdiff: /ftp/cvs/cvsroot/src/libexec/ld.elf_so/reloc.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.55 retrieving revision 1.56 diff -u -p -r1.55 -r1.56 --- src/libexec/ld.elf_so/reloc.c 2002/09/05 16:33:57 1.55 +++ src/libexec/ld.elf_so/reloc.c 2002/09/05 17:01:13 1.56 @@ -1,4 +1,4 @@ -/* $NetBSD: reloc.c,v 1.55 2002/09/05 16:33:57 junyoung Exp $ */ +/* $NetBSD: reloc.c,v 1.56 2002/09/05 17:01:13 mycroft Exp $ */ /* * Copyright 1996 John D. Polstra. @@ -370,8 +370,7 @@ _rtld_relocate_nonplt_object(obj, rela, #endif /* ! __alpha__ */ #endif /* __alpha__ || __i386__ || __m68k__ || __sh__ */ -#if defined(__alpha__) || defined(__hppa__) || defined(__i386__) || \ - defined(__m68k__) || defined(__sh__) +#if !defined(__mips__) case R_TYPE(COPY): /* * These are deferred until all other relocations have @@ -456,14 +455,6 @@ _rtld_relocate_nonplt_object(obj, rela, (void *)*where, defobj->path)); break; - case R_TYPE(COPY): - rdbg(dodebug, ("COPY")); - break; - - case R_TYPE(JMP_SLOT): - rdbg(dodebug, ("JMP_SLOT")); - break; - case R_TYPE(RELATIVE): /* word32 B + A */ tmp = (Elf_Addr)(obj->relocbase + rela->r_addend); if (*where != tmp) @@ -484,14 +475,6 @@ _rtld_relocate_nonplt_object(obj, rela, (void *)*where, where, defobj->path)); break; - case R_TYPE(COPY): - rdbg(dodebug, ("COPY")); - break; - - case R_TYPE(JUMP_SLOT): - rdbg(dodebug, ("JUMP_SLOT")); - break; - case R_TYPE(ABS32): /* word32 B + S + A */ def = _rtld_find_symdef(rela->r_info, obj, &defobj, false); if (def == NULL)