Ignore:
Timestamp:
Dec 15, 2016, 5:16:42 PM (5 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
aaron-thesis, arm-eh, 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, resolv-new, with_gc
Children:
43385ca, f7ff3fb
Parents:
5802a4f (diff), 596f987b (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' into tuples

Conflicts:

src/ResolvExpr/CommonType.cc
src/tests/.expect/32/extension.txt
src/tests/.expect/32/gccExtensions.txt
src/tests/.expect/64/declarationSpecifier.txt
src/tests/.expect/64/extension.txt
src/tests/.expect/64/gccExtensions.txt
src/tests/.expect/castError.txt
src/tests/Makefile.am

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/tests/Makefile.am

    r5802a4f r66f8528  
    1515###############################################################################
    1616
     17debug=yes
     18
    1719# applies to both programs
    18 CFLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ # TEMPORARY: does not build with -O2
     20EXTRA_FLAGS =
     21CFLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS}
    1922CC = @CFA_BINDIR@/cfa
    2023
     
    3033
    3134all-tests :
    32         @+python test.py --all          # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
     35        @+python test.py --all --debug=${debug}         # '@' => do not echo command (SILENT), '+' => allows recursive make from within python program
    3336
    3437clean-local :
     
    5457
    5558declarationSpecifier: declarationSpecifier.c
    56         ${CC} ${CFALGS} -CFA -XCFA -p ${<} -o ${@}
     59        ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
    5760
    5861gccExtensions : gccExtensions.c
     
    6366
    6467memberCtors-ERR1: memberCtors.c
    65         ${CC} ${CFALGS} -DERR1 ${<} -o ${@}
     68        ${CC} ${CFLAGS} -DERR1 ${<} -o ${@}
    6669
    6770completeTypeError : completeTypeError.c
    68         ${CC} ${CFALGS} -DERR1 ${<} -o ${@}
     71        ${CC} ${CFLAGS} -DERR1 ${<} -o ${@}
Note: See TracChangeset for help on using the changeset viewer.