svn commit: trunk/uClibc/ldso/ldso: arm cris frv i386 mips powerpc sh sh64 etc...

psm at uclibc.org psm at uclibc.org
Mon Nov 21 15:20:33 UTC 2005


Author: psm
Date: 2005-11-21 07:20:30 -0800 (Mon, 21 Nov 2005)
New Revision: 12449

Log:
Partly undo earlier patch on vapier's request

Modified:
   trunk/uClibc/ldso/ldso/arm/elfinterp.c
   trunk/uClibc/ldso/ldso/cris/elfinterp.c
   trunk/uClibc/ldso/ldso/dl-debug.c
   trunk/uClibc/ldso/ldso/frv/elfinterp.c
   trunk/uClibc/ldso/ldso/i386/elfinterp.c
   trunk/uClibc/ldso/ldso/mips/elfinterp.c
   trunk/uClibc/ldso/ldso/powerpc/elfinterp.c
   trunk/uClibc/ldso/ldso/sh/elfinterp.c
   trunk/uClibc/ldso/ldso/sh64/elfinterp.c
   trunk/uClibc/ldso/ldso/x86_64/elfinterp.c


Changeset:
Modified: trunk/uClibc/ldso/ldso/arm/elfinterp.c
===================================================================
--- trunk/uClibc/ldso/ldso/arm/elfinterp.c	2005-11-21 14:24:54 UTC (rev 12448)
+++ trunk/uClibc/ldso/ldso/arm/elfinterp.c	2005-11-21 15:20:30 UTC (rev 12449)
@@ -130,10 +130,8 @@
 
 		symtab_index = ELF32_R_SYM(rpnt->r_info);
 
-#if defined (__SUPPORT_LD_DEBUG__)
 		debug_sym(symtab,strtab,symtab_index);
 		debug_reloc(symtab,strtab,rpnt);
-#endif
 
 		res = reloc_fnc (tpnt, scope, rpnt, symtab, strtab);
 

Modified: trunk/uClibc/ldso/ldso/cris/elfinterp.c
===================================================================
--- trunk/uClibc/ldso/ldso/cris/elfinterp.c	2005-11-21 14:24:54 UTC (rev 12448)
+++ trunk/uClibc/ldso/ldso/cris/elfinterp.c	2005-11-21 15:20:30 UTC (rev 12449)
@@ -122,10 +122,8 @@
 
 		symtab_index = ELF32_R_SYM(rpnt->r_info);
 
-#if defined (__SUPPORT_LD_DEBUG__)
 		debug_sym(symtab, strtab, symtab_index);
 		debug_reloc(symtab, strtab, rpnt);
-#endif
 
 		/* Pass over to actual relocation function. */
 		res = reloc_fnc(tpnt, scope, rpnt, symtab, strtab);

Modified: trunk/uClibc/ldso/ldso/dl-debug.c
===================================================================
--- trunk/uClibc/ldso/ldso/dl-debug.c	2005-11-21 14:24:54 UTC (rev 12448)
+++ trunk/uClibc/ldso/ldso/dl-debug.c	2005-11-21 15:20:30 UTC (rev 12449)
@@ -98,4 +98,9 @@
 	_dl_dprintf(_dl_debug_file, "\n");
 }
 
+#else
+
+#define debug_sym(symtab, strtab, symtab_index)
+#define debug_reloc(symtab, strtab, rpnt)
+
 #endif /* __SUPPORT_LD_DEBUG__ */

Modified: trunk/uClibc/ldso/ldso/frv/elfinterp.c
===================================================================
--- trunk/uClibc/ldso/ldso/frv/elfinterp.c	2005-11-21 14:24:54 UTC (rev 12448)
+++ trunk/uClibc/ldso/ldso/frv/elfinterp.c	2005-11-21 15:20:30 UTC (rev 12449)
@@ -136,11 +136,8 @@
 	        int res;
 	    
 		symtab_index = ELF32_R_SYM(rpnt->r_info);
-
-#if defined (__SUPPORT_LD_DEBUG__)
 		debug_sym(symtab,strtab,symtab_index);
 		debug_reloc(symtab,strtab,rpnt);
-#endif
 
 		res = reloc_fnc (tpnt, scope, rpnt, symtab, strtab);
 

Modified: trunk/uClibc/ldso/ldso/i386/elfinterp.c
===================================================================
--- trunk/uClibc/ldso/ldso/i386/elfinterp.c	2005-11-21 14:24:54 UTC (rev 12448)
+++ trunk/uClibc/ldso/ldso/i386/elfinterp.c	2005-11-21 15:20:30 UTC (rev 12449)
@@ -123,10 +123,8 @@
 
 		symtab_index = ELF32_R_SYM(rpnt->r_info);
 
-#if defined (__SUPPORT_LD_DEBUG__)
 		debug_sym(symtab, strtab, symtab_index);
 		debug_reloc(symtab, strtab, rpnt);
