[CMAKE]

move the EXTERN _KiSystemService:PROC from syscalls.inc to zw.S. Fixes build of ntdll with MSVC

svn path=/branches/cmake-bringup/; revision=51180

diff --git a/include/asm/syscalls.inc b/include/asm/syscalls.inc
index 19b2142..a0d2832 100644 (file)
--- a/include/asm/syscalls.inc
+++ b/include/asm/syscalls.inc
@@ -1,6 +1,5 @@
 
 #ifdef _M_IX86
 
 #ifdef _M_IX86

-EXTERN _KiSystemService:PROC

 #define KUSER_SHARED_SYSCALL HEX(7ffe0300)
 #define KGDT_R0_CODE 8
 MACRO(STUBCODE_U, SyscallId, StackBytes)
 #define KUSER_SHARED_SYSCALL HEX(7ffe0300)
 #define KGDT_R0_CODE 8
 MACRO(STUBCODE_U, SyscallId, StackBytes)


@@ -18,7 +17,6 @@ MACRO(STUBCODE_K, SyscallId, StackBytes)
     ret StackBytes
 ENDM
 #elif defined(_M_AMD64)
     ret StackBytes
 ENDM
 #elif defined(_M_AMD64)

-EXTERN KiSystemService:PROC

 MACRO(STUBCODE_U, SyscallId, StackBytes)
     mov eax, SyscallId
     mov r10, rcx
 MACRO(STUBCODE_U, SyscallId, StackBytes)
     mov eax, SyscallId
     mov r10, rcx

diff --git a/ntoskrnl/ex/zw.S b/ntoskrnl/ex/zw.S
index c619b9e..bacead4 100644 (file)
--- a/ntoskrnl/ex/zw.S
+++ b/ntoskrnl/ex/zw.S
@@ -2,6 +2,12 @@
 #include <asm.inc>
 #include <syscalls.inc>
 
 #include <asm.inc>
 #include <syscalls.inc>
 

+#ifdef _M_IX86
+EXTERN _KiSystemService:PROC
+#elif defined(_M_AMD64)
+EXTERN KiSystemService:PROC
+#endif
+

 .code
 
 SyscallId = 0
 .code
 
 SyscallId = 0