sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

allow ldd mmap fallback

Browse source 
Change-Id: Ia7b8aa88c3f063c804869065719ac0cbf049b7dd
This commit is contained in:
Anton Kuijsten 2013-06-12 05:58:46 +00:00 committed by Ben Gras
parent 8d676bd0a8
commit a74251eb16
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libexec/ld.elf_so/map_object.c
View file

@ -138,7 +138,7 @@ _rtld_map_object(const char *path, int fd, const struct stat *sb)
(off_t)0); (off_t)0);
obj->ehdr = ehdr; obj->ehdr = ehdr;
if (ehdr == MAP_FAILED) { 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); return _rtld_map_object_fallback(path, fd, sb);
#else #else
_rtld_error("%s: read error: %s", path, xstrerror(errno)); _rtld_error("%s: read error: %s", path, xstrerror(errno));

4
usr.bin/ldd/Makefile.elf
View file

@ -4,7 +4,9 @@
# Expects CPPFLAGS to have ELFSIZE set, and LIB to be set. # Expects CPPFLAGS to have ELFSIZE set, and LIB to be set.
SRCS= ldd_elfxx.c 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 headers.c paths.c
CPPFLAGS+= -DLDD
.include "Makefile.common" .include "Makefile.common"