[uClibc-cvs] svn commit: trunk/uClibc/ldso/ldso

[vapier at uclibc.org]

Author: vapier
Date: 2005-07-11 16:29:29 -0600 (Mon, 11 Jul 2005)
New Revision: 10791

Log:
use the debug dprint macros to clean up readability

Modified:
   trunk/uClibc/ldso/ldso/dl-elf.c


Changeset:
Modified: trunk/uClibc/ldso/ldso/dl-elf.c
===================================================================
--- trunk/uClibc/ldso/ldso/dl-elf.c	2005-07-11 22:28:40 UTC (rev 10790)
+++ trunk/uClibc/ldso/ldso/dl-elf.c	2005-07-11 22:29:29 UTC (rev 10791)
@@ -122,10 +122,7 @@
 			    & ~(_dl_pagesize - 1));
 	ElfW(Addr) end = ((l->loadaddr + l->relro_addr + l->relro_size)
 			  & ~(_dl_pagesize - 1));
-#if defined (__SUPPORT_LD_DEBUG__)
-	if (_dl_debug)
-		_dl_dprintf(2, "RELRO protecting %s:  start:%x, end:%x\n", l->libname, start, end);
-#endif
+	_dl_if_debug_dprint("RELRO protecting %s:  start:%x, end:%x\n", l->libname, start, end);
 	if (start != end &&
 	    _dl_mprotect ((void *) start, end - start, PROT_READ) < 0) {
 		_dl_dprintf(2, "%s: cannot apply additional memory protection after relocation", l->libname);
@@ -716,6 +713,7 @@
 
 	return tpnt;
 }
+
 /* now_flag must be RTLD_NOW or zero */
 int _dl_fixup(struct dyn_elf *rpnt, int now_flag)
 {
@@ -728,10 +726,8 @@
 		goof += _dl_fixup(rpnt->next, now_flag);
 	tpnt = rpnt->dyn;
 
-#if defined (__SUPPORT_LD_DEBUG__)
 	if(!(tpnt->init_flag & RELOCS_DONE)) 
-		_dl_if_debug_dprint("\nrelocation processing: %s\n", tpnt->libname);
-#endif
+		_dl_if_debug_dprint("relocation processing: %s\n", tpnt->libname);
 
 	if (unlikely(tpnt->dynamic_info[UNSUPPORTED_RELOC_TYPE])) {
 		_dl_if_debug_dprint("%s: can't handle %s relocation records\n",
@@ -753,7 +749,7 @@
 		relative_count = tpnt->dynamic_info[DT_RELCONT_IDX];
 		if (relative_count) { /* Optimize the XX_RELATIVE relocations if possible */
 			reloc_size -= relative_count * sizeof(ELF_RELOC);
-			elf_machine_relative (tpnt->loadaddr, reloc_addr, relative_count);
+			elf_machine_relative(tpnt->loadaddr, reloc_addr, relative_count);
 			reloc_addr += relative_count * sizeof(ELF_RELOC);
 		}
 		goof += _dl_parse_relocation_information(rpnt,