diff -r 0535f7bf1069 -r 88020b2c3246 scripts/build/arch/x86.sh
--- a/scripts/build/arch/x86.sh	Thu Oct 23 13:00:45 2008 +0000
+++ b/scripts/build/arch/x86.sh	Tue Jan 12 19:24:03 2010 +0100
@@ -1,22 +1,22 @@
 # Compute x86-specific values
 
-# This one really need a little love! :-(
+# This one really needs a little love! :-(
 
 CT_DoArchTupleValues() {
-    # The architecture part of the tuple:
-    arch="${CT_ARCH_ARCH}"
-    [ -z "${arch}" ] && arch="${CT_ARCH_TUNE}"
-    case "${arch}" in
-        nocona|athlon*64|k8|athlon-fx|opteron)
-            CT_DoError "Architecture is x86 (32-bit) but selected processor is \"${arch}\" (64-bit)";;
-        "")                           CT_TARGET_ARCH=i386;;
-        i386|i486|i586|i686)          CT_TARGET_ARCH="${arch}";;
-        winchip*)                     CT_TARGET_ARCH=i486;;
-        pentium|pentium-mmx|c3*)      CT_TARGET_ARCH=i586;;
-        pentiumpro|pentium*|athlon*)  CT_TARGET_ARCH=i686;;
-        *)                            CT_TARGET_ARCH=i586;;
-    esac
 
-    # The kernel ARCH:
-    CT_KERNEL_ARCH=i386
+    # Override the architecture part of the tuple:
+    if [ "${CT_ARCH_64}" = "y" ]; then
+        CT_TARGET_ARCH=x86_64
+    else
+        arch="${CT_ARCH_ARCH}"
+        [ -z "${arch}" ] && arch="${CT_ARCH_TUNE}"
+        case "${arch}" in
+            "")                           CT_TARGET_ARCH=i386;;
+            i386|i486|i586|i686)          CT_TARGET_ARCH="${arch}";;
+            winchip*)                     CT_TARGET_ARCH=i486;;
+            pentium|pentium-mmx|c3*)      CT_TARGET_ARCH=i586;;
+            pentiumpro|pentium*|athlon*)  CT_TARGET_ARCH=i686;;
+            *)                            CT_TARGET_ARCH=i586;;
+        esac
+    fi
 }