[src/trunk]: src/libexec/ld.elf_so Reduce header pollution for mdreloc.c. Mak...

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

details:   https://anonhg.NetBSD.org/src/rev/c42b8c218987
branches:  trunk
changeset: 756871:c42b8c218987
user:      joerg <joerg%NetBSD.org@localhost>
date:      Fri Aug 06 16:33:17 2010 +0000

description:
Reduce header pollution for mdreloc.c. Make Obj_Entry argument of
_rtld_relocate_nonplt_objects non-const in preparation for TLS support.

diffstat:

 libexec/ld.elf_so/arch/alpha/alpha_reloc.c |  7 +++----
 libexec/ld.elf_so/arch/arm/mdreloc.c       |  8 +++-----
 libexec/ld.elf_so/arch/hppa/hppa_reloc.c   |  7 +++----
 libexec/ld.elf_so/arch/i386/mdreloc.c      |  7 +++----
 libexec/ld.elf_so/arch/m68k/mdreloc.c      |  9 ++++-----
 libexec/ld.elf_so/arch/mips/mips_reloc.c   |  7 +++----
 libexec/ld.elf_so/arch/powerpc/ppc_reloc.c |  7 +++----
 libexec/ld.elf_so/arch/sh3/mdreloc.c       |  9 ++++-----
 libexec/ld.elf_so/arch/sparc/mdreloc.c     |  7 +++----
 libexec/ld.elf_so/arch/sparc64/mdreloc.c   |  7 +++----
 libexec/ld.elf_so/arch/vax/mdreloc.c       |  9 ++++-----
 libexec/ld.elf_so/arch/x86_64/mdreloc.c    |  6 +++---
 libexec/ld.elf_so/rtld.h                   |  5 +++--
 13 files changed, 42 insertions(+), 53 deletions(-)

diffs (truncated from 406 to 300 lines):

diff -r 8cfb925814c9 -r c42b8c218987 libexec/ld.elf_so/arch/alpha/alpha_reloc.c
--- a/libexec/ld.elf_so/arch/alpha/alpha_reloc.c        Fri Aug 06 16:17:13 2010 +0000
+++ b/libexec/ld.elf_so/arch/alpha/alpha_reloc.c        Fri Aug 06 16:33:17 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: alpha_reloc.c,v 1.36 2010/01/14 11:58:31 skrll Exp $   */
+/*     $NetBSD: alpha_reloc.c,v 1.37 2010/08/06 16:33:17 joerg Exp $   */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -62,11 +62,10 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: alpha_reloc.c,v 1.36 2010/01/14 11:58:31 skrll Exp $");
+__RCSID("$NetBSD: alpha_reloc.c,v 1.37 2010/08/06 16:33:17 joerg Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <string.h>
 
 #include "rtld.h"
@@ -196,7 +195,7 @@
 }
 
 int
-_rtld_relocate_nonplt_objects(const Obj_Entry *obj)
+_rtld_relocate_nonplt_objects(Obj_Entry *obj)
 {
        const Elf_Rela *rela;
        Elf_Addr target = -1;
diff -r 8cfb925814c9 -r c42b8c218987 libexec/ld.elf_so/arch/arm/mdreloc.c
--- a/libexec/ld.elf_so/arch/arm/mdreloc.c      Fri Aug 06 16:17:13 2010 +0000
+++ b/libexec/ld.elf_so/arch/arm/mdreloc.c      Fri Aug 06 16:33:17 2010 +0000
@@ -1,13 +1,11 @@
-/*     $NetBSD: mdreloc.c,v 1.33 2010/01/14 12:12:07 skrll Exp $       */
+/*     $NetBSD: mdreloc.c,v 1.34 2010/08/06 16:33:17 joerg Exp $       */
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.33 2010/01/14 12:12:07 skrll Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.34 2010/08/06 16:33:17 joerg Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
-#include <sys/stat.h>
-
 #include <string.h>
 
 #include "debug.h"
@@ -73,7 +71,7 @@
 }
 
 int
