From c9c1def2a850dadc5be024a908766aff4b55e778 Mon Sep 17 00:00:00 2001
From: Aleksey Bragin <aleksey@reactos.org>
Date: Tue, 25 Dec 2007 16:22:20 +0000
Subject: [PATCH] - Move preferred stack boundary = 2^2 out of the OPTIMIZE
 switch, because it's always defined. - Remove assumption that GDB=1
 automatically means -O0. This is wrong, optimization and debugger should be
 controlled independently. - Cleanup blah-blah from config.template.rbuild.

svn path=/trunk/; revision=31435
---
 reactos/ReactOS-i386.rbuild    | 40 +++++++++++++++-------------------
 reactos/config.template.rbuild | 18 ++++++---------
 2 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/reactos/ReactOS-i386.rbuild b/reactos/ReactOS-i386.rbuild
index f7fc299b509..b610de1ae5d 100644
--- a/reactos/ReactOS-i386.rbuild
+++ b/reactos/ReactOS-i386.rbuild
@@ -15,31 +15,25 @@
 
 	<property name="NTOSKRNL_SHARED" value="-Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared"/>
 
-	<if property="GDB" value="0">
-		<if property="OPTIMIZE" value="1">
-				<compilerflag>-Os</compilerflag>
-				<compilerflag>-ftracer</compilerflag>
-				<compilerflag>-momit-leaf-frame-pointer</compilerflag>
-				<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
-		</if>
-		<if property="OPTIMIZE" value="2">
-				<compilerflag>-Os</compilerflag>
-				<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
-		</if>
-		<if property="OPTIMIZE" value="3">
-				<compilerflag>-O1</compilerflag>
-				<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
-		</if>
-		<if property="OPTIMIZE" value="4">
-				<compilerflag>-O2</compilerflag>
-				<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
-		</if>
-		<if property="OPTIMIZE" value="5">
-				<compilerflag>-O3</compilerflag>
-				<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
-		</if>
+	<if property="OPTIMIZE" value="1">
+		<compilerflag>-Os</compilerflag>
+		<compilerflag>-ftracer</compilerflag>
+		<compilerflag>-momit-leaf-frame-pointer</compilerflag>
+	</if>
+	<if property="OPTIMIZE" value="2">
+		<compilerflag>-Os</compilerflag>
+	</if>
+	<if property="OPTIMIZE" value="3">
+		<compilerflag>-O1</compilerflag>
+	</if>
+	<if property="OPTIMIZE" value="4">
+		<compilerflag>-O2</compilerflag>
+	</if>
+	<if property="OPTIMIZE" value="5">
+		<compilerflag>-O3</compilerflag>
 	</if>
 
+	<compilerflag>-mpreferred-stack-boundary=2</compilerflag>
 	<compilerflag>-Wno-strict-aliasing</compilerflag>
 	<compilerflag>-Wpointer-arith</compilerflag>
 	<linkerflag>-enable-stdcall-fixup</linkerflag>
diff --git a/reactos/config.template.rbuild b/reactos/config.template.rbuild
index 2808794ad22..3c3948af0c8 100644
--- a/reactos/config.template.rbuild
+++ b/reactos/config.template.rbuild
@@ -31,17 +31,13 @@
 
 
 <!--
-	OPTIMIZE what level do you want ReactOS to be optimized at
-	this setting does not work if GDB is set
-		0 = off
-		1 = Normal compiling recommended, is default setting in official build and debug build
-
-		warning : 2,3,4,5  is not tested on ReactOS. Change at own risk.
-
-		2 = gcc -Oz with -mpreferred-stack-boundary=2
-		3 = gcc -O1 with -mpreferred-stack-boundary=2
-		4 = gcc -O2 with -mpreferred-stack-boundary=2
-		5 = gcc -O3 with -mpreferred-stack-boundary=2
+	What level of optimisation to use.
+		0 = off (will not work)
+		1 = Default option, optimize for size (-Os) with some additional options
+		2 = -Os
+		3 = -O1
+		4 = -O2
+		5 = -O3
 -->
 <property name="OPTIMIZE" value="1" />