xnu-3248.60.10.tar.gz

[apple/xnu.git] / libsyscall / custom / __syscall.s

diff --git a/libsyscall/custom/__syscall.s b/libsyscall/custom/__syscall.s
index dae18a83176fad05c28d909128a3ecc249e78d2e..f00894425bff71771e4b775602a68dec7174c34d 100644 (file)
--- a/libsyscall/custom/__syscall.s
+++ b/libsyscall/custom/__syscall.s
@@ -29,11 +29,7 @@
 
 #include "SYS.h"
 
 
 #include "SYS.h"
 

-#if defined(__ppc__) || defined(__ppc64__)
-
-__SYSCALL(__syscall, syscall, 7)
-
-#elif defined(__i386__)
+#if defined(__i386__)

 
 LEAF(___syscall, 0)
        popl    %ecx            // ret addr
 
 LEAF(___syscall, 0)
        popl    %ecx            // ret addr


@@ -43,7 +39,7 @@ LEAF(___syscall, 0)
        movl    (%esp),%edx     // add one element to stack so
        pushl   %ecx            // caller "pop" will work
        jnb     2f
        movl    (%esp),%edx     // add one element to stack so
        pushl   %ecx            // caller "pop" will work
        jnb     2f

-       BRANCH_EXTERN(cerror)
+       BRANCH_EXTERN(tramp_cerror)

 2:
 END(___syscall)
 
 2:
 END(___syscall)
 


@@ -52,7 +48,7 @@ END(___syscall)
 // For x86-64, the kernel slides the argument list for us.
 // The number of arguments here is variable, but our macros ignore
 // that value anyway.
 // For x86-64, the kernel slides the argument list for us.
 // The number of arguments here is variable, but our macros ignore
 // that value anyway.

-__SYSCALL(__syscall, syscall, 0);
+__SYSCALL(___syscall, syscall, 0);

 
 #else
 #error Unsupported architecture
 
 #else
 #error Unsupported architecture