Merge hurd/exceptions.h into hurd/thread.h.

hurd/

2008-12-17  Neal H. Walfield  <neal@gnu.org>

	* exceptions.h: Merge contents of this file...
	* thread.h: ... into this one.  Update users.
	* headers.m4: Don't link hurd/exceptions.h.
	* Makefile.am (includehurd_HEADERS): Remove exceptions.h.

libc-parts/

2008-12-17  Neal H. Walfield  <neal@gnu.org>

	* backtrace.c: Don't include <hurd/exceptions.h>.

libhurd-mm/

2008-12-17  Neal H. Walfield  <neal@gnu.org>

	* anonymous.h: Don't include <hurd/exceptions.h>.
	* as.h: Likewise.
	* exceptions.c: Likewise.
	* map.h: Likewise.
	* message-buffer.c: Likewise.
	* mm-init.c: Likewise.
	* as-build.c: Don't include <hurd/exceptions.h>.  Include
	<viengoos/thread.h> and <viengoos/messenger.h>.
	* as-dump.c: Include <viengoos/thread.h> and
	<viengoos/messenger.h>.
	* as-lookup.c: Likewise.

libpthread/

2008-12-17  Neal H. Walfield  <neal@gnu.org>

	* sysdeps/viengoos/ia32/pt-setup.c: Don't include
	<hurd/exceptions.h> or <viengoos/thread.h>.
	* sysdeps/viengoos/pt-startup.c (__pthread_startup): Don't include
	<l4.h> or <hurd/exceptions.h>.  Include <hurd/thread.h>.
	(__pthread_startup): Set pthread->threadid using hurd_myself.
	* sysdeps/viengoos/pt-sysdep.h: Don't cinlude
	<hurd/exceptions.h>.  Include <hurd/thread.h>.
	* sysdeps/viengoos/pt-thread-dealloc.c: Don't include
	<hurd/exceptions.h>.  Include <hurd/thread.h>.
	* sysdeps/viengoos/pt-thread-start.c: Don't include
	<viengoos/thread.h> or <hurd/exceptions.h>.  Include
	<hurd/thread.h>.

libviengoos/

2008-12-17  Neal H. Walfield  <neal@gnu.org>

	* viengoos/misc.h: Don't include <hurd/exceptions.h>.

10 files changed, 20 insertions, 8 deletions

diff --git a/libhurd-mm/ChangeLog b/libhurd-mm/ChangeLog
index a88e681..a4b592e 100644
--- a/libhurd-mm/ChangeLog
+++ b/libhurd-mm/ChangeLog
@@ -1,5 +1,19 @@
 2008-12-17  Neal H. Walfield  <neal@gnu.org>
 
+	* anonymous.h: Don't include <hurd/exceptions.h>.
+	* as.h: Likewise.
+	* exceptions.c: Likewise.
+	* map.h: Likewise.
+	* message-buffer.c: Likewise.
+	* mm-init.c: Likewise.
+	* as-build.c: Don't include <hurd/exceptions.h>.  Include
+	<viengoos/thread.h> and <viengoos/messenger.h>.
+	* as-dump.c: Include <viengoos/thread.h> and
+	<viengoos/messenger.h>.
+	* as-lookup.c: Likewise.
+
+2008-12-17  Neal H. Walfield  <neal@gnu.org>
+
 	* ia32-exception-entry.S: Don't include <hurd/exceptions.h>.
 	Include <hurd/stddef.h>.
 
diff --git a/libhurd-mm/anonymous.h b/libhurd-mm/anonymous.h
index aac7f7b..bdc71ec 100644
--- a/libhurd-mm/anonymous.h
+++ b/libhurd-mm/anonymous.h
@@ -24,7 +24,6 @@
 #include <hurd/pager.h>
 #include <hurd/btree.h>
 #include <viengoos/addr.h>
-#include <hurd/exceptions.h>
 #include <l4/thread.h>
 
 /* Forward.  */
