Changes in driver/cfa.cc [b32ad080:13a984c]

File:

• driver/cfa.cc (modified) (4 diffs)

driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Sep 14 23:02:59 2018
-// Update Count     : 277
+// Last Modified On : Mon Sep  3 16:47:59 2018
+// Update Count     : 275
 //
 
@@ -114 +114 @@
         bool std_flag = false;                                                          // -std= flag
         bool noincstd_flag = false;                                                     // -no-include-stdhdr= flag
+        bool xflag = false;                                                                     // user supplied -x flag
         bool debugging __attribute(( unused )) = false;         // -g flag
         bool m32 = false;                                    // -m32 flag
@@ -290 +291 @@
                         } // if
                         nonoptarg = true;
+                        xflag = false;
                 } // if
         } // for
 
-    args[nargs] = "-x";                                                                 // turn off language
+    args[nargs] = "-x";                                 // turn off language
     nargs += 1;
     args[nargs] = "none";
@@ -357 +359 @@
 
         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";