From eb68ff54bac83b01957a50a71ea26913e18fb702 Mon Sep 17 00:00:00 2001
From: Dmitry Gorbachev <gorbachev@reactos.org>
Date: Sun, 28 Dec 2008 05:12:45 +0000
Subject: [PATCH] - Change description of what OARCH option does. - Add a
 separate TUNE option.

svn path=/trunk/; revision=38401
---
 reactos/config-arm.template.rbuild           | 10 ++++++++--
 reactos/config-ppc.template.rbuild           | 14 +++++++++-----
 reactos/config.template.rbuild               | 18 ++++++++++++++----
 reactos/tools/rbuild/backend/mingw/mingw.cpp |  3 +++
 4 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/reactos/config-arm.template.rbuild b/reactos/config-arm.template.rbuild
index 68f76047b35..1103510d243 100644
--- a/reactos/config-arm.template.rbuild
+++ b/reactos/config-arm.template.rbuild
@@ -22,14 +22,20 @@
 
 
 <!--
-	Which CPU ReactOS should be optimized for. Specify one of:
+	Generate instructions for this CPU type. Specify one of:
 		armv5te
 
-	See GCC manual for more CPU names and which CPUs GCC can optimize for.
+	See GCC manual for more CPU names.
 -->
 <property name="OARCH" value="armv5te" />
 
 
+<!--
+	Which CPU ReactOS should be optimized for. See GCC manual for CPU names.
+-->
+<property name="TUNE" value="" />
+
+
 <!--
 	What level of optimisation to use.
 		0 = off (will not work)
diff --git a/reactos/config-ppc.template.rbuild b/reactos/config-ppc.template.rbuild
index 316bb52b5f5..a13c0db72e0 100644
--- a/reactos/config-ppc.template.rbuild
+++ b/reactos/config-ppc.template.rbuild
@@ -15,20 +15,24 @@
 
 <!--
 	Sub-architecture to build for. Specify one of:
-		xbox
+		??
 -->
 <property name="SARCH" value="" />
 
 
 <!--
-	Which CPU ReactOS should be optimized for. Specify one of:
-		i486, i586, pentium, pentium2, pentium3, pentium4, athlon-xp, athlon-mp,
-		k6-2
+	Generate instructions for this CPU type. Specify one of:
+		??
 
-	See GCC manual for more CPU names and which CPUs GCC can optimize for.
+	See GCC manual for more CPU names.
 -->
 <property name="OARCH" value="" />
 
+<!--
+	Which CPU ReactOS should be optimized for. See GCC manual for CPU names.
+-->
+<property name="TUNE" value="" />
+
 
 <!--
 	Whether to compile for an uniprocessor or multiprocessor machine.
diff --git a/reactos/config.template.rbuild b/reactos/config.template.rbuild
index ae5fba33f1e..799fecdeacc 100644
--- a/reactos/config.template.rbuild
+++ b/reactos/config.template.rbuild
@@ -21,15 +21,25 @@
 
 
 <!--
-	Which CPU ReactOS should be optimized for. Specify one of:
-		i486, i586, pentium, pentium2, pentium3, pentium4, athlon-xp, athlon-mp,
-		k6-2
+	Generate instructions for this CPU type. Specify one of:
+		native, i386, i486, pentium, pentium-mmx, pentiumpro, i686,
+		pentium2, pentium3, pentium-m, pentium4, prescott, nocona,
+		core2, k6, k6-2, athlon, athlon-xp, opteron, opteron-sse3,
+		barcelona, winchip-c6, winchip2, c3, c3-2, geode
 
-	See GCC manual for more CPU names and which CPUs GCC can optimize for.
+	See GCC manual for more CPU names.
 -->
 <property name="OARCH" value="pentium" />
 
 
+<!--
+	Which CPU ReactOS should be optimized for. Specify one of the above
+	CPUs or generic. When this option is not used, GCC will optimize for
+	the processor specified by OARCH.
+-->
+<property name="TUNE" value="i686" />
+
+
 <!--
 	What level of optimisation to use.
 		0 = off (will not work)
diff --git a/reactos/tools/rbuild/backend/mingw/mingw.cpp b/reactos/tools/rbuild/backend/mingw/mingw.cpp
index 1249ba6ca18..12b88e33f86 100644
--- a/reactos/tools/rbuild/backend/mingw/mingw.cpp
+++ b/reactos/tools/rbuild/backend/mingw/mingw.cpp
@@ -537,6 +537,9 @@ MingwBackend::GenerateGlobalVariables () const
 	fprintf ( fMakefile, "ifneq ($(OARCH),)\n" );
 	fprintf ( fMakefile, "PROJECT_GCCOPTIONS += -march=$(OARCH)\n" );
 	fprintf ( fMakefile, "endif\n" );
+	fprintf ( fMakefile, "ifneq ($(TUNE),)\n" );
+	fprintf ( fMakefile, "PROJECT_GCCOPTIONS += -mtune=$(TUNE)\n" );
+	fprintf ( fMakefile, "endif\n" );
 	fprintf ( fMakefile, "PROJECT_CFLAGS = $(PROJECT_GCCOPTIONS) $(PROJECT_GCC_CFLAGS)\n" );
 	fprintf ( fMakefile, "PROJECT_CXXFLAGS = $(PROJECT_GCCOPTIONS) $(PROJECT_GCC_CXXFLAGS)\n" );
 	fprintf ( fMakefile, "\n" );