diff options
Diffstat (limited to 'ldso/ldso/i386')
| -rw-r--r-- | ldso/ldso/i386/boot1_arch.h | 2 | ||||
| -rw-r--r-- | ldso/ldso/i386/dl-startup.h | 2 | ||||
| -rw-r--r-- | ldso/ldso/i386/elfinterp.c | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/ldso/ldso/i386/boot1_arch.h b/ldso/ldso/i386/boot1_arch.h index cd1f016a6..bab0f8897 100644 --- a/ldso/ldso/i386/boot1_arch.h +++ b/ldso/ldso/i386/boot1_arch.h @@ -4,4 +4,4 @@ * can be done. */ -#define LD_BOOT(X) void _dl_boot (X) +#define _dl_boot2 _dl_boot diff --git a/ldso/ldso/i386/dl-startup.h b/ldso/ldso/i386/dl-startup.h index cd1f016a6..bab0f8897 100644 --- a/ldso/ldso/i386/dl-startup.h +++ b/ldso/ldso/i386/dl-startup.h @@ -4,4 +4,4 @@ * can be done. */ -#define LD_BOOT(X) void _dl_boot (X) +#define _dl_boot2 _dl_boot diff --git a/ldso/ldso/i386/elfinterp.c b/ldso/ldso/i386/elfinterp.c index 5681d2e41..867365236 100644 --- a/ldso/ldso/i386/elfinterp.c +++ b/ldso/ldso/i386/elfinterp.c @@ -29,6 +29,8 @@ * SUCH DAMAGE. */ +#include "ldso.h" + #if defined (__SUPPORT_LD_DEBUG__) static const char *_dl_reltypes_tab[] = { @@ -271,8 +273,8 @@ _dl_do_reloc (struct elf_resolve *tpnt,struct dyn_elf *scope, if (!symbol_addr && ELF32_ST_BIND(symtab[symtab_index].st_info) == STB_GLOBAL) { #if defined (__SUPPORT_LD_DEBUG__) - _dl_dprintf(2, "\tglobal symbol '%s' already defined in '%s'\n", - symname, tpnt->libname); + _dl_dprintf(2, "\tglobal symbol '%s' already defined in '%s', rel type: %s\n", + symname, tpnt->libname, _dl_reltypes(reloc_type)); #endif return 0; } |