Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/libexec/ld.elf_so avoid nested extern



details:   https://anonhg.NetBSD.org/src/rev/e12abe32013a
branches:  trunk
changeset: 503340:e12abe32013a
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Feb 04 22:11:12 2001 +0000

description:
avoid nested extern

diffstat:

 libexec/ld.elf_so/reloc.c |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (33 lines):

diff -r 6cff6a93bd2f -r e12abe32013a libexec/ld.elf_so/reloc.c
--- a/libexec/ld.elf_so/reloc.c Sun Feb 04 22:10:11 2001 +0000
+++ b/libexec/ld.elf_so/reloc.c Sun Feb 04 22:11:12 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: reloc.c,v 1.33 2000/10/11 20:46:07 dan Exp $    */
+/*     $NetBSD: reloc.c,v 1.34 2001/02/04 22:11:12 christos Exp $       */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -148,6 +148,12 @@
 
 
 #ifndef __sparc__
+
+#if defined(__alpha__) || defined(__i386__) || defined(__m68k__)
+extern Elf_Addr  _GLOBAL_OFFSET_TABLE_[];
+extern Elf_Dyn   _DYNAMIC;
+#endif
+
 int
 _rtld_relocate_nonplt_object(obj, rela, dodebug)
        Obj_Entry *obj;
@@ -157,10 +163,6 @@
        Elf_Addr        *where = (Elf_Addr *)(obj->relocbase + rela->r_offset);
        const Elf_Sym   *def;
        const Obj_Entry *defobj;
-#if defined(__alpha__) || defined(__i386__) || defined(__m68k__)
-       extern Elf_Addr  _GLOBAL_OFFSET_TABLE_[];
-       extern Elf_Dyn   _DYNAMIC;
-#endif
 #if defined(__alpha__) || defined(__i386__) || defined(__m68k__) || \
     defined(__powerpc__) || defined(__vax__)
        Elf_Addr         tmp;



Home | Main Index | Thread Index | Old Index