9 files changed, 96 insertions, 10 deletions
diff --git a/sysdeps/unix/configure b/sysdeps/unix/configure
index 249a12907a..1e659d3451 100755
--- a/sysdeps/unix/configure
+++ b/sysdeps/unix/configure
@@ -63,8 +63,8 @@ for unix_function in \
   dup2 lstat mkdir rmdir readlink symlink rename swapon \
   access select getgroups setgroups \
   getitimer setitimer \
-  getdomainname/getdomain=bsd/bsd4.4 \
-  setdomainname/setdomain=bsd/bsd4.4 \
+  getdomainname:getdomain=bsd/bsd4.4 \
+  setdomainname:setdomain=bsd/bsd4.4 \
   fchdir=bsd/bsd4.4 \
   profil=bsd readv=bsd writev=bsd \
   getpriority setpriority \
@@ -78,7 +78,7 @@ do
   unix_srcdir=common
   eval "unix_syscall=`echo $unix_function | \
 		      sed -e 's@=\(.*\)$@ unix_srcdir=\1@' \
-			  -e 's@/\(^=/*\)$@ unix_srcname=\1@'`"
+			  -e 's@:\(.*\)@ unix_srcname=\1@'`"
   test -z "$unix_srcname" && unix_srcname=$unix_syscall
 
   unix_implementor=none
diff --git a/sysdeps/unix/sysv/linux/i386/brk.S b/sysdeps/unix/sysv/linux/i386/brk.S
index 2a9a2bcd24..754ec5ef09 100644
--- a/sysdeps/unix/sysv/linux/i386/brk.S
+++ b/sysdeps/unix/sysv/linux/i386/brk.S
@@ -42,7 +42,7 @@ ENTRY (__brk)
 	movl %edx, %ebx
 
 	cmpl 4(%esp), %eax
-	jne JUMPTARGET(syscall_error)
+	jne syscall_error
 
 #ifdef PIC
 	/* Standard PIC nonsense to store into `__curbrk' through the GOT.  */
diff --git a/sysdeps/unix/sysv/linux/i386/mmap.S b/sysdeps/unix/sysv/linux/i386/mmap.S
index 1d1d628ad5..90ac88c46f 100644
--- a/sysdeps/unix/sysv/linux/i386/mmap.S
+++ b/sysdeps/unix/sysv/linux/i386/mmap.S
@@ -38,7 +38,7 @@ ENTRY (__mmap)
 
 	/* %eax is < 0 if there was an error.  */
 	testl %eax, %eax
-	jl JUMPTARGET(syscall_error)
+	jl syscall_error
 
 	/* Successful; return the syscall's value.  */
 	ret
diff --git a/sysdeps/unix/sysv/linux/i386/sbrk.S b/sysdeps/unix/sysv/linux/i386/sbrk.S
index e38e88f64d..31ed27b9fc 100644
--- a/sysdeps/unix/sysv/linux/i386/sbrk.S
+++ b/sysdeps/unix/sysv/linux/i386/sbrk.S
@@ -77,6 +77,6 @@ ENTRY (__sbrk)
 	.align 16
 .L3:
 	movl %edx, %ebx
-	jmp JUMPTARGET(syscall_error)
+	jmp syscall_error
 
 weak_alias (__sbrk, sbrk)
