summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2002-02-17 11:58:14 +0000
committerEric Andersen <andersen@codepoet.org>2002-02-17 11:58:14 +0000
commit5ebc0e434f0c55d7b1632904e3c1ce18cff34f8f (patch)
treee0563a71d9a4fc5ffc78fbc16e169c17190e4413
parent5ede0d3f2daa450ff2518f0efb75661961b46c07 (diff)
Fix defines so debugging works as expected
-rw-r--r--ldso/ldso/i386/elfinterp.c5
-rw-r--r--ldso/ldso/m68k/elfinterp.c6
-rw-r--r--ldso/ldso/powerpc/elfinterp.c6
-rw-r--r--ldso/ldso/sparc/elfinterp.c6
4 files changed, 11 insertions, 12 deletions
diff --git a/ldso/ldso/i386/elfinterp.c b/ldso/ldso/i386/elfinterp.c
index 3b8b58af4..8cd1eb21c 100644
--- a/ldso/ldso/i386/elfinterp.c
+++ b/ldso/ldso/i386/elfinterp.c
@@ -74,7 +74,7 @@ unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
(unsigned long) tpnt->loadaddr);
got_addr = (char **) instr_addr;
-#ifdef DEBUG
+#ifdef DL_DEBUG
_dl_dprintf(2, "Resolving symbol %s\n",
strtab + symtab[symtab_index].st_name);
#endif
@@ -87,8 +87,7 @@ unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry)
_dl_progname, strtab + symtab[symtab_index].st_name);
_dl_exit(1);
};
-/* #define DEBUG_LIBRARY */
-#ifdef DEBUG_LIBRARY
+#ifdef DL_DEBUG
if ((unsigned long) got_addr < 0x40000000) {
_dl_dprintf(2, "Calling library function: %s\n",
strtab + symtab[symtab_index].st_name);
diff --git a/ldso/ldso/m68k/elfinterp.c b/ldso/ldso/m68k/elfinterp.c
index 50f58d179..167ce41dd 100644
--- a/ldso/ldso/m68k/elfinterp.c
+++ b/ldso/ldso/m68k/elfinterp.c
@@ -83,7 +83,7 @@ unsigned int _dl_linux_resolver (int dummy1, int dummy2,
instr_addr = (int) this_reloc->r_offset + (int) tpnt->loadaddr;
got_addr = (char **) instr_addr;
-#ifdef DEBUG
+#ifdef DL_DEBUG
_dl_dprintf (2, "Resolving symbol %s\n",
strtab + symtab[symtab_index].st_name);
#endif
@@ -97,8 +97,8 @@ unsigned int _dl_linux_resolver (int dummy1, int dummy2,
_dl_progname, strtab + symtab[symtab_index].st_name);
_dl_exit (1);
}
-/* #define DEBUG_LIBRARY */
-#ifdef DEBUG_LIBRARY
+/* #define DL_DEBUG */
+#ifdef DL_DEBUG
if ((unsigned int) got_addr < 0x40000000)
_dl_dprintf (2, "Calling library function: %s\n",
strtab + symtab[symtab_index].st_name);
diff --git a/ldso/ldso/powerpc/elfinterp.c b/ldso/ldso/powerpc/elfinterp.c
index 33be8c545..1935960e9 100644
--- a/ldso/ldso/powerpc/elfinterp.c
+++ b/ldso/ldso/powerpc/elfinterp.c
@@ -1,4 +1,4 @@
-//#define DEBUG
+//#define DL_DEBUG
/* Run an ELF binary on a linux system.
Copyright (C) 1993, Eric Youngdale.
@@ -49,7 +49,7 @@ static char *_dl_reltypes[] =
working. */
-#ifdef DEBUG
+#ifdef DL_DEBUG
static void debug_sym(Elf32_Sym *symtab,char *strtab,int symtab_index);
static void debug_reloc(ELF_RELOC *rpnt);
#define DPRINTF(fmt,args...) _dl_dprintf(2,fmt,args)
@@ -547,7 +547,7 @@ static void fixup_jmpslot(unsigned long reloc_addr, unsigned long targ_addr)
#endif
-#ifdef DEBUG
+#ifdef DL_DEBUG
static void debug_sym(Elf32_Sym *symtab,char *strtab,int symtab_index)
{
if(symtab_index){
diff --git a/ldso/ldso/sparc/elfinterp.c b/ldso/ldso/sparc/elfinterp.c
index 84f20f480..46754d6c7 100644
--- a/ldso/ldso/sparc/elfinterp.c
+++ b/ldso/ldso/sparc/elfinterp.c
@@ -91,7 +91,7 @@ unsigned int _dl_linux_resolver(unsigned int reloc_entry, unsigned int * plt)
_dl_dprintf(2, "symtab_index %d\n", symtab_index);
-#ifdef DEBUG
+#ifdef DL_DEBUG
_dl_dprintf(2, "Resolving symbol %s\n",
strtab + symtab[symtab_index].st_name);
#endif
@@ -104,8 +104,8 @@ unsigned int _dl_linux_resolver(unsigned int reloc_entry, unsigned int * plt)
_dl_progname, strtab + symtab[symtab_index].st_name);
_dl_exit(31);
};
-/* #define DEBUG_LIBRARY */
-#ifdef DEBUG_LIBRARY
+/* #define DL_DEBUG */
+#ifdef DL_DEBUG
if((unsigned int) got_addr < 0x40000000) {
_dl_dprintf(2, "Calling library function: %s\n",
strtab + symtab[symtab_index].st_name);