CVS: theedge/var/lib/lunar/menu optimize.menu,1.15,1.16

[Terry Chan]

Update of /var/cvs/lunar/theedge/var/lib/lunar/menu
In directory dbguin.lunar-linux.org:/tmp/cvs-serv10775/menu

Modified Files:
	optimize.menu 
Log Message:
Updated the SPARC sections of optimize.lunar and optimize.menu.  Still needs
some work in the CPU hint section as "cat /proc/cpuinfo" does NOT return a
"model type" string -- instead it returns a "type" string and a "cpu" string.


Index: optimize.menu
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/menu/optimize.menu,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- optimize.menu	13 Jul 2003 20:49:55 -0000	1.15
+++ optimize.menu	19 Oct 2003 04:36:53 -0000	1.16
@@ -68,7 +68,7 @@
              MENU="Basic Optimization"
         None_HELP="-O0"
         Fast_HELP="-O1"
-      Faster_HELP="-02"
+      Faster_HELP="-O2"
      Fastest_HELP="-O3"
        Small_HELP="-Os"
                ;;
@@ -143,10 +143,11 @@
       supersparc_HELP="SuperSPARC"
        sparclite_HELP="SPARCLite"
       hypersparc_HELP="HyperSPARC"
+      sparclite86x_HELP="SPARCLite86x"
             f930_HELP="f930 SPARC"
             f934_HELP="f934 SPARC"
         sparclet_HELP="SPARCLet"
-           ts701_HELP="ts701 SPARC"
+          tsc701_HELP="tsc701 SPARC"
               v9_HELP="V9 SPARC"
       ultrasparc_HELP="ULTRASPARC"
                  ;;
@@ -322,18 +323,19 @@
                      "PowerPC" "PowerPC" $( [ "$CPU" == "PowerPC" ] && echo "on" || echo "off" ) "$PowerPC_HELP" )
                      ;;
   
-    SPARC) OPTIONS=( "v7"         "v7"         "$v7_HELP"
-                     "cypress"    "cypress"    "$cypress_HELP"
-                     "v8"         "v8"         "$v8_HELP"
-                     "supersparc" "supersparc" "$supersparc_HELP"
-                     "sparclite"  "sparclite"  "$sparclite_HELP"
-                     "hypersparc" "hypersparc" "$hypersparc_HELP"
-                     "f930"       "f930"       "$f930_HELP"
-                     "f934"       "f934"       "$f934_HELP"
-                     "sparclet"   "sparclet"   "$sparclet_HELP"
-                     "ts701"      "ts701"      "$ts701_HELP"
-                     "v9"         "v9"         "$v9_HELP"
-                     "ultrasparc" "ultrasparc" "$ultrasparc_HELP" )
+    SPARC) OPTIONS=( "v7"         "v7"         $( [ "$CPU" == "v7" ] && echo "on" || echo "off" ) "$v7_HELP"
+                     "cypress"    "cypress"    $( [ "$CPU" == "cypress" ] && echo "on" || echo "off" ) "$cypress_HELP"
+                     "v8"         "v8"         $( [ "$CPU" == "v8" ] && echo "on" || echo "off" ) "$v8_HELP"
+                     "supersparc" "supersparc" $( [ "$CPU" == "supersparc" ] && echo "on" || echo "off" ) "$supersparc_HELP"
+                     "sparclite"  "sparclite"  $( [ "$CPU" == "sparclite" ] && echo "on" || echo "off" ) "$sparclite_HELP"
+                     "hypersparc" "hypersparc" $( [ "$CPU" == "hypersparc" ] && echo "on" || echo "off" ) "$hypersparc_HELP"
+                     "sparclite86x" "sparclite86x"  $( [ "$CPU" == "sparclite86x" ] && echo "on" || echo "off" ) "$sparclite86x_HELP"
+                     "f930"       "f930"       $( [ "$CPU" == "f930" ] && echo "on" || echo "off" ) "$f930_HELP"
+                     "f934"       "f934"       $( [ "$CPU" == "f934" ] && echo "on" || echo "off" ) "$f934_HELP"
+                     "sparclet"   "sparclet"   $( [ "$CPU" == "sparclet" ] && echo "on" || echo "off" ) "$sparclet_HELP"
+                     "tsc701"     "tsc701"     $( [ "$CPU" == "tsc701" ] && echo "on" || echo "off" ) "$ts701_HELP"
+                     "v9"         "v9"         $( [ "$CPU" == "v9" ] && echo "on" || echo "off" ) "$v9_HELP"
+                     "ultrasparc" "ultrasparc" $( [ "$CPU" == "ultrasparc" ] && echo "on" || echo "off" ) "$ultrasparc_HELP" )
                      ;;
    esac