diff options
| author | Roland McGrath <roland@gnu.org> | 1996-06-11 21:07:00 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1996-06-11 21:07:00 +0000 |
| commit | 852fc4b91e0c657e02c7d15bc24fbbae066ccae3 (patch) | |
| tree | 16e0d249a0b7b0f6d47a410cdfdfe890d7a898cb /elf | |
| parent | 6ba35316626b0aec32d29b7307965de4f4bb59fb (diff) | |
* elf/Makefile ($(objpfx)$(rtld-installed-name)): New target to make
link to ld.so if that is not the installed name.
(lib-noranlib): Depend on the installed name in the build directory
instead of on ld.so.
* Makeconfig (link-libc): Include $(elfobjdir)/$(rtld-installed-name)
between libc.so and libc.a, because with libc.so's DT_NEEDED for ld.so
ld searches libc.a before ld.so (is that an ld bug?).
Add $(elfobjdir) to -rpath-link.
* Makerules (elfobjdir): Define as . when $(subdir) is elf.
* sysdeps/i386/dl-machine.h (elf_machine_rel): In R_386_32 case when
relocating _dl_rtld_map, subtract SYM's value from final reloc value,
but don't change *RELOC_ADDR before calling *RESOLVE, because it might
call the function we are relocating!
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/Makefile | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/elf/Makefile b/elf/Makefile index c2c8f7c5b2..5a550a10a2 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -53,7 +53,8 @@ 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)) +lib-noranlib: $(objpfx)$(rtld-installed-name) \ + $(addprefix $(objpfx),$(extra-objs)) ifneq (,$(filter linux% linux,$(config-os))) extra-objs += linux-compat.so @@ -92,6 +93,14 @@ endef # The dl code in the static libc needs a default library path. CFLAGS-dl-support.c = -D'DEFAULT_RPATH="$(default-rpath)"' +ifneq (ld.so, $(rtld-installed-name)) +# Make sure ld-gnu.so.1 exists in the build directory so we can link +# against it. +$(objpfx)$(rtld-installed-name): $(objpfx)ld.so + rm -f $@ + ln $< $@ +endif + # 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 |