Changeset a32346b for driver/cfa.cc

Timestamp:

Sep 25, 2018, 4:56:55 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

34a6b2e, a332d432

Parents:

48b7085e (diff), 560812b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2.cs.uwaterloo.ca:software/cfa/cfa-cc

File:

• driver/cfa.cc (modified) (1 diff)

driver/cfa.cc

@@ -359 +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";