浏览代码

Fix up all non-x86 arches to cope with the latest ldso update
-Erik

Eric Andersen 23 年之前
父节点
当前提交
1c51afccc2
共有 4 个文件被更改,包括 2 次插入31 次删除
  1. 0 8
      ldso/ldso/arm/elfinterp.c
  2. 2 9
      ldso/ldso/m68k/elfinterp.c
  3. 0 7
      ldso/ldso/powerpc/elfinterp.c
  4. 0 7
      ldso/ldso/sparc/elfinterp.c

+ 0 - 8
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 <sys/types.h>
-#include <errno.h>
-#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);
 

+ 2 - 9
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;

+ 0 - 7
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 <errno.h>
 
 #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)

+ 0 - 7
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)