Changeset 6382128


Ignore:
Timestamp:
Jul 6, 2018, 7:08:33 PM (3 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer
Children:
c0cc5da
Parents:
a1cfa0c (diff), 1d386a7 (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:software/cfa/cfa-cc

Files:
1 added
3 edited
1 moved

Legend:

Unmodified
Added
Removed
  • .gitignore

    ra1cfa0c r6382128  
    3131src/driver/cfa-cpp
    3232
     33src/prelude/bootloader.c
    3334src/prelude/builtins.cf
     35src/prelude/extras.cf
    3436src/prelude/gcc-builtins.cf
    3537src/prelude/gcc-builtins.c
    36 src/prelude/extras.cf
    37 src/prelude/bootloader.c
     38src/prelude/prelude.cf
    3839src/libcfa/libcfa-prelude.c
    3940
  • src/prelude/Makefile.am

    ra1cfa0c r6382128  
    4242        ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -E prototypes.c | awk -f prototypes.awk > $@
    4343
     44prelude.cf : prelude-gen.cc
     45        ${AM_V_GEN}${CXX} ${AM_CXXFLAGS} ${CXXFLAGS} ${<} -o prelude-gen
     46        @./prelude-gen > $@
     47        @rm ./prelude-gen
     48
    4449builtins.def :
    4550
  • src/prelude/Makefile.in

    ra1cfa0c r6382128  
    511511        ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -E prototypes.c | awk -f prototypes.awk > $@
    512512
     513prelude.cf : prelude-gen.cc
     514        ${AM_V_GEN}${CXX} ${AM_CXXFLAGS} ${CXXFLAGS} ${<} -o prelude-gen
     515        @./prelude-gen > $@
     516        @rm ./prelude-gen
     517
    513518builtins.def :
    514519
Note: See TracChangeset for help on using the changeset viewer.