diff --git a/ChangeLog b/ChangeLog
index c2a56cbd49..076fb854e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2003-03-26  Roland McGrath  <roland@redhat.com>
+
+	* sysdeps/unix/make-syscalls.sh: When an undefined syscall has
+	SOURCE=-, append its symbol names to make variable unix-stub-syscalls.
+	* sysdeps/unix/Makefile [$(subdir) = misc] [unix-stub-syscalls]
+	(sysdep_routines): Add stub-syscalls.
+	($(objpfx)stub-syscalls.c): New target.
+	(generated): Add stub-syscalls.c.
+
+	* tls.make.c: Also define use-tls according to USE_TLS macro.
+
 2003-03-26  Ulrich Drepper  <drepper@redhat.com>
 
 	* abilist/librt.abilist: Add new timer interfaces for 64-bit archs.
diff --git a/tls.make.c b/tls.make.c
index 6bcd2479c6..778d8ef0be 100644
--- a/tls.make.c
+++ b/tls.make.c
@@ -2,6 +2,12 @@
 
 #include <tls.h>
 
+#if USE_TLS
+@@@ use-tls = yes @@@
+#else
+@@@ use-tls = no @@@
+#endif
+
 #if USE___THREAD
 @@@ use-thread = yes @@@
 #else