From 5bf62f2d3a8af353fac661b224fc1604d4de51ea Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 8 Jun 1995 09:00:23 +0000 Subject: Thu Jun 8 02:50:26 1995 Roland McGrath * elf/rtld.c [! NDEBUG] (__assert_perror_fail): New function. * hurd/hurdstartup.c (_hurd_startup): Fancier kludge to guess phdr and user entry point addresses. * elf/dl-load.c (open_path): Don't do strlen on DIRPATH if it's null. (_dl_map_object): DT_RPATH value is relative to DT_STRTAB value. * Makerules (install-lib.so): Don't include libc.so. [$(build-shared)=yes] (install): Depend on the installed libc.so file. [$(build-shared)=yes] (install-no-libc.a): Make this, rather than install, depend on the installed $(install-lib.so) files. [$(build-shared)=yes] (install-lib.so): Append libc.so after that rule. * sysdeps/mach/hurd/dl-sysdep.c (_dl_sysdep_start): Add kludge to allocate high addresses to avoid random mappings appearing there. (mmap): Comment out mask; always pass zero. Tue Jun 6 13:34:53 1995 Roland McGrath * sysdeps/i386/dl-machine.h (ELF_MACHINE_USER_ADDRESS_MASK): New macro. * sysdeps/mach/hurd/dl-sysdep.c (mmap): Use it as mask in vm_map call. * elf/dl-error.c (_dl_catch_error): Clear *ERRSTRING and *OBJNAME when successful. * sysdeps/mach/hurd/dl-sysdep.c (threadvars): New static variable. (__hurd_threadvar_max, __hurd_threadvar_stack_offset): Define these variables, using the `threadvars' buffer. * elf/dl-reloc.c: Don't dereference L->l_prev when it's null. * sysdeps/i386/dl-runtime.c: Likewise. * elf/rtld.c (dl_main): Add missing NULL terminating argument in _dl_sysdep_fatal call. (__assert_fail): Likewise. * locale/Makefile (localedef-modules): Renamed ctype to locale-ctype so as not to conflict with the object file for ctype/ctype.c in the build directory. * sysdeps/i386/dl-machine.h (elf_machine_rel): If MAP->l_type is lt_interpreter, first undo relocation done during bootstrapping. --- Makerules | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Makerules') diff --git a/Makerules b/Makerules index 619783c10d..593a81c9d7 100644 --- a/Makerules +++ b/Makerules @@ -492,12 +492,15 @@ $(INSTALL_PROGRAM) $< $@.new mv -f $@.new $@ endef -install-lib.so := libc.so $(filter %.so,$(install-lib:%_pic.a=%.so)) +install-lib.so := $(filter %.so,$(install-lib:%_pic.a=%.so)) install-lib := $(filter-out %.so,$(install-lib)) ifeq (yes,$(build-shared)) -install: $(foreach so,$(install-lib.so),\ +install: $(libdir)/libc.so$(libc.so-version) +install-no-libc.a: $(foreach so,$(install-lib.so),\ $(libdir)/$(patsubst $(libprefix)lib%,lib$(libprefix)%,\ $(libprefix)$(so))$($(so)-version)) + +install-lib.so += libc.so $(foreach v,$(sort $(foreach so,$(install-lib.so),.so$($(so)-version))),\ $(libdir)/lib$(libprefix)%$v): $(common-objpfx)lib%.so $(do-install-program) -- cgit v1.2.3