diff --git a/sysdeps/unix/sysv/linux/i386/sigaction.c b/sysdeps/unix/sysv/linux/i386/sigaction.c
new file mode 100644
index 0000000000..6986290da5
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/i386/sigaction.c
@@ -0,0 +1,86 @@
+/* POSIX.1 `sigaction' call for Linux/i386.
+Copyright (C) 1991, 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>
+#include <errno.h>
+#include <stddef.h>
+#include <signal.h>
+
+
+/* If ACT is not NULL, change the action for SIG to *ACT.
+   If OACT is not NULL, put the old action for SIG in *OACT.  */
+int
+__sigaction (int sig, const struct sigaction *act, struct sigaction *oact)
+{
+  struct sigaction newact;
+  int result;
+
+  if (new)
+    {
+      newact = *new;
+      new = &newact;
+      new->sa_restorer = ((new->sa_flags & SA_NOMASK)
+			  ? &&restore_nomask : &&restore);
+    }
+
+  asm volatile ("pushl %%ebx\n"
+		"movl %1, %%ebx\n"
+		"int $0x80\n"
+		"popl %%ebx"
+		: "=a" (result)
+		: "0" (SYS_ify (sigaction)), "g" (sig), "c" (new), "d" (old));
+
+  if (result < 0)
+    {
+      errno = -result;
+      return -1;
+    }
+  return 0;
+
+ restore:
+  asm (
+#ifdef	PIC
+       "	pushl %ebx\n"
+       "	call 0f\n"
+       "0:	popl %ebx\n"
+       "	addl $_GLOBAL_OFFSET_TABLE_+[.-0b],%ebx\n"
+       "	addl $8, %%esp\n"
+       "	call __sigsetmask@PLT\n"
+       "	addl $8, %%esp\n"
+       "	popl %ebx\n"
+#else
+       "	addl $4, %%esp\n"
+       "	call __sigsetmask\n"
+       "	addl $4, %%esp\n"
+#endif
+       "popl %eax\n"
+       "popl %ecx\n"
+       "popl %edx\n"
+       "popf\n"
+       "ret");
+ restore_nomask:
+  asm ("addl $4, %esp\n"
+       "popl %eax\n"
+       "popl %ecx\n"
+       "popl %edx\n"
+       "popf\n"
+       "ret");
+}
+
+weak_alias (__sigaction, sigaction)
diff --git a/sysdeps/unix/sysv/linux/i386/socket.S b/sysdeps/unix/sysv/linux/i386/socket.S
index b2e6b2603f..5a7d774175 100644
--- a/sysdeps/unix/sysv/linux/i386/socket.S
+++ b/sysdeps/unix/sysv/linux/i386/socket.S
@@ -53,7 +53,7 @@ ENTRY (P(__,socket))
 
 	/* %eax is < 0 if there was an error.  */
 	testl %eax, %eax
-	jl JUMPTARGET(syscall_error)
+	jl syscall_error
 
 	/* Successful; return the syscall's value.  */
 	ret
diff --git a/sysdeps/unix/sysv/linux/i386/syscall.S b/sysdeps/unix/sysv/linux/i386/syscall.S
index 52eb48a9ae..b7b44e76da 100644
--- a/sysdeps/unix/sysv/linux/i386/syscall.S
+++ b/sysdeps/unix/sysv/linux/i386/syscall.S
@@ -27,5 +27,5 @@ ENTRY (syscall)
 	int $0x80		/* Do the system call.  */
 	POPARGS_5		/* Restore register contents.  */
 	testl %eax, %eax	/* Check %eax for error.  */
-	jl JUMPTARGET(syscall_error) /* Jump to error handler if negative.  */
+	jl syscall_error	/* Jump to error handler if negative.  */
 	ret			/* Return to caller.  */
diff --git a/sysdeps/unix/sysv/linux/i386/xmknod.S b/sysdeps/unix/sysv/linux/i386/xmknod.S
index 10778bdceb..e075e52105 100644
--- a/sysdeps/unix/sysv/linux/i386/xmknod.S
+++ b/sysdeps/unix/sysv/linux/i386/xmknod.S
@@ -41,7 +41,7 @@ ENTRY (__xmknod)
 	jmp *%ecx		/* Return success.  */
 
 .L2:	pushl %ecx
-	jmp JUMPTARGET(syscall_error)
+	jmp syscall_error
 				/* Yes, then branch to error handling.  */
 
 /* For compatibility with Linux libc.  */
diff --git a/sysdeps/unix/sysv/linux/i386/xstat.S b/sysdeps/unix/sysv/linux/i386/xstat.S
index 58c5f558c4..b936bb5b69 100644
--- a/sysdeps/unix/sysv/linux/i386/xstat.S
+++ b/sysdeps/unix/sysv/linux/i386/xstat.S
@@ -41,7 +41,7 @@ ENTRY (__xstat)
 	jmp *%ecx		/* Return success.  */
 
 .L2:	pushl %ecx
-	jmp JUMPTARGET(syscall_error)
+	jmp syscall_error
 				/* Yes, then branch to error handling.  */
 
 /* For compatibility with Linux libc.  */