[ros-diffs] [ros-arm-bringup] 34977: - Fix ARM NTOS brekage (and amd64/ppc): - Only build kd/i386 on i386 builds since this code is x86-32 centric. - Only call KdpEnableSafeMem on i386 builds, since the code uses x86-32 centric defines.

[ros-arm-bringup at svn.reactos.org]

Author: ros-arm-bringup
Date: Thu Jul 31 02:31:55 2008
New Revision: 34977

URL: http://svn.reactos.org/svn/reactos?rev=34977&view=rev
Log:
- Fix ARM NTOS brekage (and amd64/ppc):
  - Only build kd/i386 on i386 builds since this code is x86-32 centric.
  - Only call KdpEnableSafeMem on i386 builds, since the code uses x86-32 centric defines.

Modified:
    trunk/reactos/ntoskrnl/kd/kdinit.c
    trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild

Modified: trunk/reactos/ntoskrnl/kd/kdinit.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdinit.c?rev=34977&r1=34976&r2=34977&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/kd/kdinit.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/kd/kdinit.c [iso-8859-1] Thu Jul 31 02:31:55 2008
@@ -258,7 +258,11 @@
         return TRUE;
     }
     else
-	KdpEnableSafeMem();
+    {
+#ifdef _M_IX86
+        KdpEnableSafeMem();
+#endif
+    }
 
     /* Call the Initialization Routines of the Registered Providers */
     KdpCallInitRoutine(BootPhase);

Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild?rev=34977&r1=34976&r2=34977&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Thu Jul 31 02:31:55 2008
@@ -273,9 +273,11 @@
 		</directory>
 	</directory>
 	<directory name="kd">
-		<directory name="i386">
-			<file>kdmemsup.c</file>
-		</directory>
+		<if property="ARCH" value="i386">
+			<directory name="i386">
+				<file>kdmemsup.c</file>
+			</directory>
+		</if>
 	</directory>
 	<if property="_WINKD_" value="0">
 		<directory name="kdbg">