summaryrefslogtreecommitdiff
path: root/ldso
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-06-25 08:47:43 +0000
committerMike Frysinger <vapier@gentoo.org>2005-06-25 08:47:43 +0000
commita534ea55c565618ea1670ee2be6ec39b648f8e36 (patch)
treefc4262db3ea82258a056743853799732a2d49161 /ldso
parentea3903eb7b862092d948edf8b568e8b57b06758f (diff)
move _dl_if_debug_dprint() to shared ldso header
Diffstat (limited to 'ldso')
-rw-r--r--ldso/include/ldso.h10
-rw-r--r--ldso/ldso/dl-elf.c10
2 files changed, 7 insertions, 13 deletions
diff --git a/ldso/include/ldso.h b/ldso/include/ldso.h
index ba28baa3e..71cdd5ca8 100644
--- a/ldso/include/ldso.h
+++ b/ldso/include/ldso.h
@@ -55,8 +55,14 @@ extern char *_dl_debug_detail;
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_dprintf(int, const char *, ...);
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_ */
-
diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c
index 5802a9cdd..3d12b6154 100644
--- a/ldso/ldso/dl-elf.c
+++ b/ldso/ldso/dl-elf.c
@@ -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;