aboutsummaryrefslogtreecommitdiff
path: root/hurd/report-wait.c
diff options
context:
space:
mode:
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 7516192..e8f4f1a 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
{