Merge with git+ssh://master.kernel.org/pub/scm/libs/klibc/klibc.git
diff --git a/usr/klibc/arch/i386/syscall.S b/usr/klibc/arch/i386/syscall.S
index 41bcb02..d28717b 100644
--- a/usr/klibc/arch/i386/syscall.S
+++ b/usr/klibc/arch/i386/syscall.S
@@ -41,7 +41,7 @@
__syscall_common_tail:
int $0x80
- cmpl $-4096,%eax
+ cmpl $-4095,%eax
popl %ebp
popl %edi
@@ -59,3 +59,11 @@
ret
.size __syscall_common,.-__syscall_common
+
+#ifndef _REGPARM
+
+ .globl __syscall_varadic
+ .type __syscall_varadic,@function
+__syscall_varadic = __syscall_common
+
+#endif
diff --git a/usr/klibc/arch/i386/varsyscall.S b/usr/klibc/arch/i386/varsyscall.S
index 563844c..24329ea 100644
--- a/usr/klibc/arch/i386/varsyscall.S
+++ b/usr/klibc/arch/i386/varsyscall.S
@@ -33,10 +33,4 @@
.size __syscall_varadic,.-__syscall_varadic
-#else
-
- .globl __syscall_varadic
- .type __syscall_varadic,@function
-__syscall_varadic = __syscall_common
-
#endif
