Changeset 34a6b2e for driver


Ignore:
Timestamp:
Sep 25, 2018, 5:33:02 PM (4 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
aaron-thesis, arm-eh, 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:
9ad5ee1
Parents:
461eed2 (diff), a32346b (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:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • driver/cfa.cc

    r461eed2 r34a6b2e  
    357357
    358358        string arch = m32 ? CFA_32_CPU : (m64 ? CFA_64_CPU : CFA_DEFAULT_CPU);
    359         if ( ! m32 && ! m64 && arch == "x86" ) {                        // no override and 32-bit architecture
    360                 args[nargs] = "-m32";
    361                 nargs += 1;
     359        if ( ! m32 && ! m64 ) {
     360                if ( arch == "x86" ) {
     361                        args[nargs] = "-m32";
     362                        nargs += 1;
     363                } else if ( arch == "x64" ) {
     364                        args[nargs] = "-m64";
     365                        nargs += 1;
     366                }  // if
    362367        } // if
    363368        const char * config = debug ? "debug": "nodebug";
Note: See TracChangeset for help on using the changeset viewer.