diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-05-30 14:35:31 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-05-30 14:35:31 +0000 |
| commit | b732f3009a17f92c421bdd5fe9a65298dc8880b0 (patch) | |
| tree | 4b547678b6f89ea31b3a237c930696900883b3fa | |
| parent | 27289ce88425bfb7cc105280155a34bb57030164 (diff) | |
- fix the macros rather than the callees as rightfully noted by bernds (duh!)
| -rw-r--r-- | ldso/include/ldso.h | 6 | ||||
| -rw-r--r-- | ldso/ldso/dl-elf.c | 4 | ||||
| -rw-r--r-- | ldso/ldso/ldso.c | 3 |
3 files changed, 6 insertions, 7 deletions
diff --git a/ldso/include/ldso.h b/ldso/include/ldso.h index a9d3609d0..35a72fc5e 100644 --- a/ldso/include/ldso.h +++ b/ldso/include/ldso.h @@ -67,8 +67,8 @@ extern int _dl_debug_file; # 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 @@ extern int _dl_debug_file; #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 diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c index 80d059121..6c0e80544 100644 --- a/ldso/ldso/dl-elf.c +++ b/ldso/ldso/dl-elf.c @@ -780,9 +780,9 @@ int _dl_fixup(struct dyn_elf *rpnt, int now_flag) 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); diff --git a/ldso/ldso/ldso.c b/ldso/ldso/ldso.c index 737ecb3b7..df7477c72 100644 --- a/ldso/ldso/ldso.c +++ b/ldso/ldso/ldso.c @@ -259,10 +259,9 @@ void _dl_get_ready_to_run(struct elf_resolve *tpnt, DL_LOADADDR_TYPE load_addr, 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)); - } } /* |