From 4d6acc61fa6892b40eaf94de4ff506ff83e37490 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 13 Jun 1996 04:06:45 +0000 Subject: Thu Jun 13 00:02:25 1996 Roland McGrath * elf/dl-lookup.c (_dl_lookup_symbol): If no value and *REF is null, consider it a strong reference and give the error. Wed Jun 12 15:52:46 1996 Roland McGrath * elf/dl-open.c (_dl_open): Correctly terminate relocating loop after relocating NEW when it's the only new object. * elf/dl-init.c (_dl_init_next): When out of initializers, set _r_debug.r_state to RT_CONSISTENT and call _dl_debug_state just before return. * elf/rtld.c (dl_main): Move _dl_debug_initialize call after relocation. Call it unconditionally and only fill in DT_DEBUG if it's present. Then call _dl_debug_state with r_state RT_ADD before running initializers. * elf/dl-open.c (_dl_open): Call _dl_debug_initialize and then call _dl_debug_state with r_state RT_ADD before running initializers * elf/dl-close.c (_dl_close): Call _dl_debug_state with r_state RT_DELETE before running finalizers and with RT_CONSISTENT just before return. * elf/Makefile (dl-routines): Add dl-debug. * elf/dl-debug.c: New file. * elf/rtld.c (_dl_r_debug): Rename to _r_debug and move to dl-debug.c. (_dl_r_debug_state): Rename to _dl_debug_state and likewise move. (dl_main): Use _dl_debug_initialize. * elf/link.h: Fix name to _dl_debug_state in decl. (_dl_debug_initialize): Declare new function from dl-debug.c. (_r_debug): Declare it. * Makerules (distinfo-vars): Add install-{lib,data,bin,sbin,others}. In distinfo set $(subdir)-VAR and then set VAR to $($(subdir)-VAR). * Makeconfig (rpath-link): New variable; add $(elfobjdir). (default-rpath): Use it. (built-program-cmd): Use it in LD_LIBRARY_PATH. * Makeconfig (sysdep-configures): Prepend $(sysdep_dir) to names tried. * sysdeps/unix/Dist: Add make-syscalls.sh. * misc/Makefile (headers): Add sys/swap.h. * posix/unistd.h: Remove decls for swapon, swapoff. * sysdeps/generic/sys/swap.h: New file. * sysdeps/unix/sysv/linux/sys/swap.h: New file. * sysdeps/unix/sysv/linux/gnu/types.h: Remove temporary hack #define of __kernel_fsid_t. It is correctly defines in now. --- Makerules | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'Makerules') diff --git a/Makerules b/Makerules index 412b217184..4ea38edd34 100644 --- a/Makerules +++ b/Makerules @@ -420,10 +420,15 @@ endif define o-iterator-doit $(common-objpfx)$(patsubst %,$(libtype$o),c)($(ar-symtab-name)): \ $(common-objpfx)$(patsubst %,$(libtype$o),c)(\ - $(patsubst $(objpfx)%,%,$(o-objects))) \ - $(filter subdir_lib,$(firstword $(subdir) subdir_lib)); \ + $(patsubst $(objpfx)%,%,$(o-objects))) $(subdirs-stamp-o); \ $$(RANLIB) $$(common-objpfx)$$(patsubst %,$$(libtype$o),c) endef +ifndef subdir +subdirs-stamps := $(foreach d,$(subdirs),\ + $(firstword $(objdir) $(subdir))/stamp%-$d) +subdirs-stamp-o = $(subst %,$o,$(subdirs-stamps)) +$(subdirs-stamps): subdir_lib; +endif object-suffixes-left = $(object-suffixes) include $(o-iterator) @@ -810,8 +815,10 @@ define distinfo-vars rm -f $@.new $(foreach var,subdir subdir-dirs sources elided-routines sysdep_routines \ headers sysdep_headers distribute dont_distribute generated \ - others tests extra-libs $(extra-libs:%=%-routines), -echo >> $@.new '$(var) := $($(var))') + others tests extra-libs $(extra-libs:%=%-routines) \ + $(addprefix install-,lib data bin sbin others), +echo >> $@.new '$(subdir)-$(var) := $($(var))' +echo >> $@.new '$(var) = $$($(subdir)-$(var))') endef ifneq (,$(strip $(gpl2lgpl))) -- cgit v1.2.3