diff options
author | Ulrich Drepper <drepper@redhat.com> | 1997-03-19 03:10:36 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1997-03-19 03:10:36 +0000 |
commit | 721869072d9b1e7431f840b493e430617fd654b6 (patch) | |
tree | 550b3128749b140ba650fbf29bb97e42f4c9dda1 /hurd | |
parent | 83bbbdd08cd5f1d8cd06081b9ca19771858ca6a0 (diff) |
Update from 2.1.x branch.
Diffstat (limited to 'hurd')
-rw-r--r-- | hurd/fchroot.c | 39 | ||||
-rw-r--r-- | hurd/getdport.c | 33 | ||||
-rw-r--r-- | hurd/hurd/threadvar.h | 31 | ||||
-rw-r--r-- | hurd/hurdfault.c | 5 | ||||
-rw-r--r-- | hurd/hurdinit.c | 30 | ||||
-rw-r--r-- | hurd/hurdsig.c | 10 | ||||
-rw-r--r-- | hurd/hurdstartup.c | 37 | ||||
-rw-r--r-- | hurd/report-wait.c | 41 |
8 files changed, 122 insertions, 104 deletions
diff --git a/hurd/fchroot.c b/hurd/fchroot.c index 8c8a3b839b..143ea23807 100644 --- a/hurd/fchroot.c +++ b/hurd/fchroot.c @@ -1,22 +1,21 @@ -/* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1991, 92, 93, 94, 95, 96, 97 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 -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ -#include <ansidecl.h> #include <unistd.h> #include <hurd.h> #include <hurd/fd.h> @@ -24,7 +23,7 @@ Cambridge, MA 02139, USA. */ /* Change the current root directory to FD. */ int -DEFUN(fchroot, (fd), int fd) +fchroot (int fd) { error_t err; file_t dir; @@ -36,7 +35,13 @@ DEFUN(fchroot, (fd), int fd) })); if (! err) - _hurd_port_set (&_hurd_ports[INIT_PORT_CRDIR], dir); + { + file_t root; + err = __file_reparent (dir, MACH_PORT_NULL, &root); + __mach_port_deallocate (__mach_task_self (), dir); + if (! err) + _hurd_port_set (&_hurd_ports[INIT_PORT_CRDIR], root); + } return err ? __hurd_fail (err) : 0; } diff --git a/hurd/getdport.c b/hurd/getdport.c index 2204db2ce3..b58832dbe4 100644 --- a/hurd/getdport.c +++ b/hurd/getdport.c @@ -1,26 +1,27 @@ -/* Copyright (C) 1991, 1992, 1994, 1995 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1991, 1992, 1994, 1995, 1997 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 -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include <hurd.h> /* This is initialized in dtable.c when that gets linked in. If dtable.c is not linked in, it will be zero. */ -file_t (*_hurd_getdport_fn) (int fd); +static file_t (*_default_hurd_getdport_fn) (int fd) = 0; +weak_alias (_default_hurd_getdport_fn, _hurd_getdport_fn) file_t __getdport (int fd) @@ -43,7 +44,7 @@ __getdport (int fd) errno = EBADF; return MACH_PORT_NULL; } - else + else { __mach_port_mod_refs (__mach_task_self (), _hurd_init_dtable[fd], MACH_PORT_RIGHT_SEND, 1); diff --git a/hurd/hurd/threadvar.h b/hurd/hurd/threadvar.h index 3d5feaba93..b10efe9ada 100644 --- a/hurd/hurd/threadvar.h +++ b/hurd/hurd/threadvar.h @@ -1,21 +1,21 @@ /* Internal per-thread variables for the Hurd. -Copyright (C) 1994, 1995 Free Software Foundation, Inc. -This file is part of the GNU C Library. + Copyright (C) 1994, 1995, 1997 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 -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #ifndef _HURD_THREADVAR_H #define _HURD_THREADVAR_H @@ -33,7 +33,7 @@ Cambridge, MA 02139, USA. */ stack pointer is ignored; and __hurd_threadvar_stack_offset gives the address of a small allocated region which contains the variables for the single thread. */ - + extern unsigned long int __hurd_threadvar_stack_mask; extern unsigned long int __hurd_threadvar_stack_offset; @@ -60,6 +60,7 @@ enum __hurd_threadvar_index _HURD_THREADVAR_ERRNO, /* `errno' value for this thread. */ _HURD_THREADVAR_SIGSTATE, /* This thread's `struct hurd_sigstate'. */ _HURD_THREADVAR_DYNAMIC_USER, /* Dynamically-assigned user variables. */ + _HURD_THREADVAR_MALLOC, /* For use of malloc. */ _HURD_THREADVAR_MAX /* Default value for __hurd_threadvar_max. */ }; diff --git a/hurd/hurdfault.c b/hurd/hurdfault.c index 2865ff7d34..671f8cb21a 100644 --- a/hurd/hurdfault.c +++ b/hurd/hurdfault.c @@ -1,5 +1,5 @@ /* Handle faults in the signal thread. - Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc. + Copyright (C) 1994, 1995, 1996, 1997 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 @@ -31,6 +31,9 @@ jmp_buf _hurdsig_fault_env; struct hurd_signal_preemptor _hurdsig_fault_preemptor; +/* XXX temporary to deal with spelling fix */ +weak_alias (_hurdsig_fault_preemptor, _hurdsig_fault_preempter) + static mach_port_t forward_sigexc; kern_return_t diff --git a/hurd/hurdinit.c b/hurd/hurdinit.c index 1704fa8879..0d0f4b4ea9 100644 --- a/hurd/hurdinit.c +++ b/hurd/hurdinit.c @@ -1,20 +1,20 @@ -/* Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1992, 93, 94, 95, 96, 97 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 -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include <sys/stat.h> #include <stdlib.h> @@ -31,7 +31,9 @@ struct hurd_port *_hurd_ports; unsigned int _hurd_nports; mode_t _hurd_umask; sigset_t _hurdsig_traced; + char **__libc_argv; +int __libc_argc; error_t diff --git a/hurd/hurdsig.c b/hurd/hurdsig.c index b30134ca5b..6ebd7bed14 100644 --- a/hurd/hurdsig.c +++ b/hurd/hurdsig.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 92, 93, 94, 95, 96, 1996 Free Software Foundation, Inc. +/* Copyright (C) 1991, 92, 93, 94, 95, 96, 97 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 +39,11 @@ thread_t _hurd_msgport_thread; /* Thread which receives task-global signals. */ thread_t _hurd_sigthread; +/* These are set up by _hurdsig_init. */ +unsigned long int __hurd_sigthread_stack_base; +unsigned long int __hurd_sigthread_stack_end; +unsigned long int *__hurd_sigthread_variables; + /* Linked-list of per-thread signal state. */ struct hurd_sigstate *_hurd_sigstates; @@ -424,6 +429,9 @@ abort_all_rpcs (int signo, struct machine_thread_all_state *state, int live) struct hurd_signal_preemptor *_hurdsig_preemptors; sigset_t _hurdsig_preempted_set; +/* XXX temporary to deal with spelling fix */ +weak_alias (_hurdsig_preemptors, _hurdsig_preempters) + /* Mask of stop signals. */ #define STOPSIGS (sigmask (SIGTTIN) | sigmask (SIGTTOU) | \ sigmask (SIGSTOP) | sigmask (SIGTSTP)) diff --git a/hurd/hurdstartup.c b/hurd/hurdstartup.c index cd6922fd2a..543d135120 100644 --- a/hurd/hurdstartup.c +++ b/hurd/hurdstartup.c @@ -1,21 +1,21 @@ /* Initial program startup for running under the GNU Hurd. -Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc. -This file is part of the GNU C Library. + Copyright (C) 1991, 92, 93, 94, 95, 96, 97 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 -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include <errno.h> #include <stdlib.h> @@ -35,15 +35,6 @@ Cambridge, MA 02139, USA. */ mach_port_t *_hurd_init_dtable; mach_msg_type_number_t _hurd_init_dtablesize; -unsigned int __hurd_threadvar_max; -unsigned long int __hurd_threadvar_stack_mask; -unsigned long int __hurd_threadvar_stack_offset; - -/* These are set up by _hurdsig_init. */ -unsigned long int __hurd_sigthread_stack_base; -unsigned long int __hurd_sigthread_stack_end; -unsigned long int *__hurd_sigthread_variables; - extern void __mach_init (void); /* Entry point. This is the first thing in the text segment. diff --git a/hurd/report-wait.c b/hurd/report-wait.c index 491b566d04..e8f4f1af4a 100644 --- a/hurd/report-wait.c +++ b/hurd/report-wait.c @@ -1,21 +1,21 @@ /* Report on what a thread in our task is waiting for. -Copyright (C) 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. + Copyright (C) 1996, 1997 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 -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include <hurd.h> #include <hurd/signal.h> @@ -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 { |