about summary refs log tree commit diff
path: root/Makeconfig
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-06-13 04:06:45 +0000
committerRoland McGrath <roland@gnu.org>1996-06-13 04:06:45 +0000
commit4d6acc61fa6892b40eaf94de4ff506ff83e37490 (patch)
treec8a1bd7697d78a986db11ef2204bfff40cff58b6 /Makeconfig
parent4d5da9a6546481656ec72f31aa2d766ca5a83226 (diff)
downloadglibc-4d6acc61fa6892b40eaf94de4ff506ff83e37490.tar.gz
glibc-4d6acc61fa6892b40eaf94de4ff506ff83e37490.tar.xz
glibc-4d6acc61fa6892b40eaf94de4ff506ff83e37490.zip
Thu Jun 13 00:02:25 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
	* 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  <roland@delasyd.gnu.ai.mit.edu>

	* 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 <linux/types.h> now.
Diffstat (limited to 'Makeconfig')
-rw-r--r--Makeconfig21
1 files changed, 12 insertions, 9 deletions
diff --git a/Makeconfig b/Makeconfig
index 0bb64bc288..1d534580b1 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -88,11 +88,12 @@ $(common-objpfx)config.make: $(common-objpfx)config.status $(..)config.h.in
 
 # Find all the sysdeps configure fragments, to make sure we re-run
 # configure when any of them changes.
-sysdep-configures = $(foreach dir,$(config-sysdirs),\
-			      $(patsubst %.in,%,\
-					 $(firstword $(wildcard \
-					    $(dir)/configure \
-					    $(dir)/configure.in))))
+sysdep-configures = \
+  $(foreach dir,$(config-sysdirs),\
+	    $(patsubst %.in,%,\
+		       $(firstword $(wildcard \
+		         $(sysdep_dir)/$(dir)/configure \
+			 $(sysdep_dir)/$(dir)/configure.in))))
 
 # Force the user to configure before making.
 $(common-objpfx)config.status: $(..)configure $(sysdep-configures)
@@ -312,7 +313,7 @@ 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):$(elfobjdir) \
+link-libc = -Wl,-rpath-link=$(rpath-link) \
 	    $(common-objpfx)libc.so$(libc.so-version) \
 	    $(elfobjdir)/$(rtld-installed-name) \
 	    $(common-objpfx)libc.a $(gnulib)
@@ -323,6 +324,8 @@ default-rpath = $(slibdir):$(libdir)
 else
 default-rpath = $(libdir)
 endif
+# This is how to find at build-time things that will be installed there.
+rpath-link = $(common-objdir):$(elfobjdir)
 else
 link-libc = $(common-objpfx)libc.a $(gnulib) $(common-objpfx)libc.a
 endif
@@ -356,9 +359,9 @@ built-program-cmd = $(built-program-file)
 else
 comma = ,
 define built-program-cmd
-LD_LIBRARY_PATH=$(common-objdir)$(patsubst -Wl$(comma)-rpath-link=%,:%,\
-					   $(filter -Wl$(comma)-rpath-link=%,\
-						    $(sysdep-LDFLAGS))) \
+LD_LIBRARY_PATH=$(rpath-link)$(patsubst -Wl$(comma)-rpath-link=%,:%,\
+					 $(filter -Wl$(comma)-rpath-link=%,\
+						  $(sysdep-LDFLAGS))) \
 $(elf-objpfx)ld.so $(built-program-file)
 endef
 endif