1 files changed, 50 insertions, 20 deletions

diff --git a/newlib/libc/sys/linux/machine/i386/syscall.h b/newlib/libc/sys/linux/machine/i386/syscall.h
index b165f0442..380f1bcdf 100644
--- a/newlib/libc/sys/linux/machine/i386/syscall.h
+++ b/newlib/libc/sys/linux/machine/i386/syscall.h
@@ -68,58 +68,78 @@ __asm__ volatile ("push %%ebx; lea 8(%%ebp),%%ebx; int $0x80; pop %%ebx" \
 	: "=a" (ret) \
 	: "0" (__NR_##name));
 
-#undef _syscall0
-#define _syscall0(type,name) \
+#undef _syscall0_base
+#define _syscall0_base(type,name) \
 type __libc_##name (void) \
 { \
 long __res; \
 __inline_syscall0(name,__res) \
 __syscall_return(type,__res); \
-} \
+}
+
+#undef _syscall0
+#define _syscall0(type,name) \
+_syscall0_base(type,name) \
 weak_alias(__libc_##name,name);
 
-#undef _syscall1
-#define _syscall1(type,name,type1,arg1) \
+#undef _syscall1_base
+#define _syscall1_base(type,name,type1,arg1) \
 type __libc_##name (type1 arg1) \
 { \
 long __res; \
 __inline_syscall1(name,__res,arg1) \
 __syscall_return(type,__res); \
-} \
+}
+
+#undef _syscall1
+#define _syscall1(type,name,type1,arg1) \
+_syscall1_base(type,name,type1,arg1) \
 weak_alias(__libc_##name,name);
 
-#undef _syscall2
-#define _syscall2(type,name,type1,arg1,type2,arg2) \
+#undef _syscall2_base
+#define _syscall2_base(type,name,type1,arg1,type2,arg2) \
 type __libc_##name (type1 arg1,type2 arg2) \
 { \
 long __res; \
 __inline_syscall2(name,__res,arg1,arg2) \
 __syscall_return(type,__res); \
-} \
+}
+
+#undef _syscall2
+#define _syscall2(type,name,type1,arg1,type2,arg2) \
+_syscall2_base(type,name,type1,arg1,type2,arg2) \
 weak_alias(__libc_##name,name);
 
-#undef _syscall3
-#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
+#undef _syscall3_base
+#define _syscall3_base(type,name,type1,arg1,type2,arg2,type3,arg3) \
 type __libc_##name (type1 arg1,type2 arg2,type3 arg3) \
 { \
 long __res; \
 __inline_syscall3(name,__res,arg1,arg2,arg3) \
 __syscall_return(type,__res); \
-} \
+}
+
+#undef _syscall3
+#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
+_syscall3_base(type,name,type1,arg1,type2,arg2,type3,arg3) \
 weak_alias(__libc_##name,name);
 
-#undef _syscall4
-#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
+#undef _syscall4_base
+#define _syscall4_base(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
 type __libc_##name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
 { \
 long __res; \
 __inline_syscall4(name,__res,arg1,arg2,arg3,arg4) \
 __syscall_return(type,__res); \
-} \
+}
+
+#undef _syscall4
+#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
+_syscall4_base(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
 weak_alias(__libc_##name,name);
 
-#undef _syscall5
-#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
+#undef _syscall5_base
+#define _syscall5_base(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
           type5,arg5) \
 type __libc_##name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
 { \
@@ -127,17 +147,27 @@ long __res; \
 __inline_syscall5(name,__res,arg1,arg2,arg3,arg4,arg5) \
 __syscall_return(type,__res); \
 } \
+
+#undef _syscall5
+#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
+          type5,arg5) \
+_syscall5_base(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \
 weak_alias(__libc_##name,name);
 
-#undef _syscall6
-#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
+#undef _syscall6_base
+#define _syscall6_base(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
           type5,arg5,type6,arg6) \
 type __libc_##name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5,type6 arg6) \
 { \
 long __res; \
 __inline_syscall6(name,__res,arg1,arg2,arg3,arg4,arg5,arg6) \
 __syscall_return(type,__res); \
-} \
+}
+
+#undef _syscall6
+#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
+          type5,arg5,type6,arg6) \
+_syscall6_base(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5,type6,arg6) \
 weak_alias(__libc_##name,name);
 
 #endif /* __PIC__ && __i386__ */