From a3d7cdabd2cae6a363d7d723cd68215d4ff8f554 Mon Sep 17 00:00:00 2001
From: ReactOS Portable Systems Group <ros-arm-bringup@svn.reactos.org>
Date: Sat, 11 Jul 2009 11:52:22 +0000
Subject: [PATCH] Import the generic template and comment out _M_ARM since the
 toolchain already defines it. THE ARM BUILD STARTS UP AGAIN (all host tools
 and makefiles are generated correctly). NEW TARGET TOOLCHAIN IS NOW CEGCC
 0.55 (GCC-4.4.0).

svn path=/trunk/; revision=41866
---
 reactos/ReactOS-arm.rbuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/reactos/ReactOS-arm.rbuild b/reactos/ReactOS-arm.rbuild
index 7b49df8c677..de897e8629c 100644
--- a/reactos/ReactOS-arm.rbuild
+++ b/reactos/ReactOS-arm.rbuild
@@ -7,9 +7,9 @@
 		</xi:fallback>
 	</xi:include>
 
-	<xi:include href="baseaddress.rbuild" />
+    <xi:include href="ReactOS-generic.rbuild" />
                 
-    <define name="_M_ARM" />
+    <!-- <define name="_M_ARM" /> Already defined by toolchain -->
 	<define name="_ARM_" />
 	<define name="__arm__" />
 	<define name="TARGET_arm" host="true" />