syscall(): create a common version based on INLINE_SYSCALL_NCS()

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

5 files changed, 14 insertions, 78 deletions

diff --git a/libc/sysdeps/linux/bfin/Makefile.arch b/libc/sysdeps/linux/bfin/Makefile.arch
index 81fca3295..4b44ed02c 100644
--- a/libc/sysdeps/linux/bfin/Makefile.arch
+++ b/libc/sysdeps/linux/bfin/Makefile.arch
@@ -5,7 +5,7 @@
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
-CSRC := bsdsetjmp.c clone.c syscall.c \
+CSRC := bsdsetjmp.c clone.c \
 	sram-alloc.c sram-free.c dma-memcpy.c
 
 SSRC := __longjmp.S setjmp.S bsd-_setjmp.S vfork.S
diff --git a/libc/sysdeps/linux/bfin/syscall.c b/libc/sysdeps/linux/bfin/syscall.c
deleted file mode 100644
index d68eb6e2f..000000000
--- a/libc/sysdeps/linux/bfin/syscall.c
+++ /dev/null
@@ -1,49 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/* syscall for blackfin/uClibc
- *
- * Copyright (C) 2004-2006 by Analog Devices Inc.
- * Copyright (C) 2002 by Erik Andersen <andersen@uclibc.org>
- *
- * This program 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.
- *
- * This program 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 this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#include <features.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/syscall.h>
-
-long syscall(long sysnum, long a, long b, long c, long d, long e, long f)
-{
-	int _r0 = 0;
-
-	__asm__ __volatile__ (
-		"excpt 0;"
-		: "=q0" (_r0)
-		: "qA" (sysnum),
-		  "q0" (a),
-		  "q1" (b),
-		  "q2" (c),
-		  "q3" (d),
-		  "q4" (e),
-		  "q5" (f)
-		: "memory", "CC");
-
-	if (_r0 >= (unsigned long) -4095) {
-		(*__errno_location()) = (-_r0);
-		_r0 = (unsigned long) -1;
-	}
-
-	return (long)_r0;
-}
diff --git a/libc/sysdeps/linux/common/syscall.c b/libc/sysdeps/linux/common/syscall.c
new file mode 100644
index 000000000..61f798e2c
--- /dev/null
+++ b/libc/sysdeps/linux/common/syscall.c
@@ -0,0 +1,12 @@
+/*
+ * syscall() library function
+ *
+ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
+ */
+
+#include <sys/syscall.h>
+
+long syscall(long sysnum, long arg1, long arg2, long arg3, long arg4, long arg5, long arg6)
+{
+	return INLINE_SYSCALL_NCS(sysnum, 6, arg1, arg2, arg3, arg4, arg5, arg6);
+}
diff --git a/libc/sysdeps/linux/sh/Makefile.arch b/libc/sysdeps/linux/sh/Makefile.arch
index 2c69f59b8..6df516286 100644
--- a/libc/sysdeps/linux/sh/Makefile.arch
+++ b/libc/sysdeps/linux/sh/Makefile.arch
@@ -7,7 +7,7 @@
 #
 
 CSRC := \
-	mmap.c pipe.c __init_brk.c brk.c sbrk.c syscall.c pread_write.c cacheflush.c
+	mmap.c pipe.c __init_brk.c brk.c sbrk.c pread_write.c cacheflush.c
 
 SSRC := setjmp.S __longjmp.S vfork.S clone.S ___fpscr_values.S
 
diff --git a/libc/sysdeps/linux/sh/syscall.c b/libc/sysdeps/linux/sh/syscall.c
deleted file mode 100644
index ba187c9b7..000000000
--- a/libc/sysdeps/linux/sh/syscall.c
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-#include <features.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/syscall.h>
-
-long syscall(long sysnum,
-			 long arg1, long arg2, long arg3,
-			 long arg4, long arg5, long arg6)
-{
-register long __sc3 __asm__ ("r3") = sysnum;
-register long __sc4 __asm__ ("r4") = (long) arg1;
-register long __sc5 __asm__ ("r5") = (long) arg2;
-register long __sc6 __asm__ ("r6") = (long) arg3;
-register long __sc7 __asm__ ("r7") = (long) arg4;
-register long __sc0 __asm__ ("r0") = (long) arg5;
-register long __sc1 __asm__ ("r1") = (long) arg6;
-__asm__ __volatile__ (
-	"trapa %1"
-	: "=z" (__sc0) \
-	: "i" (__SH_SYSCALL_TRAP_BASE + 6),
-          "0" (__sc0), "r" (__sc4), "r" (__sc5), "r" (__sc6), "r" (__sc7), \
-	  "r" (__sc3), "r" (__sc1) \
-	: "memory" );
-__syscall_return(long,__sc0);
-}