[ros-diffs] [dgorbachev] 38401: - Change description of what OARCH option does. - Add a separate TUNE option.

Author: dgorbachev
Date: Sat Dec 27 23:12:45 2008
New Revision: 38401

URL: http://svn.reactos.org/svn/reactos?rev=38401&view=rev
Log:
- Change description of what OARCH option does.
- Add a separate TUNE option.

Modified:
    trunk/reactos/config-arm.template.rbuild
    trunk/reactos/config-ppc.template.rbuild
    trunk/reactos/config.template.rbuild
    trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp

Modified: trunk/reactos/config-arm.template.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/config-arm.template.rbuild…
==============================================================================
--- trunk/reactos/config-arm.template.rbuild [iso-8859-1] (original)
+++ trunk/reactos/config-arm.template.rbuild [iso-8859-1] Sat Dec 27 23:12:45 2008
@@ -22,12 +22,18 @@
 
 
 <!--
-	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="" />
 
 
 <!--

Modified: trunk/reactos/config-ppc.template.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/config-ppc.template.rbuild…
==============================================================================
--- trunk/reactos/config-ppc.template.rbuild [iso-8859-1] (original)
+++ trunk/reactos/config-ppc.template.rbuild [iso-8859-1] Sat Dec 27 23:12:45 2008
@@ -15,19 +15,23 @@
 
 <!--
 	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="" />
 
 
 <!--

Modified: trunk/reactos/config.template.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/config.template.rbuild?rev…
==============================================================================
--- trunk/reactos/config.template.rbuild [iso-8859-1] (original)
+++ trunk/reactos/config.template.rbuild [iso-8859-1] Sat Dec 27 23:12:45 2008
@@ -21,13 +21,23 @@
 
 
 <!--
-	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" />
 
 
 <!--

Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw…
==============================================================================
--- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original)
+++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Sat Dec 27 23:12:45
2008
@@ -537,6 +537,9 @@
 	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" );