Index: driver/cfa.cc
===================================================================
--- driver/cfa.cc	(revision b32ad080aa519a2c377a801f16446d5c38a9fcfe)
+++ driver/cfa.cc	(revision 30ee9efc6d79c28e3cd987f0535498367bb256d4)
@@ -357,7 +357,12 @@
 
 	string arch = m32 ? CFA_32_CPU : (m64 ? CFA_64_CPU : CFA_DEFAULT_CPU);
-	if ( ! m32 && ! m64 && arch == "x86" ) {			// no override and 32-bit architecture
-		args[nargs] = "-m32";
-		nargs += 1;
+	if ( ! m32 && ! m64 ) {
+		if ( arch == "x86" ) {
+			args[nargs] = "-m32";
+			nargs += 1;
+		} else if ( arch == "x64" ) {
+			args[nargs] = "-m64";
+			nargs += 1;
+		}  // if
 	} // if
 	const char * config = debug ? "debug": "nodebug";