[uClibc-cvs] uClibc/ldso/ldso/mips elfinterp.c,1.8,1.9

[Erik Andersen]

Update of /var/cvs/uClibc/ldso/ldso/mips
In directory nail:/tmp/cvs-serv32512/mips

Modified Files:
	elfinterp.c 
Log Message:
Fixup a badly merged update
 -Erik


Index: elfinterp.c
===================================================================
RCS file: /var/cvs/uClibc/ldso/ldso/mips/elfinterp.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- elfinterp.c	29 Jan 2004 12:18:52 -0000	1.8
+++ elfinterp.c	5 Feb 2004 01:54:33 -0000	1.9
@@ -156,7 +156,7 @@
 	unsigned long rel_addr, unsigned long rel_size, int type)
 {
 	/* Nothing to do */
-	return 0;
+	return;
 }
 
 int _dl_parse_copy_information(struct dyn_elf *rpnt,
@@ -167,17 +167,20 @@
 }
 
 
-int _dl_parse_relocation_information(struct dyn_elf *rpnt,
+int _dl_parse_relocation_information(struct dyn_elf *xpnt,
 	unsigned long rel_addr, unsigned long rel_size, int type)
 {
 	Elf32_Sym *symtab;
 	Elf32_Rel *rpnt;
 	char *strtab;
 	unsigned long *got;
-	unsigned long *reloc_addr=NULL, old_val=0;
+	unsigned long *reloc_addr=NULL;
 	unsigned long symbol_addr;
 	int i, reloc_type, symtab_index;
-	struct elf_resolve *tpnt = rpnt->dyn;
+	struct elf_resolve *tpnt = xpnt->dyn;
+#if defined (__SUPPORT_LD_DEBUG__)
+	unsigned long old_val=0;
+#endif
 
 	/* Now parse the relocation information */
 	rel_size = rel_size / sizeof(Elf32_Rel);