From 1c51afccc22806e116ba077dedcb79585b847fcf Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Fri, 25 Jan 2002 01:00:44 +0000 Subject: Fix up all non-x86 arches to cope with the latest ldso update -Erik --- ldso/ldso/arm/elfinterp.c | 8 -------- ldso/ldso/m68k/elfinterp.c | 11 ++--------- ldso/ldso/powerpc/elfinterp.c | 7 ------- ldso/ldso/sparc/elfinterp.c | 7 ------- 4 files changed, 2 insertions(+), 31 deletions(-) diff --git a/ldso/ldso/arm/elfinterp.c b/ldso/ldso/arm/elfinterp.c index d1616c5bf..77ece78bf 100644 --- a/ldso/ldso/arm/elfinterp.c +++ b/ldso/ldso/arm/elfinterp.c @@ -47,14 +47,6 @@ static char *_dl_reltypes[] = a more than adequate job of explaining everything required to get this working. */ -#include -#include -#include "linuxelf.h" -#include "ld_hash.h" -#include "ld_syscall.h" -#include "ld_string.h" - -extern char *_dl_progname; extern int _dl_linux_resolve(void); diff --git a/ldso/ldso/m68k/elfinterp.c b/ldso/ldso/m68k/elfinterp.c index f5554f6a1..50f58d179 100644 --- a/ldso/ldso/m68k/elfinterp.c +++ b/ldso/ldso/m68k/elfinterp.c @@ -48,16 +48,9 @@ static char *_dl_reltypes[] = a more than adequate job of explaining everything required to get this working. */ -#include "linuxelf.h" -#include "ld_hash.h" -#include "ld_syscall.h" -#include "ld_string.h" -extern char *_dl_progname; - -unsigned int -_dl_linux_resolver (int dummy1, int dummy2, - struct elf_resolve *tpnt, int reloc_entry) +unsigned int _dl_linux_resolver (int dummy1, int dummy2, + struct elf_resolve *tpnt, int reloc_entry) { int reloc_type; Elf32_Rela *this_reloc; diff --git a/ldso/ldso/powerpc/elfinterp.c b/ldso/ldso/powerpc/elfinterp.c index 4da5d9d98..33be8c545 100644 --- a/ldso/ldso/powerpc/elfinterp.c +++ b/ldso/ldso/powerpc/elfinterp.c @@ -48,11 +48,6 @@ static char *_dl_reltypes[] = a more than adequate job of explaining everything required to get this working. */ -#include "linuxelf.h" -#include "ld_hash.h" -#include "ld_syscall.h" -#include "ld_string.h" -#include #ifdef DEBUG static void debug_sym(Elf32_Sym *symtab,char *strtab,int symtab_index); @@ -64,8 +59,6 @@ static void debug_reloc(ELF_RELOC *rpnt); #define DPRINTF(fmt,args...) #endif -extern char *_dl_progname; - extern int _dl_linux_resolve(void); void _dl_init_got(unsigned long *plt,struct elf_resolve *tpnt) diff --git a/ldso/ldso/sparc/elfinterp.c b/ldso/ldso/sparc/elfinterp.c index cd34babf6..84f20f480 100644 --- a/ldso/ldso/sparc/elfinterp.c +++ b/ldso/ldso/sparc/elfinterp.c @@ -41,13 +41,6 @@ an ELF sharable library or a linux style of shared library. */ a more than adequate job of explaining everything required to get this working. */ -#include "linuxelf.h" -#include "ld_hash.h" -#include "ld_syscall.h" -#include "ld_string.h" - -extern char *_dl_progname; - extern _dl_linux_resolve(void); unsigned int _dl_linux_resolver(unsigned int reloc_entry, unsigned int * plt) -- cgit v1.2.3