diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-05-05 23:29:18 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-05-05 23:29:18 +0000 |
| commit | dc5efe83c0252ad45337ab98eff6c26fdb29b0a9 (patch) | |
| tree | d7045a782818d82ee49fc8503df674026e1b0588 /elf/Makefile | |
| parent | 4f8dbcb126883c92d33d49c86365a1fb1e54696a (diff) | |
| download | glibc-dc5efe83c0252ad45337ab98eff6c26fdb29b0a9.tar glibc-dc5efe83c0252ad45337ab98eff6c26fdb29b0a9.tar.gz glibc-dc5efe83c0252ad45337ab98eff6c26fdb29b0a9.tar.bz2 glibc-dc5efe83c0252ad45337ab98eff6c26fdb29b0a9.zip | |
Update.
* Versions.def (ld.so): Add GLIBC_2.1.1.
* elf/Makefile (routines): Add dl-origin.
(tests): Add origtest. Add dependencies for the program.
* elf/Versions (ld.so) [GLIBC_2.1.1]: Add _dl_origin_path,
_dl_platformlen, _dl_dst_count and _dl_dst_substitute.
* elf/dl-deps.c (expand_dst): New macro. Expand DSTs in filename.
(_dl_map_object_deps): Use expand_dst to expand DSTs in DT_NEEDED,
DT_AUXILIARY, and DT_FILTER filenames.
* elf/dl-load.c (expand_dynamic_string_token): Explode into
two functions and three macros.
(_dl_dst_count, _dl_dst_substitute): New functions.
* elf/dl-dst.h: New file.
* elf/dl-open.c (_dl_open): Take extra parameter with address of
caller. Pass address in args structure.
(dl_open_worker): Recognize and expand DSTs in filename.
* elf/ldsodefs.h (_dl_open): Adapt prototype.
* elf/dlopen.c (dlopen_doit): Pass caller address to _dl_open.
(__dlopen_check): Pass caller address to dlopen_doit in args.
* elf/dlopendoit.c: Likewise.
* iconv/gconv_dl.c: Adapt call of _dl_open.
* nss/nsswitch.c: Likewise.
* elf/origtest.c: New file.
* sysdeps/generic/dl-origin.h: Moved to...
* sysdeps/generic/dl-origin.c: ...here.
* sysdeps/unix/sysv/linux/dl-origin.h: Moved to...
* sysdeps/unix/sysv/linux/dl-origin.c: ...here.
Diffstat (limited to 'elf/Makefile')
| -rw-r--r-- | elf/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/elf/Makefile b/elf/Makefile index 26a08322df..d6c37c2bb8 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -22,7 +22,7 @@ subdir := elf headers = elf.h bits/elfclass.h bits/dlfcn.h link.h dlfcn.h routines = $(dl-routines) dl-open dl-close dl-symbol dl-support \ - dl-addr enbl-secure dl-profstub + dl-addr enbl-secure dl-profstub dl-origin # The core dynamic linking functions are in libc for the static and # profiled libraries. @@ -78,7 +78,7 @@ install-rootsbin += ldconfig endif ifeq (yes,$(build-shared)) -tests = loadtest restest1 preloadtest loadfail multiload +tests = loadtest restest1 preloadtest loadfail multiload origtest endif modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ testobj1_1 failobj @@ -253,6 +253,9 @@ LDFLAGS-multiload = -rdynamic CFLAGS-multiload.c = -DOBJDIR=\"$(elf-objpfx)\" $(objpfx)multiload.out: $(objpfx)testobj1.so + +$(objpfx)origtest: $(libdl) +$(objpfx)origtest.out: $(objpfx)testobj1.so # muwahaha |