aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/generic/Makefile5
-rw-r--r--sysdeps/i386/i586/memcopy.h26
-rw-r--r--sysdeps/mach/hurd/Makefile3
-rw-r--r--sysdeps/mach/hurd/dl-sysdep.c8
-rw-r--r--sysdeps/mach/hurd/fchdir.c10
-rw-r--r--sysdeps/mach/hurd/fork.c6
-rw-r--r--sysdeps/mach/hurd/i386/intr-msg.h55
-rw-r--r--sysdeps/mach/hurd/i386/trampoline.c16
-rw-r--r--sysdeps/stub/bind.c4
-rw-r--r--sysdeps/stub/connect.c4
-rw-r--r--sysdeps/stub/sendto.c4
-rw-r--r--sysdeps/unix/bsd/sun/sigvec.S26
-rw-r--r--sysdeps/unix/bsd/sun/syscalls.list1
-rw-r--r--sysdeps/unix/configure.in8
-rw-r--r--sysdeps/unix/make_errlist.c10
15 files changed, 118 insertions, 68 deletions
diff --git a/sysdeps/generic/Makefile b/sysdeps/generic/Makefile
index 665d1cc..5e1032a 100644
--- a/sysdeps/generic/Makefile
+++ b/sysdeps/generic/Makefile
@@ -53,9 +53,10 @@ $(objpfx)siglist.c: $(objpfx)make_siglist
mv $@-tmp $@
$(objpfx)make_siglist: $(sysdep_dir)/generic/make_siglist.c
+ signum_h=`cd $(dir $(firstword $(wildcard \
+ $(+sysdep_dirs:%=%/signum.h)))); pwd`/signum.h; \
$(native-compile) \
- -DSIGNUM_H=\"`cd $(dir $(firstword $(wildcard \
- $(+sysdep_dirs:%=%/signum.h)))); pwd`/signum.h\"
+ -DSIGNUM_H=\"$${signum_h}\"
generated := $(generated) make_siglist siglist.c
endif
diff --git a/sysdeps/i386/i586/memcopy.h b/sysdeps/i386/i586/memcopy.h
index 0a87687..d892898 100644
--- a/sysdeps/i386/i586/memcopy.h
+++ b/sysdeps/i386/i586/memcopy.h
@@ -1,5 +1,5 @@
/* memcopy.h -- definitions for memory copy functions. Pentium version.
- Copyright (C) 1994, 1995 Free Software Foundation, Inc.
+ Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
Contributed by Torbjorn Granlund (tege@sics.se).
This file is part of the GNU C Library.
@@ -33,11 +33,14 @@ Cambridge, MA 02139, USA. */
{ \
asm volatile ("subl $32,%2\n" \
"js 2f\n" \
+ "movl 0(%0),%%edx\n" /* alloc dest line */ \
"1:\n" \
- "movl 0(%1),%%eax\n" \
- "movl 4(%1),%%edx\n" \
- "movl %%eax,0(%0)\n" \
- "movl %%edx,4(%0)\n" \
+ "movl 28(%0),%%eax\n" /* alloc dest line */ \
+ "subl $32,%2\n" /* decr loop count */ \
+ "movl 0(%1),%%eax\n" /* U pipe */ \
+ "movl 4(%1),%%edx\n" /* V pipe */ \
+ "movl %%eax,0(%0)\n" /* U pipe */ \
+ "movl %%edx,4(%0)\n" /* V pipe */ \
"movl 8(%1),%%eax\n" \
"movl 12(%1),%%edx\n" \
"movl %%eax,8(%0)\n" \
@@ -50,9 +53,8 @@ Cambridge, MA 02139, USA. */
"movl 28(%1),%%edx\n" \
"movl %%eax,24(%0)\n" \
"movl %%edx,28(%0)\n" \
- "addl $32,%1\n" \
- "addl $32,%0\n" \
- "subl $32,%2\n" \
+ "leal 32(%1),%1\n" /* update src ptr */ \
+ "leal 32(%0),%0\n" /* update dst ptr */ \
"jns 1b\n" \
"2: addl $32,%2" : \
"=r" (dst_bp), "=r" (src_bp), "=r" (nbytes_left) : \
@@ -66,7 +68,10 @@ Cambridge, MA 02139, USA. */
{ \
asm volatile ("subl $32,%2\n" \
"js 2f\n" \
+ "movl -4(%0),%%edx\n" \
"1:\n" \
+ "movl -32(%0),%%eax\n" \
+ "subl $32,%2\n" \
"movl -4(%1),%%eax\n" \
"movl -8(%1),%%edx\n" \
"movl %%eax,-4(%0)\n" \
@@ -83,9 +88,8 @@ Cambridge, MA 02139, USA. */
"movl -32(%1),%%edx\n" \
"movl %%eax,-28(%0)\n" \
"movl %%edx,-32(%0)\n" \
- "subl $32,%1\n" \
- "subl $32,%0\n" \
- "subl $32,%2\n" \
+ "leal -32(%1),%1\n" \
+ "leal -32(%0),%0\n" \
"jns 1b\n" \
"2: addl $32,%2" : \
"=r" (dst_ep), "=r" (src_ep), "=r" (nbytes_left) : \
diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile
index c650f5f..462eb23 100644
--- a/sysdeps/mach/hurd/Makefile
+++ b/sysdeps/mach/hurd/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1993, 1994, 1995 Free Software Foundation, Inc.
+# Copyright (C) 1993, 1994, 1995, 1996 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
@@ -65,6 +65,7 @@ vpath hurd/%.h $(hurd-srcdir)
# This bypasses all the system call stubs and uses any existing posix or
# generic C files instead.
inhibit-sysdep-asm += unix*
+inhibit-unix-syscalls = yes
# Don't try to generate anything from the installed Unix system and its
# libraries. That is only of use when building for a Unix system, so as to
diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c
index fece47b..21f94f8 100644
--- a/sysdeps/mach/hurd/dl-sysdep.c
+++ b/sysdeps/mach/hurd/dl-sysdep.c
@@ -48,14 +48,18 @@ unsigned int __hurd_threadvar_max = _HURD_THREADVAR_MAX;
static unsigned long int threadvars[_HURD_THREADVAR_MAX];
unsigned long int __hurd_threadvar_stack_offset
= (unsigned long int) &threadvars;
+unsigned long int __hurd_sigthread_stack_base;
+unsigned long int __hurd_sigthread_stack_end;
+unsigned long int *__hurd_sigthread_variables;
+unsigned long int __hurd_threadvar_stack_mask;
/* XXX loser kludge for vm_map kernel bug */
static vm_address_t fmha;
static vm_size_t fmhs;
-static void unfmh(){
+static void unfmh(void){
__vm_deallocate(__mach_task_self(),fmha,fmhs);}
-static void fmh() {
+static void fmh(void) {
error_t err;int x;mach_port_t p;
vm_address_t a=0x08000000U,max=VM_MAX_ADDRESS;
while (!(err=__vm_region(__mach_task_self(),&a,&fmhs,&x,&x,&x,&x,&p,&x))){
diff --git a/sysdeps/mach/hurd/fchdir.c b/sysdeps/mach/hurd/fchdir.c
index 7c1be4f..23fde24 100644
--- a/sysdeps/mach/hurd/fchdir.c
+++ b/sysdeps/mach/hurd/fchdir.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 93, 94, 95, 96 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,9 +31,11 @@ DEFUN(fchdir, (fd), int fd)
error_t err;
file_t dir;
- err = HURD_DPORT_USE (fd, (dir = __file_name_lookup_under (port, "",
- O_EXEC, 0),
- errno));
+ err = HURD_DPORT_USE (fd,
+ ({
+ dir = __file_name_lookup_under (port, "", O_EXEC, 0);
+ dir == MACH_PORT_NULL ? errno : 0;
+ }));
if (! err)
_hurd_port_set (&_hurd_ports[INIT_PORT_CWDIR], dir);
diff --git a/sysdeps/mach/hurd/fork.c b/sysdeps/mach/hurd/fork.c
index 8c6ef12..8d730ae 100644
--- a/sysdeps/mach/hurd/fork.c
+++ b/sysdeps/mach/hurd/fork.c
@@ -252,6 +252,12 @@ __fork (void)
if (old != MACH_PORT_NULL)
/* XXX what to do here? */
__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))
+ LOSE;
}
if (err = __mach_port_insert_right (newtask,
portnames[i],
diff --git a/sysdeps/mach/hurd/i386/intr-msg.h b/sysdeps/mach/hurd/i386/intr-msg.h
index 353a6d2..43d244a 100644
--- a/sysdeps/mach/hurd/i386/intr-msg.h
+++ b/sysdeps/mach/hurd/i386/intr-msg.h
@@ -1,5 +1,5 @@
/* Machine-dependent details of interruptible RPC messaging. i386 version.
-Copyright (C) 1995 Free Software Foundation, Inc.
+Copyright (C) 1995, 1996 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
@@ -45,3 +45,56 @@ INTR_MSG_BACK_OUT (struct i386_thread_state *state)
else
state->ecx = state->uesp;
}
+
+#include "hurdfault.h"
+
+static inline int
+SYSCALL_EXAMINE (struct i386_thread_state *state, int *callno)
+{
+ struct { unsigned int c[2]; } *p = (void *) (state->eip - 7);
+ int result;
+ if (_hurdsig_catch_memory_fault (p))
+ return 0;
+ if (result = p->c[0] == 0x0000009a && (p->c[1] & 0x00ffffff) == 0x00000700)
+ /* The PC is just after an `lcall $7,$0' instruction.
+ This is a system call in progress; %eax holds the call number. */
+ *callno = state->eax;
+ _hurdsig_end_catch_fault ();
+ return result;
+}
+
+
+struct mach_msg_trap_args
+ {
+ void *retaddr; /* Address mach_msg_trap will return to. */
+ /* This is the order of arguments to mach_msg_trap. */
+ mach_msg_header_t *msg;
+ mach_msg_option_t option;
+ mach_msg_size_t send_size;
+ mach_msg_size_t rcv_size;
+ mach_port_t rcv_name;
+ mach_msg_timeout_t timeout;
+ mach_port_t notify;
+ };
+
+
+static inline mach_port_t
+MSG_EXAMINE (struct i386_thread_state *state, int *msgid)
+{
+ const struct mach_msg_trap_args *args = (const void *) state->uesp;
+ mach_msg_header_t *msg;
+ mach_port_t send_port;
+
+ if (_hurdsig_catch_memory_fault (args))
+ return MACH_PORT_NULL;
+ msg = args->msg;
+ _hurdsig_end_catch_fault ();
+
+ if (_hurdsig_catch_memory_fault (msg))
+ return MACH_PORT_NULL;
+ send_port = msg->msgh_remote_port;
+ *msgid = msg->msgh_id;
+ _hurdsig_end_catch_fault ();
+
+ return send_port;
+}
diff --git a/sysdeps/mach/hurd/i386/trampoline.c b/sysdeps/mach/hurd/i386/trampoline.c
index f64539a..bd91c24 100644
--- a/sysdeps/mach/hurd/i386/trampoline.c
+++ b/sysdeps/mach/hurd/i386/trampoline.c
@@ -23,21 +23,9 @@ Cambridge, MA 02139, USA. */
#include <assert.h>
#include <errno.h>
#include "hurdfault.h"
+#include "intr-msg.h"
-struct mach_msg_trap_args
- {
- void *retaddr; /* Address mach_msg_trap will return to. */
- /* This is the order of arguments to mach_msg_trap. */
- mach_msg_header_t *msg;
- mach_msg_option_t option;
- mach_msg_size_t send_size;
- mach_msg_size_t rcv_size;
- mach_port_t rcv_name;
- mach_msg_timeout_t timeout;
- mach_port_t notify;
- };
-
struct sigcontext *
_hurd_setup_sighandler (struct hurd_sigstate *ss, __sighandler_t handler,
int signo, long int sigcode,
@@ -94,7 +82,7 @@ _hurd_setup_sighandler (struct hurd_sigstate *ss, __sighandler_t handler,
per-thread variables, cthreads. */
}
/* This code has intimate knowledge of the special mach_msg system call
- done in intr-msg.c; that code does:
+ done in intr-msg.c; that code does (see intr-msg.h):
movl %esp, %ecx
leal ARGS, %esp
_hurd_intr_rpc_msg_cx_sp: movl $-25, %eax
diff --git a/sysdeps/stub/bind.c b/sysdeps/stub/bind.c
index 9a744ef..38ad46a 100644
--- a/sysdeps/stub/bind.c
+++ b/sysdeps/stub/bind.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1996 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
@@ -23,7 +23,7 @@ Cambridge, MA 02139, USA. */
/* Give the socket FD the local address ADDR (which is LEN bytes long). */
int
DEFUN(bind, (fd, addr, len),
- int fd AND struct sockaddr *addr AND size_t len)
+ int fd AND const struct sockaddr *addr AND size_t len)
{
errno = ENOSYS;
return -1;
diff --git a/sysdeps/stub/connect.c b/sysdeps/stub/connect.c
index 8e6c724..49300f3 100644
--- a/sysdeps/stub/connect.c
+++ b/sysdeps/stub/connect.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1996 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
@@ -26,7 +26,7 @@ Cambridge, MA 02139, USA. */
Return 0 on success, -1 for errors. */
int
DEFUN(connect, (fd, addr, len),
- int fd AND struct sockaddr *addr AND size_t len)
+ int fd AND const struct sockaddr *addr AND size_t len)
{
errno = ENOSYS;
return -1;
diff --git a/sysdeps/stub/sendto.c b/sysdeps/stub/sendto.c
index f2253b1..e26c887 100644
--- a/sysdeps/stub/sendto.c
+++ b/sysdeps/stub/sendto.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 1996 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
@@ -25,7 +25,7 @@ Cambridge, MA 02139, USA. */
int
DEFUN(sendto, (fd, buf, n, flags, addr, addr_len),
int fd AND PTR buf AND size_t n AND int flags AND
- struct sockaddr *addr AND size_t addr_len)
+ const struct sockaddr *addr AND size_t addr_len)
{
errno = ENOSYS;
return -1;
diff --git a/sysdeps/unix/bsd/sun/sigvec.S b/sysdeps/unix/bsd/sun/sigvec.S
deleted file mode 100644
index c093974..0000000
--- a/sysdeps/unix/bsd/sun/sigvec.S
+++ /dev/null
@@ -1,26 +0,0 @@
-/* Copyright (C) 1991, 1992, 1995 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 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. */
-
-#include <sysdep.h>
-
-/* __sigvec is defined by sigtramp.c. */
-
-PSEUDO (__raw_sigvec, sigvec, 3)
- ret
-
-weak_alias (__sigvec, sigvec)
diff --git a/sysdeps/unix/bsd/sun/syscalls.list b/sysdeps/unix/bsd/sun/syscalls.list
index b9dca13..1c0d44d 100644
--- a/sysdeps/unix/bsd/sun/syscalls.list
+++ b/sysdeps/unix/bsd/sun/syscalls.list
@@ -1,3 +1,4 @@
# File name Caller Syscall name # args Strong name Weak names
getdents - getdirentries 4 __getdirentries getdirentries
+sigvec - sigvec 3 __raw_sigvec
diff --git a/sysdeps/unix/configure.in b/sysdeps/unix/configure.in
new file mode 100644
index 0000000..37b6a5b
--- /dev/null
+++ b/sysdeps/unix/configure.in
@@ -0,0 +1,8 @@
+sinclude(./aclocal.m4)dnl Autoconf lossage
+GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
+# Local configure fragment for sysdeps/unix.
+
+if test -z "$inhibit_glue"; then
+# For make_errlist.c, used in make_errlist.
+AC_CHECK_FUNCS(strerror)
+fi
diff --git a/sysdeps/unix/make_errlist.c b/sysdeps/unix/make_errlist.c
index 8c2b250..0c6a7d9 100644
--- a/sysdeps/unix/make_errlist.c
+++ b/sysdeps/unix/make_errlist.c
@@ -21,7 +21,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* Make a definition for sys_errlist. */
extern int sys_nerr;
+#ifndef HAVE_STRERROR
extern char *sys_errlist[];
+#endif
int
main ()
@@ -35,7 +37,13 @@ main ()
puts ("CONST char *CONST _sys_errlist[] =\n {");
for (i = 0; i < sys_nerr; ++i)
- printf (" \"%s\",\n", sys_errlist[i]);
+ printf (" \"%s\",\n",
+#ifdef HAVE_STRERROR
+ strerror (i)
+#else /* ! HAVE_STRERROR */
+ sys_errlist[i]
+#endif /* HAVE_STRERROR */
+ );
puts (" NULL\n };\n");
generated by cgit v1.1 at 2024-12-23 08:15:14 +0000