From f693c55083c7b4ca3ca8a19998d1062964670c97 Mon Sep 17 00:00:00 2001
From: fake <fake@rapidnetworks.de>
Date: Mon, 16 Feb 2004 18:44:24 +0000
Subject: [PATCH] fake: added arm optimisation options offered by gcc

git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2364 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 architecture/arm/config.in   | 53 +++++++++++++++++++++++++++++++++++-
 architecture/arm/gcc-options |  7 ++++-
 2 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/architecture/arm/config.in b/architecture/arm/config.in
index ec2f43bc5..609b8c510 100644
--- a/architecture/arm/config.in
+++ b/architecture/arm/config.in
@@ -27,7 +27,58 @@ choice ROCKCFG_ARM_ENDIANESS EL \
 ROCKCFG_ID="$ROCKCFG_ID-$ROCKCFG_ARM_ENDIANESS"
 
 choice ROCKCFG_ARM_OPT generic   \
-	generic	"No special optimisation"
+	generic	       "No CPU optimisation selected"  \
+	arm2           "arm2 CPU" \
+	arm250         "arm250 CPU" \
+	arm3           "arm3 CPU" \
+	arm6           "arm6 CPU" \
+	arm60          "arm60 CPU" \
+	arm600         "arm600 CPU" \
+	arm610         "arm610 CPU" \
+	arm620         "arm620 CPU" \
+	arm7           "arm7 CPU" \
+	arm7m          "arm7m CPU" \
+	arm7d          "arm7d CPU" \
+	arm7dm         "arm7dm CPU" \
+	arm7di         "arm7di CPU" \
+	arm7dmi        "arm7dmi CPU" \
+	arm70          "arm70 CPU" \
+	arm700         "arm700 CPU" \
+	arm700i        "arm700i CPU" \
+	arm710         "arm710 CPU" \
+	arm710c        "arm710c CPU" \
+	arm7100        "arm7100 CPU" \
+	arm7500        "arm7500 CPU" \
+	arm7500fe      "arm7500fe CPU" \
+	arm7tdmi       "arm7tdmi CPU" \
+	arm8           "arm8 CPU" \
+	strongarm      "strongarm CPU" \
+	strongarm110   "strongarm110 CPU" \
+	strongarm1100  "strongarm1100 CPU" \
+	arm8           "arm8 CPU" \
+	arm810         "arm810 CPU" \
+	arm9           "arm9 CPU" \
+	arm9e          "arm9e CPU" \
+	arm920         "arm920 CPU" \
+	arm920t        "arm920t CPU" \
+	arm940t        "arm940t CPU" \
+	arm9tdmi       "arm9tdmi CPU" \
+	arm10tdmi      "arm10tdmi CPU" \
+	arm1020t       "arm1020t CPU" \
+	xscale         "xscale CPU"
+                                   
+
+choice ROCKCFG_ARM_OPT_ARCH generic   \
+	generic	"No ARM architecture selected" \
+	armv2   "armv2" \
+	armv2a  "armv2a" \
+	armv3   "armv3" \
+	armv3m  "armv3m" \
+	armv4   "armv4" \
+	armv4t  "armv4t" \
+	armv5   "armv5" \
+	armv5t  "armv5t" \
+	armv5te "armv5te"
 
 if [ $ROCKCFG_ARM_OPT != generic ] ; then
 	ROCKCFG_ID="$ROCKCFG_ID-$ROCKCFG_ARM_OPT"
diff --git a/architecture/arm/gcc-options b/architecture/arm/gcc-options
index 5225b5718..6a72394fe 100644
--- a/architecture/arm/gcc-options
+++ b/architecture/arm/gcc-options
@@ -1,5 +1,10 @@
 
 if [ $ROCKCFG_ARM_OPT != generic ] ; then
 	var_append GCC3_WRAPPER_INSERT " " \
-		"-march=$ROCKCFG_ARM_OPT"
+		"-mcpu=$ROCKCFG_ARM_OPT"
+fi
+
+if [ $ROCKCFG_ARM_OPT_ARCH != generic ] ; then
+	var_append GCC3_WRAPPER_INSERT " " \
+		"-march=$ROCKCFG_ARM_OPT_ARCH"
 fi