[Lunar-commits] r17167 - in lunar/trunk/var/lib/lunar: functions menu

[Auke Kok]

Author: sofar
Date: 2005-11-03 18:13:37 +0000 (Thu, 03 Nov 2005)
New Revision: 17167

Modified:
   lunar/trunk/var/lib/lunar/functions/optimize.lunar
   lunar/trunk/var/lib/lunar/menu/optimize.menu
Log:
Who is this Janne and why is he bothering me with these ... oh wait this is a nice patch ;^).


Modified: lunar/trunk/var/lib/lunar/functions/optimize.lunar
===================================================================
--- lunar/trunk/var/lib/lunar/functions/optimize.lunar	2005-11-03 16:21:08 UTC (rev 17166)
+++ lunar/trunk/var/lib/lunar/functions/optimize.lunar	2005-11-03 18:13:37 UTC (rev 17167)
@@ -104,6 +104,8 @@
          CPU="powerpc"
       elif [[ $PLATFORM == "SPARC" ]];   then
          CPU="ultrasparc"
+      elif [[ $PLATFORM == "x86_64" ]];  then
+         CPU="x86_64"
       else
          CPU="I386"
       fi
@@ -460,6 +462,10 @@
                      CXXFLAGS="$CXXFLAGS -mcpu=ultrasparc"
                      BUILD="sparc-linux"
                      ;;
+      x86_64)        CFLAGS="$CFLAGS"
+                     CXXFLAGS="$CXXFLAGS"
+                     BUILD="x86_64-pc-linux-gnu"
+                     ;;
    esac
 }
 

Modified: lunar/trunk/var/lib/lunar/menu/optimize.menu
===================================================================
--- lunar/trunk/var/lib/lunar/menu/optimize.menu	2005-11-03 16:21:08 UTC (rev 17166)
+++ lunar/trunk/var/lib/lunar/menu/optimize.menu	2005-11-03 18:13:37 UTC (rev 17167)
@@ -39,6 +39,7 @@
      Alpha_HELP="Compaq Alpha hardware"
      PowerPC_HELP="IBM and Apple hardware (Power and PowerPC)"
      SPARC_HELP="SUN Hardware"
+     x86_64_HELP="Both AMD64 and Intel EM64T machines"
      ;;
 
    # Help for the basic optimizations.
@@ -127,6 +128,9 @@
          v9_HELP="V9 SPARC"
          ultrasparc_HELP="ULTRASPARC"
          ;;
+       x86_64)
+         x86_64_HELP="x86_64"
+         ;;
      esac
      ;;
 
@@ -230,7 +234,8 @@
       OPTIONS=( "x86"     "Intel, AMD, and clones"  $( [ "$PLATFORM" == "x86" ] && echo "on" || echo "off" )      "$x86_HELP"
                 "Alpha"   "Compaq Alpha"            $( [ "$PLATFORM" == "Alpha" ] && echo "on" || echo "off" )    "$Alpha_HELP"
                 "PowerPC" "PowerPC"                 $( [ "$PLATFORM" == "PowerPC" ] && echo "on" || echo "off" )  "$PowerPC_HELP"
-                "SPARC"   "Sun SPARC"               $( [ "$PLATFORM" == "SPARC" ] && echo "on" || echo "off" )    "$SPARC_HELP" )
+                "SPARC"   "Sun SPARC"               $( [ "$PLATFORM" == "SPARC" ] && echo "on" || echo "off" )    "$SPARC_HELP"
+                "x86_64"   "AMD64/EM64T"            $( [ "$PLATFORM" == "x86_64" ] && echo "on" || echo "off" )    "$x86_64_HELP" )
       ;;
     bopt)
       OPTIONS=( "None"     "-O0"   $( [ "$BOPT" == "None" ] && echo "on" || echo "off" )    "$None_HELP"
@@ -315,6 +320,9 @@
                    "v9"           "v9"           $( [ "$CPU" == "v9" ] && echo "on" || echo "off" )           "$v9_HELP"
                    "ultrasparc"   "ultrasparc"   $( [ "$CPU" == "ultrasparc" ] && echo "on" || echo "off" )   "$ultrasparc_HELP" )
          ;;
+       x86_64)
+         OPTIONS=( "x86_64"       "x86_64"        $( [ "$CPU" == "x86_64" ] && echo "on" || echo "off" ) "$x86_64_HELP" )
+         ;; 
      esac
      ;;
    spd)