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

vapier at uclibc.org vapier at uclibc.org
Sat Jun 25 08:47:44 UTC 2005


Author: vapier
Date: 2005-06-25 02:47:43 -0600 (Sat, 25 Jun 2005)
New Revision: 10593

Log:
move _dl_if_debug_dprint() to shared ldso header

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


Changeset:
Modified: trunk/uClibc/ldso/include/ldso.h
===================================================================
--- trunk/uClibc/ldso/include/ldso.h	2005-06-25 08:41:38 UTC (rev 10592)
+++ trunk/uClibc/ldso/include/ldso.h	2005-06-25 08:47:43 UTC (rev 10593)
@@ -55,8 +55,14 @@
 extern char *_dl_debug_nofixups;
 extern char *_dl_debug_bindings;
 extern int   _dl_debug_file;
+# define _dl_if_debug_dprint(fmt, args...) \
+	do { \
+	if (_dl_debug) \
+		_dl_dprintf(_dl_debug_file, "%s():%i: " fmt, __FUNCTION__, __LINE__, ## args); \
+	} while (0)
 #else
-#define _dl_debug_file 2
+# define _dl_if_debug_dprint(fmt, args...)
+# define _dl_debug_file 2
 #endif
 
 #ifndef NULL
@@ -72,6 +78,4 @@
 extern void _dl_get_ready_to_run(struct elf_resolve *tpnt, unsigned long load_addr,
 		Elf32_auxv_t auxvt[AT_EGID + 1], char **envp, char **argv);
 
-
 #endif /* _LDSO_H_ */
-

Modified: trunk/uClibc/ldso/ldso/dl-elf.c
===================================================================
--- trunk/uClibc/ldso/ldso/dl-elf.c	2005-06-25 08:41:38 UTC (rev 10592)
+++ trunk/uClibc/ldso/ldso/dl-elf.c	2005-06-25 08:47:43 UTC (rev 10593)
@@ -32,16 +32,6 @@
 
 #include "ldso.h"
 
-#if defined (__SUPPORT_LD_DEBUG__)
-# define _dl_if_debug_dprint(fmt, args...) \
-	do { \
-	if (_dl_debug) \
-		_dl_dprintf(_dl_debug_file, "%s():%i: " fmt, __FUNCTION__, __LINE__, ## args); \
-	} while (0)
-#else
-# define _dl_if_debug_dprint(fmt, args...)
-#endif
-
 #ifdef __LDSO_CACHE_SUPPORT__
 
 static caddr_t _dl_cache_addr = NULL;




More information about the uClibc-cvs mailing list