diff --git a/libhurd-mm/as-build.c b/libhurd-mm/as-build.c
index 25ba5b9..c850713 100644
--- a/libhurd-mm/as-build.c
+++ b/libhurd-mm/as-build.c
@@ -25,7 +25,8 @@
 #include <viengoos/cap.h>
 #include <hurd/stddef.h>
 #include <viengoos/folio.h>
-#include <hurd/exceptions.h>
+#include <viengoos/thread.h>
+#include <viengoos/messenger.h>
 #include <hurd/as.h>
 #include <viengoos/misc.h>
 
diff --git a/libhurd-mm/as-dump.c b/libhurd-mm/as-dump.c
index 628b5d3..68051ae 100644
--- a/libhurd-mm/as-dump.c
+++ b/libhurd-mm/as-dump.c
@@ -20,6 +20,8 @@
 
 #include <viengoos/cap.h>
 #include <viengoos/folio.h>
+#include <viengoos/thread.h>
+#include <viengoos/messenger.h>
 #include <hurd/as.h>
 #include <hurd/stddef.h>
 #include <assert.h>
diff --git a/libhurd-mm/as-lookup.c b/libhurd-mm/as-lookup.c
index 0de3c03..38b7072 100644
--- a/libhurd-mm/as-lookup.c
+++ b/libhurd-mm/as-lookup.c
@@ -20,6 +20,8 @@
 
 #include <viengoos/cap.h>
 #include <viengoos/folio.h>
+#include <viengoos/thread.h>
+#include <viengoos/messenger.h>
 #include <hurd/as.h>
 #include <hurd/stddef.h>
 #include <assert.h>
diff --git a/libhurd-mm/as.h b/libhurd-mm/as.h
index b771fe7..7bc4cce 100644
--- a/libhurd-mm/as.h
+++ b/libhurd-mm/as.h
@@ -24,7 +24,6 @@
 
 #include <viengoos/addr.h>
 #include <viengoos/cap.h>
-#include <hurd/exceptions.h>
 #include <stdbool.h>
 #include <l4/types.h>
 
diff --git a/libhurd-mm/exceptions.c b/libhurd-mm/exceptions.c
index 42dfacb..c73bec6 100644
--- a/libhurd-mm/exceptions.c
+++ b/libhurd-mm/exceptions.c
@@ -20,7 +20,6 @@
 
 #include <hurd/startup.h>
 #include <hurd/stddef.h>
-#include <hurd/exceptions.h>
 #include <hurd/storage.h>
 #include <hurd/thread.h>
 #include <hurd/mm.h>
diff --git a/libhurd-mm/map.h b/libhurd-mm/map.h
index d9aedef..afe6841 100644
--- a/libhurd-mm/map.h
+++ b/libhurd-mm/map.h
@@ -133,8 +133,6 @@ BTREE_CLASS (map, struct map, struct region, region, node,
    lock.  */
 extern hurd_btree_map_t maps;
 
-#include <hurd/exceptions.h>
-
 /* Ensure that using the next AMOUNT bytes of stack will not result in
    a fault.  */
 static void __attribute__ ((noinline))
diff --git a/libhurd-mm/message-buffer.c b/libhurd-mm/message-buffer.c
index dfa87c8..faa15de 100644
--- a/libhurd-mm/message-buffer.c
+++ b/libhurd-mm/message-buffer.c
@@ -24,7 +24,6 @@
 #include <hurd/as.h>
 #include <hurd/startup.h>
 #include <hurd/capalloc.h>
-#include <hurd/exceptions.h>
 
 extern struct hurd_startup_data *__hurd_startup_data;      
 
diff --git a/libhurd-mm/mm-init.c b/libhurd-mm/mm-init.c
index 896b69f..90b7112 100644
--- a/libhurd-mm/mm-init.c
+++ b/libhurd-mm/mm-init.c
@@ -24,7 +24,6 @@
 #endif
 
 #include <hurd/startup.h>
-#include <hurd/exceptions.h>
 #include <hurd/thread.h>
 
 #ifdef i386