Changeset 5684736


Ignore:
Timestamp:
Jun 6, 2019, 5:46:14 PM (5 years ago)
Author:
Aaron Moss <a3moss@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
4e5e6cc, 60aaa51d, 866545b, 9151fcb
Parents:
2b59f55 (diff), 7cc0344 (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

Location:
src
Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed
  • src/AST/module.mk

    r2b59f55 r5684736  
    1616
    1717SRC_AST = \
     18        AST/AssertAcyclic.cpp \
    1819        AST/Attribute.cpp \
    1920        AST/Convert.cpp \
  • src/Makefile.in

    r2b59f55 r5684736  
    165165libdemangle_a_LIBADD =
    166166am__dirstamp = $(am__leading_dot)dirstamp
    167 am__objects_1 = AST/Attribute.$(OBJEXT) AST/Convert.$(OBJEXT) \
    168         AST/Decl.$(OBJEXT) AST/DeclReplacer.$(OBJEXT) \
    169         AST/Expr.$(OBJEXT) AST/GenericSubstitution.$(OBJEXT) \
    170         AST/Init.$(OBJEXT) AST/LinkageSpec.$(OBJEXT) \
    171         AST/Node.$(OBJEXT) AST/Pass.$(OBJEXT) AST/Print.$(OBJEXT) \
    172         AST/Stmt.$(OBJEXT) AST/SymbolTable.$(OBJEXT) \
    173         AST/Type.$(OBJEXT) AST/TypeEnvironment.$(OBJEXT) \
    174         AST/TypeSubstitution.$(OBJEXT)
     167am__objects_1 = AST/AssertAcyclic.$(OBJEXT) AST/Attribute.$(OBJEXT) \
     168        AST/Convert.$(OBJEXT) AST/Decl.$(OBJEXT) \
     169        AST/DeclReplacer.$(OBJEXT) AST/Expr.$(OBJEXT) \
     170        AST/GenericSubstitution.$(OBJEXT) AST/Init.$(OBJEXT) \
     171        AST/LinkageSpec.$(OBJEXT) AST/Node.$(OBJEXT) \
     172        AST/Pass.$(OBJEXT) AST/Print.$(OBJEXT) AST/Stmt.$(OBJEXT) \
     173        AST/SymbolTable.$(OBJEXT) AST/Type.$(OBJEXT) \
     174        AST/TypeEnvironment.$(OBJEXT) AST/TypeSubstitution.$(OBJEXT)
    175175am__objects_2 = CodeGen/CodeGenerator.$(OBJEXT) \
    176176        CodeGen/FixMain.$(OBJEXT) CodeGen/GenType.$(OBJEXT) \
     
    577577@WITH_LIBTCMALLOC_TRUE@TCMALLOCFLAG = -DTCMALLOC
    578578SRC_AST = \
     579        AST/AssertAcyclic.cpp \
    579580        AST/Attribute.cpp \
    580581        AST/Convert.cpp \
     
    744745        @$(MKDIR_P) AST/$(DEPDIR)
    745746        @: > AST/$(DEPDIR)/$(am__dirstamp)
     747AST/AssertAcyclic.$(OBJEXT): AST/$(am__dirstamp) \
     748        AST/$(DEPDIR)/$(am__dirstamp)
    746749AST/Attribute.$(OBJEXT): AST/$(am__dirstamp) \
    747750        AST/$(DEPDIR)/$(am__dirstamp)
     
    11931196@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/MakeLibCfa.Po@am__quote@
    11941197@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
     1198@AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/AssertAcyclic.Po@am__quote@
    11951199@AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/Attribute.Po@am__quote@
    11961200@AMDEP_TRUE@@am__include@ @am__quote@AST/$(DEPDIR)/Convert.Po@am__quote@
Note: See TracChangeset for help on using the changeset viewer.