From a74251eb16026d7002e838bcd91a2fd830798786 Mon Sep 17 00:00:00 2001 From: Anton Kuijsten Date: Wed, 12 Jun 2013 05:58:46 +0000 Subject: [PATCH] allow ldd mmap fallback Change-Id: Ia7b8aa88c3f063c804869065719ac0cbf049b7dd --- libexec/ld.elf_so/map_object.c | 2 +- usr.bin/ldd/Makefile.elf | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libexec/ld.elf_so/map_object.c b/libexec/ld.elf_so/map_object.c index fad5e4265..5e17fad36 100644 --- a/libexec/ld.elf_so/map_object.c +++ b/libexec/ld.elf_so/map_object.c @@ -138,7 +138,7 @@ _rtld_map_object(const char *path, int fd, const struct stat *sb) (off_t)0); obj->ehdr = ehdr; if (ehdr == MAP_FAILED) { -#if defined(__minix) && defined(RTLD_LOADER) +#if defined(__minix) && (defined(RTLD_LOADER) || defined(LDD)) return _rtld_map_object_fallback(path, fd, sb); #else _rtld_error("%s: read error: %s", path, xstrerror(errno)); diff --git a/usr.bin/ldd/Makefile.elf b/usr.bin/ldd/Makefile.elf index b3ac1532f..ddacae819 100644 --- a/usr.bin/ldd/Makefile.elf +++ b/usr.bin/ldd/Makefile.elf @@ -4,7 +4,9 @@ # Expects CPPFLAGS to have ELFSIZE set, and LIB to be set. SRCS= ldd_elfxx.c -SRCS+= xmalloc.c debug.c expand.c map_object.c load.c search.c \ +SRCS+= xmalloc.c debug.c expand.c map_object_fallback.c map_object.c load.c search.c \ headers.c paths.c +CPPFLAGS+= -DLDD + .include "Makefile.common"