Ignore:
Timestamp:
Dec 15, 2016, 5:16:42 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, 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/driver/Makefile.in

    r5802a4f r66f8528  
    3636PRE_UNINSTALL = :
    3737POST_UNINSTALL = :
     38build_triplet = @build@
     39host_triplet = @host@
     40@BUILD_NO_LIB_FALSE@am__append_1 = -DHAVE_LIBCFA
     41@BUILD_DEBUG_TRUE@am__append_2 = -DHAVE_LIBCFA_DEBUG
     42@BUILD_RELEASE_TRUE@am__append_3 = -DHAVE_LIBCFA_RELEASE
    3843bin_PROGRAMS = cfa$(EXEEXT)
    3944cc1lib_PROGRAMS = cc1$(EXEEXT)
    … …  
    9297BACKEND_CC = @BACKEND_CC@
    9398CC = @CC@
     99CCAS = @CCAS@
     100CCASDEPMODE = @CCASDEPMODE@
     101CCASFLAGS = @CCASFLAGS@
    94102CCDEPMODE = @CCDEPMODE@
    95103CFA_BACKEND_CC = @CFA_BACKEND_CC@
    … …  
    126134LIBS = @LIBS@
    127135LTLIBOBJS = @LTLIBOBJS@
     136MACHINE_TYPE = @MACHINE_TYPE@
    128137MAINT = @MAINT@
    129138MAKEINFO = @MAKEINFO@
    … …  
    157166am__untar = @am__untar@
    158167bindir = @bindir@
     168build = @build@
    159169build_alias = @build_alias@
     170build_cpu = @build_cpu@
     171build_os = @build_os@
     172build_vendor = @build_vendor@
    160173builddir = @builddir@
    161174datadir = @datadir@
    … …  
    164177dvidir = @dvidir@
    165178exec_prefix = @exec_prefix@
     179host = @host@
    166180host_alias = @host_alias@
     181host_cpu = @host_cpu@
     182host_os = @host_os@
     183host_vendor = @host_vendor@
    167184htmldir = @htmldir@
    168185includedir = @includedir@
    … …  
    190207
    191208# applies to both programs
    192 AM_CXXFLAGS = -Wall
     209AM_CXXFLAGS = -Wall -O2 $(am__append_1) $(am__append_2) \
     210        $(am__append_3)
    193211cfa_SOURCES = cfa.cc
    194212
Note: See TracChangeset for help on using the changeset viewer.