[uClibc-cvs] uClibc/ldso/ldso/i386 boot1_arch.h, 1.2, 1.3 elfinterp.c, 1.28, 1.29

[Erik Andersen]

Update of /var/cvs/uClibc/ldso/ldso/i386
In directory nail:/tmp/cvs-serv6635/ldso/i386

Modified Files:
	boot1_arch.h elfinterp.c 
Log Message:
Split off the stuff that cannot use function into its own file,
to make it easier to treat it specially while not bothering the
rest of the code with the same constraints.



Index: boot1_arch.h
===================================================================
RCS file: /var/cvs/uClibc/ldso/ldso/i386/boot1_arch.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- boot1_arch.h	8 Aug 2002 14:35:31 -0000	1.2
+++ boot1_arch.h	7 Feb 2004 10:40:16 -0000	1.3
@@ -4,4 +4,4 @@
  * can be done.
  */
 
-#define LD_BOOT(X)   void _dl_boot (X)
+#define _dl_boot2 _dl_boot

Index: elfinterp.c
===================================================================
RCS file: /var/cvs/uClibc/ldso/ldso/i386/elfinterp.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- elfinterp.c	29 Jan 2004 12:18:52 -0000	1.28
+++ elfinterp.c	7 Feb 2004 10:40:16 -0000	1.29
@@ -29,6 +29,8 @@
  * SUCH DAMAGE.
  */
 
+#include "ldso.h"
+
 #if defined (__SUPPORT_LD_DEBUG__)
 static const char *_dl_reltypes_tab[] =
 {
@@ -271,8 +273,8 @@
 
 		if (!symbol_addr && ELF32_ST_BIND(symtab[symtab_index].st_info) == STB_GLOBAL) {
 #if defined (__SUPPORT_LD_DEBUG__)
-			_dl_dprintf(2, "\tglobal symbol '%s' already defined in '%s'\n",
-					symname, tpnt->libname);
+			_dl_dprintf(2, "\tglobal symbol '%s' already defined in '%s', rel type: %s\n",
+					symname, tpnt->libname, _dl_reltypes(reloc_type));
 #endif
 			return 0;
 		}