[git commit branch/future] ldso: fix compilation for !LD_DEBUG
Bernhard Reutner-Fischer
rep.dot.nop at gmail.com
Thu Feb 9 09:02:53 UTC 2012
commit: http://git.uclibc.org/uClibc/commit/?id=38c29ff31994f1ae04e8f904abc8f68e31d52d33
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/future
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
ldso/ldso/arm/elfinterp.c | 4 ++--
ldso/ldso/m68k/elfinterp.c | 5 ++++-
ldso/ldso/sparc/elfinterp.c | 5 ++++-
ldso/ldso/x86_64/elfinterp.c | 5 ++++-
4 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/ldso/ldso/arm/elfinterp.c b/ldso/ldso/arm/elfinterp.c
index 707b317..cf70ccf 100644
--- a/ldso/ldso/arm/elfinterp.c
+++ b/ldso/ldso/arm/elfinterp.c
@@ -77,9 +77,9 @@ unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
_dl_exit(1);
}
#if defined (__SUPPORT_LD_DEBUG__)
-#if !defined __SUPPORT_LD_DEBUG_EARLY__
+# if !defined __SUPPORT_LD_DEBUG_EARLY__
if ((unsigned long) got_addr < 0x40000000)
-#endif
+# endif
{
if (_dl_debug_bindings)
{
diff --git a/ldso/ldso/m68k/elfinterp.c b/ldso/ldso/m68k/elfinterp.c
index 3dfd50e..88dc956 100644
--- a/ldso/ldso/m68k/elfinterp.c
+++ b/ldso/ldso/m68k/elfinterp.c
@@ -237,8 +237,11 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
_dl_memcpy ((void *) reloc_addr,
(void *) symbol_addr,
sym_ref.sym->st_size);
- } else
+ }
+#if defined (__SUPPORT_LD_DEBUG__)
+ else
_dl_dprintf(_dl_debug_file, "no symbol_addr to copy !?\n");
+#endif
break;
default:
diff --git a/ldso/ldso/sparc/elfinterp.c b/ldso/ldso/sparc/elfinterp.c
index c684378..1e6060a 100644
--- a/ldso/ldso/sparc/elfinterp.c
+++ b/ldso/ldso/sparc/elfinterp.c
@@ -271,8 +271,11 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
_dl_memcpy((char *)reloc_addr,
(char *)symbol_addr,
sym_ref.sym->st_size);
- } else
+ }
+#if defined (__SUPPORT_LD_DEBUG__)
+ else
_dl_dprintf(_dl_debug_file, "no symbol_addr to copy !?\n");
+#endif
break;
#if defined USE_TLS && USE_TLS
case R_SPARC_TLS_DTPMOD32:
diff --git a/ldso/ldso/x86_64/elfinterp.c b/ldso/ldso/x86_64/elfinterp.c
index efe9d54..0d87031 100644
--- a/ldso/ldso/x86_64/elfinterp.c
+++ b/ldso/ldso/x86_64/elfinterp.c
@@ -264,8 +264,11 @@ _dl_do_reloc(struct elf_resolve *tpnt, struct dyn_elf *scope,
_dl_memcpy((char *)reloc_addr,
(char *)symbol_addr,
sym_ref.sym->st_size);
- } else
+ }
+#if defined (__SUPPORT_LD_DEBUG__)
+ else
_dl_dprintf(_dl_debug_file, "no symbol_addr to copy !?\n");
+#endif
break;
default:
More information about the uClibc-cvs
mailing list