9dcafc5597
* sysdeps/generic/libc-start.c: Don't register program destructor here. * dlfcn/Makefile: Add rules to build dlfcn.c. (LDFLAGS-dl.so): Removed. * dlfcn/dlclose.c: _dl_close is now in ld.so, use function pointer table. * dlfcn/dlmopen.c: Likewise for _dl_open. * dlfcn/dlopen.c: Likewise. * dlfcn/dlopenold.c: Likewise. * elf/dl-libc.c: Likewise for _dl_open and _dl_close. * elf/Makefile (routines): Remove dl-open and dl-close. (dl-routines): Add dl-open, dl-close, and dl-trampoline. Add rules to build and run tst-audit1. * elf/tst-audit1.c: New file. * elf/tst-auditmod1.c: New file. * elf/Versions [libc]: Remove _dl_open and _dl_close. * elf/dl-close.c: Change for use inside ld.so instead of libc.so. * elf/dl-open.c: Likewise. * elf/dl-debug.c (_dl_debug_initialize): Allow reinitialization, signaled by nonzero parameter. * elf/dl-init.c: Fix use of r_state. * elf/dl-load.c: Likewise. * elf/dl-close.c: Add auditing checkpoints. * elf/dl-open.c: Likewise. * elf/dl-fini.c: Likewise. * elf/dl-load.c: Likewise. * elf/dl-sym.c: Likewise. * sysdeps/generic/libc-start.c: Likewise. * elf/dl-object.c: Allocate memory for auditing information. * elf/dl-reloc.c: Remove RESOLV. We now always need the map. Correctly initialize slotinfo. * elf/dynamic-link.h: Adjust after removal of RESOLV. * sysdeps/hppa/dl-lookupcfg.h: Likewise. * sysdeps/ia64/dl-lookupcfg.h: Likewise. * sysdeps/powerpc/powerpc64/dl-lookupcfg.h: Removed. * elf/dl-runtime.c (_dl_fixup): Little cleanup. (_dl_profile_fixup): New parameters to point to register struct and variable for frame size. Add auditing checkpoints. (_dl_call_pltexit): New function. Don't define trampoline code here. * elf/rtld.c: Recognize LD_AUDIT. Load modules on startup. Remove all the functions from _rtld_global_ro which only _dl_open and _dl_close needed. Add auditing checkpoints. * elf/link.h: Define symbols for auditing interfaces. * include/link.h: Likewise. * include/dlfcn.h: Define __RTLD_AUDIT. Remove prototypes for _dl_open and _dl_close. Adjust access to argc and argv in libdl. * dlfcn/dlfcn.c: New file. * sysdeps/generic/dl-lookupcfg.h: Remove all content now that RESOLVE is gone. * sysdeps/generic/ldsodefs.h: Add definitions for auditing interfaces. * sysdeps/generic/unsecvars.h: Add LD_AUDIT. * sysdeps/i386/dl-machine.h: Remove trampoline code here. Adjust for removal of RESOLVE. * sysdeps/x86_64/dl-machine.h: Likewise. * sysdeps/generic/dl-trampoline.c: New file. * sysdeps/i386/dl-trampoline.c: New file. * sysdeps/x86_64/dl-trampoline.c: New file. * sysdeps/generic/dl-tls.c: Cleanups. Fixup for dtv_t change. Fix updating of DTV. * sysdeps/generic/libc-tls.c: Likewise. * sysdeps/arm/bits/link.h: Renamed to ... * sysdeps/arm/buts/linkmap.h: ...this. * sysdeps/generic/bits/link.h: Renamed to... * sysdeps/generic/bits/linkmap.h: ...this. * sysdeps/hppa/bits/link.h: Renamed to... * sysdeps/hppa/bits/linkmap.h: ...this. * sysdeps/hppa/i386/link.h: Renamed to... * sysdeps/hppa/i386/linkmap.h: ...this. * sysdeps/hppa/ia64/link.h: Renamed to... * sysdeps/hppa/ia64/linkmap.h: ...this. * sysdeps/hppa/s390/link.h: Renamed to... * sysdeps/hppa/s390/linkmap.h: ...this. * sysdeps/hppa/sh/link.h: Renamed to... * sysdeps/hppa/sh/linkmap.h: ...this. * sysdeps/hppa/x86_64/link.h: Renamed to... * sysdeps/hppa/x86_64/linkmap.h: ...this. 2005-01-06 Ulrich Drepper <drepper@redhat.com> * allocatestack.c (init_one_static_tls): Adjust initialization of DTV entry for static tls deallocation fix. * sysdeps/alpha/tls.h (dtv_t): Change pointer type to be struct which also contains information whether the memory pointed to is static TLS or not. * sysdeps/i386/tls.h: Likewise. * sysdeps/ia64/tls.h: Likewise. * sysdeps/powerpc/tls.h: Likewise. * sysdeps/s390/tls.h: Likewise. * sysdeps/sh/tls.h: Likewise. * sysdeps/sparc/tls.h: Likewise. * sysdeps/x86_64/tls.h: Likewise.
135 lines
4.6 KiB
Makefile
135 lines
4.6 KiB
Makefile
# Copyright (C) 1995-2002, 2003, 2004 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 Lesser General Public
|
|
# License as published by the Free Software Foundation; either
|
|
# version 2.1 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
|
|
# Lesser General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU Lesser General Public
|
|
# License along with the GNU C Library; if not, write to the Free
|
|
# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
# 02111-1307 USA.
|
|
|
|
subdir := dlfcn
|
|
headers := bits/dlfcn.h dlfcn.h
|
|
extra-libs := libdl
|
|
libdl-routines := dlopen dlclose dlsym dlvsym dlerror dladdr dladdr1 dlinfo \
|
|
dlmopen dlfcn
|
|
routines := $(patsubst %,s%,$(filter-out dlfcn,$(libdl-routines)))
|
|
elide-routines.os := $(routines)
|
|
distribute := dlopenold.c glreflib1.c glreflib2.c failtestmod.c \
|
|
defaultmod1.c defaultmod2.c errmsg1mod.c modatexit.c \
|
|
modcxaatexit.c modstatic.c modstatic2.c \
|
|
bug-dlsym1-lib1.c bug-dlsym1-lib2.c
|
|
|
|
extra-libs-others := libdl
|
|
|
|
include ../Makeconfig
|
|
|
|
ifeq ($(versioning),yes)
|
|
libdl-routines += dlopenold
|
|
libdl-shared-only-routines := dlopenold dlfcn
|
|
endif
|
|
|
|
ifeq (yes,$(build-shared))
|
|
tests = glrefmain failtest tst-dladdr default errmsg1 tstcxaatexit \
|
|
bug-dlopen1 bug-dlsym1 tst-dlinfo
|
|
ifeq (yes,$(have-protected))
|
|
tests += tstatexit
|
|
endif
|
|
endif
|
|
modules-names = glreflib1 glreflib2 failtestmod defaultmod1 defaultmod2 \
|
|
errmsg1mod modatexit modcxaatexit \
|
|
bug-dlsym1-lib1 bug-dlsym1-lib2
|
|
|
|
failtestmod.so-no-z-defs = yes
|
|
glreflib2.so-no-z-defs = yes
|
|
errmsg1mod.so-no-z-defs = yes
|
|
|
|
ifeq (yesyesyes,$(build-static)$(build-shared)$(elf))
|
|
tests += tststatic tststatic2
|
|
tests-static += tststatic tststatic2
|
|
modules-names += modstatic modstatic2
|
|
tststatic-ENV = LD_LIBRARY_PATH=$(objpfx):$(common-objpfx):$(common-objpfx)elf
|
|
tststatic2-ENV = LD_LIBRARY_PATH=$(objpfx):$(common-objpfx):$(common-objpfx)elf
|
|
endif
|
|
|
|
extra-objs += $(modules-names:=.os)
|
|
generated := $(modules-names:=.so)
|
|
|
|
include ../Rules
|
|
|
|
test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names)))
|
|
$(test-modules): $(objpfx)%.so: $(objpfx)%.os $(common-objpfx)shlib.lds
|
|
$(build-module)
|
|
|
|
ifeq ($(build-shared),yes)
|
|
# Build all the modules even when not actually running test programs.
|
|
tests: $(test-modules)
|
|
endif
|
|
|
|
$(objpfx)glrefmain: $(libdl)
|
|
$(objpfx)glrefmain.out: $(objpfx)glrefmain \
|
|
$(objpfx)glreflib1.so $(objpfx)glreflib2.so
|
|
|
|
$(objpfx)failtest: $(libdl)
|
|
$(objpfx)failtest.out: $(objpfx)failtestmod.so
|
|
|
|
$(objpfx)tst-dladdr: $(libdl)
|
|
$(objpfx)tst-dladdr.out: $(objpfx)glreflib1.so
|
|
|
|
$(objpfx)tst-dlinfo: $(libdl)
|
|
$(objpfx)tst-dlinfo.out: $(objpfx)glreflib1.so
|
|
|
|
LDFLAGS-default = $(LDFLAGS-rdynamic)
|
|
$(objpfx)default: $(libdl) $(objpfx)defaultmod1.so $(objpfx)defaultmod2.so
|
|
$(objpfx)defaultmod1.so: $(libdl) $(common-objpfx)libc_nonshared.a
|
|
LDFLAGS-defaultmod2.so = $(LDFLAGS-Bsymbolic)
|
|
$(objpfx)defaultmod2.so: $(libdl) $(common-objpfx)libc_nonshared.a
|
|
|
|
$(objpfx)errmsg1: $(libdl)
|
|
$(objpfx)errmsg1.out: $(objpfx)errmsg1 $(objpfx)errmsg1mod.so
|
|
|
|
$(objpfx)tstatexit: $(libdl)
|
|
$(objpfx)tstatexit.out: $(objpfx)tstatexit $(objpfx)modatexit.so
|
|
|
|
$(objpfx)tstcxaatexit: $(libdl)
|
|
$(objpfx)tstcxaatexit.out: $(objpfx)tstcxaatexit $(objpfx)modcxaatexit.so
|
|
|
|
$(objpfx)modatexit.so: $(common-objpfx)libc.so $(common-objpfx)libc_nonshared.a
|
|
|
|
$(objpfx)tststatic: $(objpfx)libdl.a
|
|
$(objpfx)tststatic.out: $(objpfx)tststatic $(objpfx)modstatic.so
|
|
|
|
$(objpfx)tststatic2: $(objpfx)libdl.a
|
|
$(objpfx)tststatic2.out: $(objpfx)tststatic2 $(objpfx)modstatic.so \
|
|
$(objpfx)modstatic2.so
|
|
|
|
$(objpfx)modstatic2.so: $(libdl) $(common-objpfx)libc.so \
|
|
$(common-objpfx)libc_nonshared.a
|
|
|
|
$(objpfx)bug-dlopen1: $(libdl)
|
|
|
|
$(objpfx)bug-dlsym1: $(libdl) $(objpfx)bug-dlsym1-lib2.so
|
|
$(objpfx)bug-dlsym1.out: $(objpfx)bug-dlsym1-lib1.so \
|
|
$(objpfx)bug-dlsym1-lib2.so
|
|
$(objpfx)bug-dlsym1-lib1.so: $(objpfx)bug-dlsym1-lib2.so \
|
|
$(common-objpfx)libc.so \
|
|
$(common-objpfx)libc_nonshared.a
|
|
$(objpfx)bug-dlsym1-lib2.so: $(common-objpfx)libc.so \
|
|
$(common-objpfx)libc_nonshared.a
|
|
|
|
|
|
|
|
# Depend on libc.so so a DT_NEEDED is generated in the shared objects.
|
|
# This ensures they will load libc.so for needed symbols if loaded by
|
|
# a statically-linked program that hasn't already loaded it.
|
|
$(objpfx)libdl.so: $(common-objpfx)libc.so $(common-objpfx)libc_nonshared.a \
|
|
$(if $(filter yes,$(elf)), $(elfobjdir)/ld.so)
|