Ignore:
Timestamp:
Apr 11, 2017, 6:35:59 PM (5 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, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
3720bf8f
Parents:
f674479 (diff), 4f57930 (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
  • doc/generic_types/evaluation/Makefile

    rf674479 rda1c772  
    2525        $(COMPILE.cfa) $(OUTPUT_OPTION) -c $<
    2626
    27 COBJS = c-stack.o
     27COBJS = c-stack.o c-pair.o
    2828CPPOBJS =
    2929CPPVOBJS = cpp-vstack.o
    30 CFAOBJS = cfa-stack.o
     30CFAOBJS = cfa-stack.o cfa-pair.o
    3131
    3232c-bench: c-bench.c c-bench.d $(COBJS)
Note: See TracChangeset for help on using the changeset viewer.