Changeset 5ebb2fbc for src/SynTree


Ignore:
Timestamp:
Jan 18, 2017, 12:47:15 PM (9 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, stuck-waitfor-destruct, with_gc
Children:
e9e4e9ee
Parents:
f3b0a07 (diff), c49bf54 (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 plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/SynTree/FunctionDecl.cc

    rf3b0a07 r5ebb2fbc  
    2222#include "Common/utility.h"
    2323#include "InitTweak/InitTweak.h"
     24#include "CodeGen/FixMain.h"
    2425
    2526extern bool translation_unit_nomain;
     
    3233        // because we want to replace the main even if it is inside an extern
    3334        if ( name == "main" ) {
    34                 set_linkage( translation_unit_nomain ? LinkageSpec::C : LinkageSpec::Cforall );
     35                set_linkage( CodeGen::FixMain::mainLinkage() );
    3536        } // if
    3637}
Note: See TracChangeset for help on using the changeset viewer.