Retire the WITH_LIBMAP compile knob; libmap is now a standard feature.
This commit is contained in:
parent
4402996dea
commit
5515f48ce3
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=120039
@ -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
|
||||
|
@ -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 *
|
||||
|
@ -65,9 +65,6 @@ The most common use at the date of writing is for allowing multiple
|
||||
.Tn POSIX
|
||||
threading libraries to be used on a system without relinking or
|
||||
changing symlinks.
|
||||
.Pp
|
||||
In order to enable this feature please see
|
||||
.Pa src/libexec/rtld-elf/Makefile .
|
||||
.Sh EXAMPLE
|
||||
.Bd -literal
|
||||
# /etc/libmap.conf
|
||||
|
Loading…
Reference in New Issue
Block a user