about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog15
-rw-r--r--elf/Makefile29
-rw-r--r--manual/ctype.texi2
-rw-r--r--sysdeps/unix/sysv/linux/arm/Dist1
4 files changed, 31 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index af9f0658a8..d4776f4b15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+1999-01-20  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* elf/Makefile: Make dependencies between test modules explicit.
+	(preloadtest-preloads): New variable.
+	($(objpfx)preloadtest.out): Use it.
+	(preloadtest-ENV): Use it.
+
+1999-01-22  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
+
+	* sysdeps/unix/sysv/linux/arm/Dist: Undo last change.  Not needed.
+
 1999-01-22  Roland McGrath  <roland@baalperazim.frob.com>
 
 	* sysdeps/mach/hurd/Makefile ($(common-objpfx)stamp-errnos): Depend on
@@ -10,6 +21,10 @@
 
 1999-01-21  Ulrich Drepper  <drepper@cygnus.com>
 
+	* elf/Makefile: Add missing dependency for preloadtest binary.
+
+1999-01-21  Ulrich Drepper  <drepper@cygnus.com>
+
 	* version.h (VERSION): Bump to 2.0.111.
 
 	* elf/Makefile (distribute): Add test module sources.
diff --git a/elf/Makefile b/elf/Makefile
index 185cd48fec..d28d7064e7 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -209,16 +209,14 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
 test-modules = $(addprefix $(objpfx),$(addsuffix .so,$(modules-names)))
 generated += $(test-modules)
 
-LDLIBS-testobj1.so = -ldl
-$(objpfx)testobj1_1.so: $(objpfx)testobj1.so
-LDLIBS-testobj1_1.so = $(objpfx)testobj1.so
-$(objpfx)testobj2.so: $(objpfx)testobj1.so
-LDLIBS-testobj2.so = $(objpfx)testobj1.so -ldl
-LDLIBS-testobj3.so = -ldl
-LDLIBS-testobj4.so = -ldl
-LDLIBS-testobj5.so = -ldl
-LDLIBS-testobj6.so = -ldl
-LDLIBS-failobj.so = $(objpfx)testobj6.so
+$(objpfx)testobj1.so: $(objpfx)libdl.so
+$(objpfx)testobj1_1.so: $(objpfx)testobj1.so $(objpfx)libdl.so
+$(objpfx)testobj2.so: $(objpfx)testobj1.so $(objpfx)libdl.so
+$(objpfx)testobj3.so: $(objpfx)libdl.so
+$(objpfx)testobj4.so: $(objpfx)libdl.so
+$(objpfx)testobj5.so: $(objpfx)libdl.so
+$(objpfx)testobj6.so: $(objpfx)libdl.so
+$(objpfx)failobj.so: $(objpfx)testobj6.so
 
 $(test-modules): $(objpfx)%.so: $(objpfx)%.os
 	$(build-module)
@@ -228,15 +226,18 @@ LDFLAGS-loadtest = -rdynamic
 
 $(objpfx)loadtest.out: $(test-modules)
 
-$(objpfx)restest1: $(objpfx)libdl.so
-LDFLAGS-restest1 = -rdynamic $(objpfx)testobj1.so $(objpfx)testobj1_1.so
+$(objpfx)restest1: $(objpfx)testobj1.so $(objpfx)testobj1_1.so \
+		   $(objpfx)libdl.so
+LDFLAGS-restest1 = -rdynamic
 
 $(objpfx)restest1.out: $(test-modules)
 
+preloadtest-preloads = testobj1 testobj2 testobj3 testobj4 testobj5
 $(objpfx)preloadtest: $(objpfx)testobj6.so
-$(objpfx)preloadtest.out: $(test-modules)
 LDFLAGS-preloadtest = -rdynamic
-preloadtest-ENV = LD_PRELOAD=testobj1.so:testobj2.so:testobj3.so:testobj4.so:testobj5.so
+$(objpfx)preloadtest.out: $(preloadtest-preloads:%=$(objpfx)%.so)
+preloadtest-ENV = \
+  LD_PRELOAD=$(subst $(empty) ,:,$(strip $(preloadtest-preloads:=.so)))
 
 $(objpfx)loadfail: $(objpfx)libdl.so
 LDFLAGS-loadfail = -rdynamic
diff --git a/manual/ctype.texi b/manual/ctype.texi
index 3b21821fa5..fde864b647 100644
--- a/manual/ctype.texi
+++ b/manual/ctype.texi
@@ -656,7 +656,7 @@ is_in_class (int c, const char *class)
 @}
 @end smallexample
 
-@xref{Converting a Character} for more information on @code{btowc}.
+@xref{Converting a Character}, for more information on @code{btowc}.
 Please note that this change probably does not improve the performance
 of the program a lot since the @code{wctype} function still has to make
 the string comparisons.  But it gets really interesting if the
diff --git a/sysdeps/unix/sysv/linux/arm/Dist b/sysdeps/unix/sysv/linux/arm/Dist
index f4b271d785..0bf79a4f98 100644
--- a/sysdeps/unix/sysv/linux/arm/Dist
+++ b/sysdeps/unix/sysv/linux/arm/Dist
@@ -1,4 +1,3 @@
-vfork.S
 clone.S
 init-first.h
 ioperm.c