Module Name: src
Committed By: joerg
Date: Fri Aug 6 16:33:19 UTC 2010
Modified Files:
src/libexec/ld.elf_so: rtld.h
src/libexec/ld.elf_so/arch/alpha: alpha_reloc.c
src/libexec/ld.elf_so/arch/arm: mdreloc.c
src/libexec/ld.elf_so/arch/hppa: hppa_reloc.c
src/libexec/ld.elf_so/arch/i386: mdreloc.c
src/libexec/ld.elf_so/arch/m68k: mdreloc.c
src/libexec/ld.elf_so/arch/mips: mips_reloc.c
src/libexec/ld.elf_so/arch/powerpc: ppc_reloc.c
src/libexec/ld.elf_so/arch/sh3: mdreloc.c
src/libexec/ld.elf_so/arch/sparc: mdreloc.c
src/libexec/ld.elf_so/arch/sparc64: mdreloc.c
src/libexec/ld.elf_so/arch/vax: mdreloc.c
src/libexec/ld.elf_so/arch/x86_64: mdreloc.c
Log Message:
Reduce header pollution for mdreloc.c. Make Obj_Entry argument of
_rtld_relocate_nonplt_objects non-const in preparation for TLS support.
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/libexec/ld.elf_so/rtld.h
cvs rdiff -u -r1.36 -r1.37 src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c
cvs rdiff -u -r1.33 -r1.34 src/libexec/ld.elf_so/arch/arm/mdreloc.c
cvs rdiff -u -r1.32 -r1.33 src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c
cvs rdiff -u -r1.31 -r1.32 src/libexec/ld.elf_so/arch/i386/mdreloc.c
cvs rdiff -u -r1.26 -r1.27 src/libexec/ld.elf_so/arch/m68k/mdreloc.c
cvs rdiff -u -r1.58 -r1.59 src/libexec/ld.elf_so/arch/mips/mips_reloc.c
cvs rdiff -u -r1.44 -r1.45 src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c
cvs rdiff -u -r1.27 -r1.28 src/libexec/ld.elf_so/arch/sh3/mdreloc.c
cvs rdiff -u -r1.43 -r1.44 src/libexec/ld.elf_so/arch/sparc/mdreloc.c
cvs rdiff -u -r1.46 -r1.47 src/libexec/ld.elf_so/arch/sparc64/mdreloc.c
cvs rdiff -u -r1.26 -r1.27 src/libexec/ld.elf_so/arch/vax/mdreloc.c
cvs rdiff -u -r1.37 -r1.38 src/libexec/ld.elf_so/arch/x86_64/mdreloc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/rtld.h
diff -u src/libexec/ld.elf_so/rtld.h:1.91 src/libexec/ld.elf_so/rtld.h:1.92
--- src/libexec/ld.elf_so/rtld.h:1.91 Mon Apr 5 14:01:26 2010
+++ src/libexec/ld.elf_so/rtld.h Fri Aug 6 16:33:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rtld.h,v 1.91 2010/04/05 14:01:26 joerg Exp $ */
+/* $NetBSD: rtld.h,v 1.92 2010/08/06 16:33:17 joerg Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -280,7 +280,7 @@
/* reloc.c */
int _rtld_do_copy_relocations(const Obj_Entry *);
int _rtld_relocate_objects(Obj_Entry *, bool);
-int _rtld_relocate_nonplt_objects(const Obj_Entry *);
+int _rtld_relocate_nonplt_objects(Obj_Entry *);
int _rtld_relocate_plt_lazy(const Obj_Entry *);
int _rtld_relocate_plt_objects(const Obj_Entry *);
void _rtld_setup_pltgot(const Obj_Entry *);
@@ -309,6 +309,7 @@
#endif
/* map_object.c */
+struct stat;
Obj_Entry *_rtld_map_object(const char *, int, const struct stat *);
void _rtld_obj_free(Obj_Entry *);
Obj_Entry *_rtld_obj_new(void);
Index: src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c
diff -u src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c:1.36 src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c:1.37
--- src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c:1.36 Thu Jan 14 11:58:31 2010
+++ src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c Fri Aug 6 16:33:17 2010
@@ -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;
Index: src/libexec/ld.elf_so/arch/arm/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/arm/mdreloc.c:1.33 src/libexec/ld.elf_so/arch/arm/mdreloc.c:1.34
--- src/libexec/ld.elf_so/arch/arm/mdreloc.c:1.33 Thu Jan 14 12:12:07 2010
+++ src/libexec/ld.elf_so/arch/arm/mdreloc.c Fri Aug 6 16:33:17 2010
@@ -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;
Index: src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c
diff -u src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c:1.32 src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c:1.33
--- src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c:1.32 Thu Jan 14 11:57:06 2010
+++ src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c Fri Aug 6 16:33:17 2010
@@ -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;
Index: src/libexec/ld.elf_so/arch/i386/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/i386/mdreloc.c:1.31 src/libexec/ld.elf_so/arch/i386/mdreloc.c:1.32
--- src/libexec/ld.elf_so/arch/i386/mdreloc.c:1.31 Thu Jan 14 11:58:32 2010
+++ src/libexec/ld.elf_so/arch/i386/mdreloc.c Fri Aug 6 16:33:18 2010
@@ -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;
Index: src/libexec/ld.elf_so/arch/m68k/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/m68k/mdreloc.c:1.26 src/libexec/ld.elf_so/arch/m68k/mdreloc.c:1.27
--- src/libexec/ld.elf_so/arch/m68k/mdreloc.c:1.26 Thu Jan 14 11:58:32 2010
+++ src/libexec/ld.elf_so/arch/m68k/mdreloc.c Fri Aug 6 16:33:18 2010
@@ -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;
Index: src/libexec/ld.elf_so/arch/mips/mips_reloc.c
diff -u src/libexec/ld.elf_so/arch/mips/mips_reloc.c:1.58 src/libexec/ld.elf_so/arch/mips/mips_reloc.c:1.59
--- src/libexec/ld.elf_so/arch/mips/mips_reloc.c:1.58 Thu Jan 14 11:57:06 2010
+++ src/libexec/ld.elf_so/arch/mips/mips_reloc.c Fri Aug 6 16:33:18 2010
@@ -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 <[email protected]>
@@ -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;
Index: src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c
diff -u src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c:1.44 src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c:1.45
--- src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c:1.44 Wed Jan 13 20:17:22 2010
+++ src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c Fri Aug 6 16:33:18 2010
@@ -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;
Index: src/libexec/ld.elf_so/arch/sh3/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/sh3/mdreloc.c:1.27 src/libexec/ld.elf_so/arch/sh3/mdreloc.c:1.28
--- src/libexec/ld.elf_so/arch/sh3/mdreloc.c:1.27 Wed Jan 13 20:17:22 2010
+++ src/libexec/ld.elf_so/arch/sh3/mdreloc.c Fri Aug 6 16:33:18 2010
@@ -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;
Index: src/libexec/ld.elf_so/arch/sparc/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/sparc/mdreloc.c:1.43 src/libexec/ld.elf_so/arch/sparc/mdreloc.c:1.44
--- src/libexec/ld.elf_so/arch/sparc/mdreloc.c:1.43 Wed Jan 13 20:17:22 2010
+++ src/libexec/ld.elf_so/arch/sparc/mdreloc.c Fri Aug 6 16:33:18 2010
@@ -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;
Index: src/libexec/ld.elf_so/arch/sparc64/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/sparc64/mdreloc.c:1.46 src/libexec/ld.elf_so/arch/sparc64/mdreloc.c:1.47
--- src/libexec/ld.elf_so/arch/sparc64/mdreloc.c:1.46 Wed Jan 13 20:17:22 2010
+++ src/libexec/ld.elf_so/arch/sparc64/mdreloc.c Fri Aug 6 16:33:18 2010
@@ -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 $");
#endif /* not lint */
#include <errno.h>
@@ -40,7 +40,6 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <sys/stat.h>
#include "rtldenv.h"
#include "debug.h"
@@ -297,7 +296,7 @@
}
int
-_rtld_relocate_nonplt_objects(const Obj_Entry *obj)
+_rtld_relocate_nonplt_objects(Obj_Entry *obj)
{
const Elf_Rela *rela;
const Elf_Sym *def = NULL;
Index: src/libexec/ld.elf_so/arch/vax/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/vax/mdreloc.c:1.26 src/libexec/ld.elf_so/arch/vax/mdreloc.c:1.27
--- src/libexec/ld.elf_so/arch/vax/mdreloc.c:1.26 Wed Jan 13 20:17:23 2010
+++ src/libexec/ld.elf_so/arch/vax/mdreloc.c Fri Aug 6 16:33:19 2010
@@ -1,17 +1,16 @@
-/* $NetBSD: mdreloc.c,v 1.26 2010/01/13 20:17:23 christos Exp $ */
+/* $NetBSD: mdreloc.c,v 1.27 2010/08/06 16:33:19 joerg Exp $ */
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.26 2010/01/13 20:17:23 christos Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.27 2010/08/06 16:33:19 joerg Exp $");
#endif /* not lint */
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.26 2010/01/13 20:17:23 christos Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.27 2010/08/06 16:33:19 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;
Index: src/libexec/ld.elf_so/arch/x86_64/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/x86_64/mdreloc.c:1.37 src/libexec/ld.elf_so/arch/x86_64/mdreloc.c:1.38
--- src/libexec/ld.elf_so/arch/x86_64/mdreloc.c:1.37 Thu Jan 14 12:14:49 2010
+++ src/libexec/ld.elf_so/arch/x86_64/mdreloc.c Fri Aug 6 16:33:19 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mdreloc.c,v 1.37 2010/01/14 12:14:49 skrll Exp $ */
+/* $NetBSD: mdreloc.c,v 1.38 2010/08/06 16:33:19 joerg Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -68,7 +68,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.37 2010/01/14 12:14:49 skrll Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.38 2010/08/06 16:33:19 joerg Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -127,7 +127,7 @@
}
int
-_rtld_relocate_nonplt_objects(const Obj_Entry *obj)
+_rtld_relocate_nonplt_objects(Obj_Entry *obj)
{
const Elf_Rela *rela;
const Elf_Sym *def = NULL;
