mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 13:00:06 +00:00
ba79d61b44
* elf/dl-close.c: New file. * elf/link.h: Declare _dl_close. * elf/Makefile (routines): Add dl-close. * elf/dlclose.c (dlclose): Use _dl_close. * elf/Makefile ($(objpfx)librtld.so): Remove libelf from deps. * elf/dl-runtime.c (_dl_global_scope): New variable. (_dl_object_relocation_scope): New function. (fixup): Use it. * elf/rtld.c (dl_main): Use it. * elf/dl-open.c (_dl_open): Use it. If (MODE & RTLD_GLOBAL), set the l_global bit and append the new map to _dl_global_scope. * elf/link.h: Declare _dl_global_scope, _dl_global_scope_alloc, and _dl_object_relocation_scope. * elf/link.h (struct link_map): Add l_loader member. Remove _dl_map_object_from_fd decl. * elf/dl-load.c (_dl_map_object): Pass LOADER to ... (_dl_map_object_from_fd): Take new arg LOADER and set l_loader member. (_dl_map_object): Try DT_RPATH from all loaders up the chain. * elf/dl-object.c (_dl_loaded): Variable removed. (_dl_default_scope): New variable replaces it. * elf/link.h (_dl_loaded): Remove variable decl; instead define as macro for _dl_default_scope[2]. (_dl_default_scope): Declare it. * sysdeps/i386/dl-machine.h (RTLD_START): Use _dl_default_scope[2] instead of _dl_loaded. * sysdeps/m68k/dl-machine.h (RTLD_START): Likewise. * elf/rtld.c (dl_main): Use _dl_default_scope for symbol lookups. * elf/dl-reloc.c (_dl_relocate_object): Remove check for _dl_rtld_map. * elf/rtld.c (dl_main): Pass 0 for LAZY flag when re-relocating self. * elf/link.h (struct link_map.l_type): Remove lt_interpreter. (struct link_map): Add new flag member l_global. * elf/dl-reloc.c (_dl_relocate_object): Check for _dl_rtld_map directly instead of looking for lt_interpreter. * sysdeps/i386/dl-machine.h (elf_machine_rel): Likewise. * elf/rtld.c (_dl_start): Don't bother setting BOOTSTRAP_MAP.l_type. (dl_main): Set _dl_rtld_map.l_type to lt_library. * elf/dl-deps.c (_dl_map_object_deps): Propagate MAP->l_type to dependencies loaded, downgrading lt_executable -> lt_library. * elf/dl-load.c (_dl_map_object_from_fd): Take new arg TYPE and set l_type from that, translating lt_library->lt_executable based on the file's ELF type. (_dl_map_object): Likewise. * elf/link.h: Update prototypes. * elf/dl-open.c: Pass type lt_loaded. * elf/rtld.c: Pass type lt_library. * elf/dl-load.c (_dl_map_object_from_fd): Handle null return from _dl_new_object. (_dl_map_object_from_fd: lose): Unchain and free L if it's not null. Free REALNAME, and just use NAME in error message. * elf/dl-object.c (_dl_new_object): If malloc fails, return null instead of calling _dl_signal_error. * elf/dl-load.c (_dl_map_object_from_fd): Close FD before signalling error for _dl_zerofd setup failure. * elf/dl-object.c (_dl_startup_loaded): Variable removed. * elf/link.h: Remove its decl. * elf/dl-reloc.c (_dl_relocate_object): Take new SCOPE arg and pass it through to _dl_lookup_symbol. * elf/link.h (_dl_relocate_object): Update comment and prototype. * elf/rtld.c (dl_main): Pass scope vector to _dl_relocate_object. * elf/dl-lookup.c (_dl_lookup_symbol): Arg SYMBOL_SCOPE is now a null-terminated vector of pointers, no longer a vector of exactly two. * elf/link.h (_dl_lookup_symbol): Update comment and prototype. * elf/dl-runtime.c (fixup): Set up scope for symbol lookup properly as done in _dl_relocate_object. * elf/dlopen.c: Pass "" to _dl_open when FILE is null.
111 lines
3.9 KiB
Makefile
111 lines
3.9 KiB
Makefile
# Makefile for elf subdirectory of GNU C Library.
|
|
|
|
# Copyright (C) 1995, 1996 Free Software Foundation, Inc.
|
|
# This file is part of the GNU C Library.
|
|
|
|
# The GNU C Library is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU Library General Public License as
|
|
# published by the Free Software Foundation; either version 2 of the
|
|
# License, or (at your option) any later version.
|
|
|
|
# The GNU C Library is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
# Library General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU Library General Public
|
|
# License along with the GNU C Library; see the file COPYING.LIB. If
|
|
# not, write to the Free Software Foundation, Inc., 675 Mass Ave,
|
|
# Cambridge, MA 02139, USA.
|
|
|
|
subdir := elf
|
|
|
|
headers = elf.h elfclass.h link.h dlfcn.h
|
|
routines = init-first $(dl-routines) \
|
|
dl-open dl-close dl-symbol dl-support
|
|
|
|
# The core dynamic linking functions are in libc for the static and
|
|
# profiled libraries.
|
|
dl-routines = $(addprefix dl-,load lookup object reloc deps \
|
|
runtime error init fini)
|
|
# But they are absent from the shared libc, because that code is in ld.so.
|
|
elide-routines.so = $(dl-routines) dl-support
|
|
|
|
# ld.so uses those routines, plus some special stuff for being the program
|
|
# interpreter and operating independent of libc.
|
|
rtld-routines := rtld $(dl-routines) dl-sysdep dl-minimal
|
|
distribute = $(rtld-routines:=.c) dynamic-link.h do-rel.h dl-machine.h \
|
|
soinit.c sofini.c ldd.sh.in linux-compat.c
|
|
|
|
extra-libs = libdl
|
|
libdl-routines := dlopen dlclose dlsym dlerror dladdr
|
|
|
|
|
|
all: # Make this the default target; it will be defined in Rules.
|
|
|
|
include ../Makeconfig
|
|
|
|
ifeq (yes,$(build-shared))
|
|
extra-objs = $(rtld-routines:=.so) soinit.so sofini.so
|
|
generated = librtld.so dl-allobjs.so
|
|
install-others = $(slibdir)/$(rtld-installed-name)
|
|
install-bin = ldd
|
|
|
|
# Make sure these things are built in the `make lib' pass so they can be used
|
|
# to run programs during the `make others' pass.
|
|
lib-noranlib: $(objpfx)ld.so $(addprefix $(objpfx),$(extra-objs))
|
|
|
|
ifneq (,$(filter linux% linux,$(config-os)))
|
|
extra-objs += linux-compat.so
|
|
install-others += $(slibdir)/ld-linux.so.1
|
|
lib-noranlib: $(objpfx)ld-linux.so.1
|
|
endif
|
|
endif
|
|
|
|
include ../Rules
|
|
|
|
|
|
# Command to link into a larger single relocatable object.
|
|
reloc-link = $(LINK.o) -nostdlib -nostartfiles -r -o $@
|
|
|
|
$(objpfx)dl-allobjs.so: $(rtld-routines:%=$(objpfx)%.so)
|
|
$(reloc-link) $^
|
|
|
|
# Link together the dynamic linker into a single relocatable object.
|
|
# We use this to produce both the ABI-compliant and Linux-compatible
|
|
# dynamic linker shared objects below.
|
|
$(objpfx)librtld.so: $(objpfx)dl-allobjs.so \
|
|
$(patsubst %,$(common-objpfx)lib%_pic.a,\
|
|
c $(LDLIBS-c.so:-l%=%))
|
|
$(reloc-link) '-Wl,-(' $^ -lgcc '-Wl,-)'
|
|
|
|
$(objpfx)ld.so: $(objpfx)librtld.so
|
|
$(rtld-link) -Wl,-soname=$(rtld-installed-name)
|
|
$(objpfx)ld-linux.so.1: $(objpfx)librtld.so
|
|
$(rtld-link) -Wl,-soname=ld-linux.so.1
|
|
|
|
define rtld-link
|
|
$(LINK.o) -nostdlib -nostartfiles -shared -o $@ \
|
|
-Wl,-rpath=$(default-rpath) $^
|
|
endef
|
|
|
|
# The dl code in the static libc needs a default library path.
|
|
CFLAGS-dl-support.c = -D'DEFAULT_RPATH="$(default-rpath)"'
|
|
|
|
# The Linux-compatible dynamic linker shared object is just the same
|
|
# with one object file of compatibility initialization code added.
|
|
$(objpfx)ld-linux.so.1: $(objpfx)linux-compat.so
|
|
|
|
|
|
# Specify the dependencies of libdl.so; its commands come from the generic
|
|
# rule to build a shared library.
|
|
$(objpfx)libdl.so: $(objpfx)libdl_pic.a $(common-objpfx)libc.so $(objpfx)ld.so
|
|
|
|
$(slibdir)/$(rtld-installed-name): $(objpfx)ld.so; $(do-install-program)
|
|
$(slibdir)/ld-linux.so.1: $(objpfx)ld-linux.so.1; $(do-install-program)
|
|
|
|
$(objpfx)ldd: ldd.sh.in Makefile
|
|
sed 's%@RTLD@%$(slibdir)/$(rtld-installed-name)%g' < $< > $@.new
|
|
chmod 555 $@.new
|
|
mv -f $@.new $@
|