aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog13
-rw-r--r--hurd/hurdfault.c13
-rw-r--r--hurd/hurdinit.c9
-rw-r--r--hurd/hurdsig.c12
-rw-r--r--sysdeps/mach/hurd/fork.c26
-rw-r--r--sysdeps/mach/hurd/spawni.c8
6 files changed, 71 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index f52f98a..392d88c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
2002-01-02 Roland McGrath <roland@frob.com>
+ * hurd/hurdinit.c (_hurd_ports_use): Return error _hurd_ports is null.
+
+ * hurd/hurdsig.c (_hurdsig_init): Conditionalize exception port setup
+ for old CMU and new OSF Mach interface flavors.
+ * hurd/hurdfault.c (_hurdsig_fault_init): Likewise.
+ * sysdeps/mach/hurd/fork.c (__fork): Likewise.
+
+ * hurd/hurdsig.c (_hurd_internal_post_signal): Leave msgh_seqno unset.
+
+ * sysdeps/mach/hurd/spawni.c (__spawni) [KERN_INVALID_LEDGER]:
+ Pass extra arguments to task_create for OSF variant.
+ * sysdeps/mach/hurd/fork.c (__fork): Likewise.
+
* sysdeps/powerpc/elf/libc-start.c: Make AUXVEC diddling code
conditional on [HAVE_AUX_VECTOR].
diff --git a/hurd/hurdfault.c b/hurd/hurdfault.c
index 3c17cc0..e761d36 100644
--- a/hurd/hurdfault.c
+++ b/hurd/hurdfault.c
@@ -1,5 +1,5 @@
/* Handle faults in the signal thread.
- Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1994,95,96,97,2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -156,8 +156,19 @@ _hurdsig_fault_init (void)
assert_perror (err);
/* Direct signal thread exceptions to the proc server. */
+#ifdef THREAD_EXCEPTION_PORT
err = __thread_set_special_port (_hurd_msgport_thread,
THREAD_EXCEPTION_PORT, sigexc);
+#elif defined (EXC_MASK_ALL)
+ __thread_set_exception_ports (_hurd_msgport_thread,
+ EXC_MASK_ALL & ~(EXC_MASK_SYSCALL
+ | EXC_MASK_MACH_SYSCALL
+ | EXC_MASK_RPC_ALERT),
+ sigexc,
+ EXCEPTION_DEFAULT, MACHINE_THREAD_STATE);
+#else
+# error thread_set_exception_ports?
+#endif
__mach_port_deallocate (__mach_task_self (), sigexc);
assert_perror (err);
}
diff --git a/hurd/hurdinit.c b/hurd/hurdinit.c
index dc5e904..7a57031 100644
--- a/hurd/hurdinit.c
+++ b/hurd/hurdinit.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1992,93,94,95,96,97,98,99,2000 Free Software Foundation, Inc.
+/* Copyright (C) 1992,93,94,95,96,97,98,99,2000,01
+ Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -39,6 +40,12 @@ int __libc_argc;
error_t
_hurd_ports_use (int which, error_t (*operate) (mach_port_t))
{
+ if (__builtin_expect (_hurd_ports == NULL, 0))
+ /* This means that _hurd_init has not been called yet, which is
+ normally only the case in the bootstrap filesystem, and there
+ only in the early phases of booting. */
+ return EGRATUITOUS;
+
return HURD_PORT_USE (&_hurd_ports[which], (*operate) (port));
}
diff --git a/hurd/hurdsig.c b/hurd/hurdsig.c
index 748d840..34b28d9 100644
--- a/hurd/hurdsig.c
+++ b/hurd/hurdsig.c
@@ -1030,7 +1030,6 @@ _hurd_internal_post_signal (struct hurd_sigstate *ss,
msg.msgh_local_port = MACH_PORT_NULL;
/* These values do not matter. */
msg.msgh_id = 8675309; /* Jenny, Jenny. */
- msg.msgh_seqno = 17; /* Random. */
ss->suspended = MACH_PORT_NULL;
err = __mach_msg (&msg, MACH_SEND_MSG, sizeof msg, 0,
MACH_PORT_NULL, MACH_MSG_TIMEOUT_NONE,
@@ -1300,8 +1299,19 @@ _hurdsig_init (const int *intarray, size_t intarraysize)
}
/* Receive exceptions on the signal port. */
+#ifdef TASK_EXCEPTION_PORT
__task_set_special_port (__mach_task_self (),
TASK_EXCEPTION_PORT, _hurd_msgport);
+#elif defined (EXC_MASK_ALL)
+ __task_set_exception_ports (__mach_task_self (),
+ EXC_MASK_ALL & ~(EXC_MASK_SYSCALL
+ | EXC_MASK_MACH_SYSCALL
+ | EXC_MASK_RPC_ALERT),
+ _hurd_msgport,
+ EXCEPTION_DEFAULT, MACHINE_THREAD_STATE);
+#else
+# error task_set_exception_port?
+#endif
/* Sanity check. Any pending, unblocked signals should have been
taken by our predecessor incarnation (i.e. parent or pre-exec state)
diff --git a/sysdeps/mach/hurd/fork.c b/sysdeps/mach/hurd/fork.c
index 6aa4345..635110a 100644
--- a/sysdeps/mach/hurd/fork.c
+++ b/sysdeps/mach/hurd/fork.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994,95,96,97,99,2001 Free Software Foundation, Inc.
+/* Copyright (C) 1994,95,96,97,99,2001,02 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -147,7 +147,11 @@ __fork (void)
__thread_abort (_hurd_msgport_thread);
#endif
/* Create the child task. It will inherit a copy of our memory. */
- err = __task_create (__mach_task_self (), 1, &newtask);
+ err = __task_create (__mach_task_self (),
+#ifdef KERN_INVALID_LEDGER
+ NULL, 0, /* OSF Mach */
+#endif
+ 1, &newtask);
}
/* Unlock the global signal state lock, so we do not
@@ -252,9 +256,21 @@ __fork (void)
__mach_port_deallocate (__mach_task_self (), old);
/* The new task will receive its own exceptions
on its message port. */
- if (err = __task_set_special_port (newtask,
- TASK_EXCEPTION_PORT,
- port))
+ if (err =
+#ifdef TASK_EXCEPTION_PORT
+ __task_set_special_port (newtask,
+ TASK_EXCEPTION_PORT,
+ port)
+#elif defined (EXC_MASK_ALL)
+ __task_set_exception_ports
+ (newtask, EXC_MASK_ALL & ~(EXC_MASK_SYSCALL
+ | EXC_MASK_MACH_SYSCALL
+ | EXC_MASK_RPC_ALERT),
+ port, EXCEPTION_DEFAULT, MACHINE_THREAD_STATE)
+#else
+# error task_set_exception_port?
+#endif
+ )
LOSE;
}
if (err = __mach_port_insert_right (newtask,
diff --git a/sysdeps/mach/hurd/spawni.c b/sysdeps/mach/hurd/spawni.c
index 4e2d089..656d9ff 100644
--- a/sysdeps/mach/hurd/spawni.c
+++ b/sysdeps/mach/hurd/spawni.c
@@ -1,5 +1,5 @@
/* spawn a new process running an executable. Hurd version.
- Copyright (C) 2001 Free Software Foundation, Inc.
+ Copyright (C) 2001,02 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -211,7 +211,11 @@ __spawni (pid_t *pid, const char *file,
memory, and then register it as our child like fork does. See fork.c
for comments about the sequencing of these proc operations. */
- err = __task_create (__mach_task_self (), 0, &task);
+ err = __task_create (__mach_task_self (),
+#ifdef KERN_INVALID_LEDGER
+ NULL, 0, /* OSF Mach */
+#endif
+ 0, &task);
if (err)
return __hurd_fail (err);
// From here down we must deallocate TASK and PROC before returning.