-_rtld_relocate_nonplt_objects(const Obj_Entry *obj)
+_rtld_relocate_nonplt_objects(Obj_Entry *obj)
 {
        const Elf_Rel *rel;
 
diff -r 8cfb925814c9 -r c42b8c218987 libexec/ld.elf_so/arch/hppa/hppa_reloc.c
--- a/libexec/ld.elf_so/arch/hppa/hppa_reloc.c  Fri Aug 06 16:17:13 2010 +0000
+++ b/libexec/ld.elf_so/arch/hppa/hppa_reloc.c  Fri Aug 06 16:33:17 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hppa_reloc.c,v 1.32 2010/01/14 11:57:06 skrll Exp $    */
+/*     $NetBSD: hppa_reloc.c,v 1.33 2010/08/06 16:33:17 joerg Exp $    */
 
 /*-
  * Copyright (c) 2002, 2004 The NetBSD Foundation, Inc.
@@ -31,12 +31,11 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hppa_reloc.c,v 1.32 2010/01/14 11:57:06 skrll Exp $");
+__RCSID("$NetBSD: hppa_reloc.c,v 1.33 2010/08/06 16:33:17 joerg Exp $");
 #endif /* not lint */
 
 #include <stdlib.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/queue.h>
 
 #include <string.h>
@@ -362,7 +361,7 @@
 }
 
 int
-_rtld_relocate_nonplt_objects(const Obj_Entry *obj)
+_rtld_relocate_nonplt_objects(Obj_Entry *obj)
 {
        const Elf_Rela *rela;
 
diff -r 8cfb925814c9 -r c42b8c218987 libexec/ld.elf_so/arch/i386/mdreloc.c
--- a/libexec/ld.elf_so/arch/i386/mdreloc.c     Fri Aug 06 16:17:13 2010 +0000
+++ b/libexec/ld.elf_so/arch/i386/mdreloc.c     Fri Aug 06 16:33:17 2010 +0000
@@ -1,12 +1,11 @@
-/*     $NetBSD: mdreloc.c,v 1.31 2010/01/14 11:58:32 skrll Exp $       */
+/*     $NetBSD: mdreloc.c,v 1.32 2010/08/06 16:33:18 joerg Exp $       */
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.31 2010/01/14 11:58:32 skrll Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.32 2010/08/06 16:33:18 joerg Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
-#include <sys/stat.h>
 
 #include "debug.h"
 #include "rtld.h"
@@ -49,7 +48,7 @@
 }
 
 int
-_rtld_relocate_nonplt_objects(const Obj_Entry *obj)
+_rtld_relocate_nonplt_objects(Obj_Entry *obj)
 {
        const Elf_Rel *rel;
        Elf_Addr target = 0;
diff -r 8cfb925814c9 -r c42b8c218987 libexec/ld.elf_so/arch/m68k/mdreloc.c
--- a/libexec/ld.elf_so/arch/m68k/mdreloc.c     Fri Aug 06 16:17:13 2010 +0000
+++ b/libexec/ld.elf_so/arch/m68k/mdreloc.c     Fri Aug 06 16:33:17 2010 +0000
@@ -1,17 +1,16 @@
-/*     $NetBSD: mdreloc.c,v 1.26 2010/01/14 11:58:32 skrll Exp $       */
+/*     $NetBSD: mdreloc.c,v 1.27 2010/08/06 16:33:18 joerg Exp $       */
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.26 2010/01/14 11:58:32 skrll Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.27 2010/08/06 16:33:18 joerg Exp $");
 #endif /* not lint */
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.26 2010/01/14 11:58:32 skrll Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.27 2010/08/06 16:33:18 joerg Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
-#include <sys/stat.h>
 
 #include "debug.h"
 #include "rtld.h"
@@ -55,7 +54,7 @@
 }
 
 int
-_rtld_relocate_nonplt_objects(const Obj_Entry *obj)
+_rtld_relocate_nonplt_objects(Obj_Entry *obj)
 {
        const Elf_Rela *rela;
 
diff -r 8cfb925814c9 -r c42b8c218987 libexec/ld.elf_so/arch/mips/mips_reloc.c
--- a/libexec/ld.elf_so/arch/mips/mips_reloc.c  Fri Aug 06 16:17:13 2010 +0000
+++ b/libexec/ld.elf_so/arch/mips/mips_reloc.c  Fri Aug 06 16:33:17 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mips_reloc.c,v 1.58 2010/01/14 11:57:06 skrll Exp $    */
+/*     $NetBSD: mips_reloc.c,v 1.59 2010/08/06 16:33:18 joerg Exp $    */
 
 /*
  * Copyright 1997 Michael L. Hitch <mhitch%montana.edu@localhost>
@@ -30,11 +30,10 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mips_reloc.c,v 1.58 2010/01/14 11:57:06 skrll Exp $");
+__RCSID("$NetBSD: mips_reloc.c,v 1.59 2010/08/06 16:33:18 joerg Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <sys/endian.h>
 
 #include <stdlib.h>
@@ -223,7 +222,7 @@
 }
 
 int
-_rtld_relocate_nonplt_objects(const Obj_Entry *obj)
+_rtld_relocate_nonplt_objects(Obj_Entry *obj)
 {
        const Elf_Rel *rel;
        Elf_Addr *got = obj->pltgot;
diff -r 8cfb925814c9 -r c42b8c218987 libexec/ld.elf_so/arch/powerpc/ppc_reloc.c
--- a/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c        Fri Aug 06 16:17:13 2010 +0000
+++ b/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c        Fri Aug 06 16:33:17 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ppc_reloc.c,v 1.44 2010/01/13 20:17:22 christos Exp $  */
+/*     $NetBSD: ppc_reloc.c,v 1.45 2010/08/06 16:33:18 joerg Exp $     */
 
 /*-
  * Copyright (C) 1998  Tsubai Masanari
@@ -30,7 +30,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: ppc_reloc.c,v 1.44 2010/01/13 20:17:22 christos Exp $");
+__RCSID("$NetBSD: ppc_reloc.c,v 1.45 2010/08/06 16:33:18 joerg Exp $");
 #endif /* not lint */
 
 #include <stdarg.h>
@@ -38,7 +38,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <machine/cpu.h>
 
 #include "debug.h"
@@ -131,7 +130,7 @@
 }
 
 int