-#endif
 
 		res = reloc_fnc(tpnt, scope, rpnt, symtab, strtab);
 

Modified: trunk/uClibc/ldso/ldso/mips/elfinterp.c
===================================================================
--- trunk/uClibc/ldso/ldso/mips/elfinterp.c	2005-11-21 14:24:54 UTC (rev 12448)
+++ trunk/uClibc/ldso/ldso/mips/elfinterp.c	2005-11-21 15:20:30 UTC (rev 12449)
@@ -121,9 +121,9 @@
 		symtab_index = ELF32_R_SYM(rpnt->r_info);
 		symbol_addr = 0;
 
-#if defined (__SUPPORT_LD_DEBUG__)
 		debug_sym(symtab,strtab,symtab_index);
 		debug_reloc(symtab,strtab,rpnt);
+#if defined (__SUPPORT_LD_DEBUG__)
 		if (reloc_addr)
 			old_val = *reloc_addr;
 #endif

Modified: trunk/uClibc/ldso/ldso/powerpc/elfinterp.c
===================================================================
--- trunk/uClibc/ldso/ldso/powerpc/elfinterp.c	2005-11-21 14:24:54 UTC (rev 12448)
+++ trunk/uClibc/ldso/ldso/powerpc/elfinterp.c	2005-11-21 15:20:30 UTC (rev 12449)
@@ -118,10 +118,10 @@
 	strtab = (char *)tpnt->dynamic_info[DT_STRTAB];
 	symname = strtab + symtab[symtab_index].st_name;
 
-#if defined (__SUPPORT_LD_DEBUG__)
 	debug_sym(symtab,strtab,symtab_index);
 	debug_reloc(symtab,strtab,this_reloc);
 
+#if defined (__SUPPORT_LD_DEBUG__)
 	if (unlikely(ELF32_R_TYPE(this_reloc->r_info) != R_PPC_JMP_SLOT)) {
 		_dl_dprintf(2, "%s: Incorrect relocation type in jump relocation\n", _dl_progname);
 		_dl_exit(1);
@@ -365,10 +365,8 @@
 
 		symtab_index = ELF32_R_SYM(rpnt->r_info);
 
-#if defined (__SUPPORT_LD_DEBUG__)
 		debug_sym(symtab,strtab,symtab_index);
 		debug_reloc(symtab,strtab,rpnt);
-#endif
 
 		res = reloc_fnc (tpnt, scope, rpnt, symtab, strtab);
 

Modified: trunk/uClibc/ldso/ldso/sh/elfinterp.c
===================================================================
--- trunk/uClibc/ldso/ldso/sh/elfinterp.c	2005-11-21 14:24:54 UTC (rev 12448)
+++ trunk/uClibc/ldso/ldso/sh/elfinterp.c	2005-11-21 15:20:30 UTC (rev 12449)
@@ -124,11 +124,8 @@
 		int res;
 
 		symtab_index = ELF32_R_SYM(rpnt->r_info);
-
-#if defined (__SUPPORT_LD_DEBUG__)
 		debug_sym(symtab,strtab,symtab_index);
 		debug_reloc(symtab,strtab,rpnt);
-#endif
 
 		res = reloc_fnc(tpnt, scope, rpnt, symtab, strtab);
 

Modified: trunk/uClibc/ldso/ldso/sh64/elfinterp.c
===================================================================
--- trunk/uClibc/ldso/ldso/sh64/elfinterp.c	2005-11-21 14:24:54 UTC (rev 12448)
+++ trunk/uClibc/ldso/ldso/sh64/elfinterp.c	2005-11-21 15:20:30 UTC (rev 12449)
@@ -134,11 +134,8 @@
 		int res;
 
 		symtab_index = ELF32_R_SYM(rpnt->r_info);
-
-#ifdef __SUPPORT_LD_DEBUG__
 		debug_sym(symtab,strtab,symtab_index);
 		debug_reloc(symtab,strtab,rpnt);
-#endif
 
 		res = reloc_fnc (tpnt, scope, rpnt, symtab, strtab);
 		if (res == 0)

Modified: trunk/uClibc/ldso/ldso/x86_64/elfinterp.c
===================================================================
--- trunk/uClibc/ldso/ldso/x86_64/elfinterp.c	2005-11-21 14:24:54 UTC (rev 12448)
+++ trunk/uClibc/ldso/ldso/x86_64/elfinterp.c	2005-11-21 15:20:30 UTC (rev 12449)
@@ -125,10 +125,8 @@
 
 		symtab_index = ELF_R_SYM(rpnt->r_info);
 
-#if defined (__SUPPORT_LD_DEBUG__)
 		debug_sym(symtab, strtab, symtab_index);
 		debug_reloc(symtab, strtab, rpnt);
-#endif
 
 		res = reloc_fnc(tpnt, scope, rpnt, symtab, strtab);
 




More information about the uClibc-cvs mailing list