From 852fc4b91e0c657e02c7d15bc24fbbae066ccae3 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Tue, 11 Jun 1996 21:07:00 +0000 Subject: * 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! --- Makeconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makeconfig') diff --git a/Makeconfig b/Makeconfig index d2bbbb2517..0bb64bc288 100644 --- a/Makeconfig +++ b/Makeconfig @@ -312,8 +312,9 @@ ifeq (yes,$(build-shared)) # We need the versioned name of libc.so in the deps of $(others) et al # so that the symlink to libc.so is created before anything tries to # run the linked programs. -link-libc = -Wl,-rpath-link=$(common-objdir) \ +link-libc = -Wl,-rpath-link=$(common-objdir):$(elfobjdir) \ $(common-objpfx)libc.so$(libc.so-version) \ + $(elfobjdir)/$(rtld-installed-name) \ $(common-objpfx)libc.a $(gnulib) # Choose the default search path for the dynamic linker based on # where we will install libraries. -- cgit v1.2.3