about summary refs log tree commit diff
path: root/hurd/report-wait.c
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>1997-02-23 22:09:31 +0000
committerMiles Bader <miles@gnu.org>1997-02-23 22:09:31 +0000
commit6bac11d99322f3cdf751b43dc3b3456039fab26c (patch)
treebdec620c134a6b498fc21ea5d3825762a79ed558 /hurd/report-wait.c
parent4dea6fa212ba120779f4a1f9237e02b20ab74aa5 (diff)
downloadglibc-6bac11d99322f3cdf751b43dc3b3456039fab26c.tar.gz
glibc-6bac11d99322f3cdf751b43dc3b3456039fab26c.tar.xz
glibc-6bac11d99322f3cdf751b43dc3b3456039fab26c.zip
(__libc_argv, __libc_argc): Make extern. (__hurd_threadvar_max, __hurd_threadvar_stack_offset, __hurd_threadvar_stack_mask): New variables. cvs/libc-970224
Diffstat (limited to 'hurd/report-wait.c')
-rw-r--r--hurd/report-wait.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/hurd/report-wait.c b/hurd/report-wait.c
index 751619233c..e8f4f1af4a 100644
--- a/hurd/report-wait.c
+++ b/hurd/report-wait.c
@@ -93,8 +93,15 @@ describe_port (string_t description, mach_port_t port)
 }
 
 
-/* Common defn so we don't link in the itimer code unnecessarily.  */
-thread_t _hurd_itimer_thread; /* XXX */
+/* We want _HURD_ITIMER_THREAD, but don't want to link in the itimer code
+   unnecessarily.  */
+#if 0 /* libc.so.0.0 needs this defined, so make it a weak alias for now.  */
+extern thread_t _hurd_itimer_thread; /* XXX */
+weak_extern (_hurd_itimer_thread)
+#else
+static thread_t default_hurd_itimer_thread;
+weak_alias (default_hurd_itimer_thread, _hurd_itimer_thread)
+#endif
 
 kern_return_t
 _S_msg_report_wait (mach_port_t msgport, thread_t thread,
@@ -105,7 +112,7 @@ _S_msg_report_wait (mach_port_t msgport, thread_t thread,
   if (thread == _hurd_msgport_thread)
     /* Cute.  */
     strcpy (description, "msgport");
-  else if (thread == _hurd_itimer_thread)
+  else if (&_hurd_msgport_thread && thread == _hurd_itimer_thread)
     strcpy (description, "itimer");
   else
     {