svn commit: trunk/uClibc/ldso: include ldso
aldot at uclibc.org
aldot at uclibc.org
Fri May 30 14:35:32 UTC 2008
Author: aldot
Date: 2008-05-30 07:35:31 -0700 (Fri, 30 May 2008)
New Revision: 22123
Log:
- fix the macros rather than the callees as rightfully noted by bernds (duh!)
Modified:
trunk/uClibc/ldso/include/ldso.h
trunk/uClibc/ldso/ldso/dl-elf.c
trunk/uClibc/ldso/ldso/ldso.c
Changeset:
Modified: trunk/uClibc/ldso/include/ldso.h
===================================================================
--- trunk/uClibc/ldso/include/ldso.h 2008-05-30 14:24:54 UTC (rev 22122)
+++ trunk/uClibc/ldso/include/ldso.h 2008-05-30 14:35:31 UTC (rev 22123)
@@ -67,8 +67,8 @@
# define _dl_if_debug_dprint(fmt, args...) \
do { if (_dl_debug) __dl_debug_dprint(fmt, ## args); } while (0)
#else
-# define __dl_debug_dprint(fmt, args...)
-# define _dl_if_debug_dprint(fmt, args...)
+# define __dl_debug_dprint(fmt, args...) do {} while (0)
+# define _dl_if_debug_dprint(fmt, args...) do {} while (0)
# define _dl_debug_file 2
#endif /* __SUPPORT_LD_DEBUG__ */
@@ -92,7 +92,7 @@
#ifdef __SUPPORT_LD_DEBUG_EARLY__
# define _dl_debug_early(fmt, args...) __dl_debug_dprint(fmt, ## args)
#else
-# define _dl_debug_early(fmt, args...)
+# define _dl_debug_early(fmt, args...) do {} while (0)
#endif /* __SUPPORT_LD_DEBUG_EARLY__ */
#ifndef NULL
Modified: trunk/uClibc/ldso/ldso/dl-elf.c
===================================================================
--- trunk/uClibc/ldso/ldso/dl-elf.c 2008-05-30 14:24:54 UTC (rev 22122)
+++ trunk/uClibc/ldso/ldso/dl-elf.c 2008-05-30 14:35:31 UTC (rev 22123)
@@ -780,9 +780,9 @@
return goof;
tpnt = rpnt->dyn;
- if (!(tpnt->init_flag & RELOCS_DONE)) {
+ if (!(tpnt->init_flag & RELOCS_DONE))
_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",
_dl_progname, UNSUPPORTED_RELOC_STR);
Modified: trunk/uClibc/ldso/ldso/ldso.c
===================================================================
--- trunk/uClibc/ldso/ldso/ldso.c 2008-05-30 14:24:54 UTC (rev 22122)
+++ trunk/uClibc/ldso/ldso/ldso.c 2008-05-30 14:35:31 UTC (rev 22123)
@@ -259,10 +259,9 @@
break;
}
- if (DL_LOADADDR_BASE(app_tpnt->loadaddr)) {
+ if (DL_LOADADDR_BASE(app_tpnt->loadaddr))
_dl_debug_early("Position Independent Executable: "
"app_tpnt->loadaddr=%x\n", DL_LOADADDR_BASE(app_tpnt->loadaddr));
- }
}
/*
More information about the uClibc-cvs
mailing list