diff options
| author | mdodd <mdodd@FreeBSD.org> | 2003-09-13 21:50:36 +0000 |
|---|---|---|
| committer | mdodd <mdodd@FreeBSD.org> | 2003-09-13 21:50:36 +0000 |
| commit | 264111211434b694e9dfca7dd854d39f24a2ff39 (patch) | |
| tree | d2ef973c1ac0d23fc56a652a471fd3bd7b3ed14e /libexec | |
| parent | df4cd81882926df08d6ac5b0f56b288b90c19ad9 (diff) | |
| download | FreeBSD-src-264111211434b694e9dfca7dd854d39f24a2ff39.zip FreeBSD-src-264111211434b694e9dfca7dd854d39f24a2ff39.tar.gz | |
Retire the WITH_LIBMAP compile knob; libmap is now a standard feature.
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/rtld-elf/Makefile | 11 | ||||
| -rw-r--r-- | libexec/rtld-elf/rtld.c | 8 |
2 files changed, 1 insertions, 18 deletions
diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index b9acc793..bcf0a25 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -2,7 +2,7 @@ PROG= ld-elf.so.1 SRCS= rtld_start.S rtld.c rtld_lock.c map_object.c malloc.c \ - xmalloc.c debug.c reloc.c + xmalloc.c debug.c reloc.c libmap.c MAN= rtld.1 CSTD?= gnu99 CFLAGS+= -Wall -DFREEBSD_ELF -DIN_RTLD @@ -14,15 +14,6 @@ SYMLINKS= ${BINDIR}/${PROG} /usr/libexec/${PROG} MLINKS= rtld.1 ld-elf.so.1.1 \ rtld.1 ld.so.1 -# -# To enable the libmap.conf functionality please -# add 'WITH_LIBMAP=yes' to /etc/make.conf, recompile -# and reinstall rtld-elf. -.ifdef WITH_LIBMAP -CFLAGS+= -DWITH_LIBMAP -SRCS+= libmap.c -.endif - .if exists(${.CURDIR}/${MACHINE_ARCH}/Makefile.inc) .include "${.CURDIR}/${MACHINE_ARCH}/Makefile.inc" .endif diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 801fa4b..81603ad 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -52,9 +52,7 @@ #include "debug.h" #include "rtld.h" -#ifdef WITH_LIBMAP #include "libmap.h" -#endif #define END_SYM "_end" #define PATH_RTLD "/libexec/ld-elf.so.1" @@ -340,10 +338,8 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entry **objp) sym_zero.st_info = ELF_ST_INFO(STB_GLOBAL, STT_NOTYPE); sym_zero.st_shndx = SHN_UNDEF; -#ifdef WITH_LIBMAP if (!libmap_disable) libmap_disable = (bool)lm_init(); -#endif dbg("loading LD_PRELOAD libraries"); if (load_preload_objects() == -1) @@ -824,10 +820,8 @@ find_library(const char *xname, const Obj_Entry *refobj) return xstrdup(xname); } -#ifdef WITH_LIBMAP if (libmap_disable || (refobj == NULL) || (name = lm_find(refobj->path, xname)) == NULL) -#endif name = (char *)xname; dbg(" Searching for \"%s\"", name); @@ -1464,10 +1458,8 @@ rtld_exit(void) obj->refcount = 0; objlist_call_fini(&list_fini); /* No need to remove the items from the list, since we are exiting. */ -#ifdef WITH_LIBMAP if (!libmap_disable) lm_fini(); -#endif } static void * |