-_rtld_relocate_nonplt_objects(const Obj_Entry *obj)
+_rtld_relocate_nonplt_objects(Obj_Entry *obj)
 {
        const Elf_Rela *rela;
 
diff -r 8cfb925814c9 -r c42b8c218987 libexec/ld.elf_so/arch/sh3/mdreloc.c
--- a/libexec/ld.elf_so/arch/sh3/mdreloc.c      Fri Aug 06 16:17:13 2010 +0000
+++ b/libexec/ld.elf_so/arch/sh3/mdreloc.c      Fri Aug 06 16:33:17 2010 +0000
@@ -1,17 +1,16 @@
-/*     $NetBSD: mdreloc.c,v 1.27 2010/01/13 20:17:22 christos Exp $    */
+/*     $NetBSD: mdreloc.c,v 1.28 2010/08/06 16:33:18 joerg Exp $       */
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.27 2010/01/13 20:17:22 christos Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.28 2010/08/06 16:33:18 joerg Exp $");
 #endif /* not lint */
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.27 2010/01/13 20:17:22 christos Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.28 2010/08/06 16:33:18 joerg Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
-#include <sys/stat.h>
 
 #include "debug.h"
 #include "rtld.h"
@@ -54,7 +53,7 @@
 }
 
 int
-_rtld_relocate_nonplt_objects(const Obj_Entry *obj)
+_rtld_relocate_nonplt_objects(Obj_Entry *obj)
 {
        const Elf_Rela *rela;
 
diff -r 8cfb925814c9 -r c42b8c218987 libexec/ld.elf_so/arch/sparc/mdreloc.c
--- a/libexec/ld.elf_so/arch/sparc/mdreloc.c    Fri Aug 06 16:17:13 2010 +0000
+++ b/libexec/ld.elf_so/arch/sparc/mdreloc.c    Fri Aug 06 16:33:17 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mdreloc.c,v 1.43 2010/01/13 20:17:22 christos Exp $    */
+/*     $NetBSD: mdreloc.c,v 1.44 2010/08/06 16:33:18 joerg Exp $       */
 
 /*-
  * Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.43 2010/01/13 20:17:22 christos Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.44 2010/08/06 16:33:18 joerg Exp $");
 #endif /* not lint */
 
 #include <errno.h>
@@ -39,7 +39,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/stat.h>
 
 #include "rtldenv.h"
 #include "debug.h"
@@ -181,7 +180,7 @@
 }
 
 int
-_rtld_relocate_nonplt_objects(const Obj_Entry *obj)
+_rtld_relocate_nonplt_objects(Obj_Entry *obj)
 {
        const Elf_Rela *rela;
 
diff -r 8cfb925814c9 -r c42b8c218987 libexec/ld.elf_so/arch/sparc64/mdreloc.c
--- a/libexec/ld.elf_so/arch/sparc64/mdreloc.c  Fri Aug 06 16:17:13 2010 +0000
+++ b/libexec/ld.elf_so/arch/sparc64/mdreloc.c  Fri Aug 06 16:33:17 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mdreloc.c,v 1.46 2010/01/13 20:17:22 christos Exp $    */
+/*     $NetBSD: mdreloc.c,v 1.47 2010/08/06 16:33:18 joerg Exp $       */
 
 /*-
  * Copyright (c) 2000 Eduardo Horvath.
@@ -32,7 +32,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.46 2010/01/13 20:17:22 christos Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.47 2010/08/06 16:33:18 joerg Exp $");