Changeset 66f8528 for src/examples


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

Location:
src/examples
Files:
3 added
2 edited

Legend:

Unmodified
Added
Removed

  • src/examples/Makefile.am

    r5802a4f r66f8528  
    1616
    1717# applies to both programs
    18 CFLAGS = -g -Wall -Wno-unused-function # TEMPORARY: does not build with -O2
     18CFLAGS =
     19AM_CFLAGS = -g -Wall -Wno-unused-function -O2
    1920CC = @CFA_BINDIR@/cfa
    2021
    21 noinst_PROGRAMS = fstream_test vector_test avl_test # build but do not install
     22noinst_PROGRAMS = fstream_test vector_test avl_test Bench # build but do not install
    2223fstream_test_SOURCES = fstream_test.c
    2324vector_test_SOURCES = vector_int.c array.c vector_test.c
    2425avl_test_SOURCES = avltree/avl_test.c avltree/avl0.c avltree/avl1.c avltree/avl2.c avltree/avl3.c avltree/avl4.c avltree/avl-private.c
     26
     27Bench : Bench.c
     28        @for ccflags in "-debug" "-nodebug"; do \
     29                echo ${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -lrt Bench.c;\
     30                ${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -lrt Bench.c;\
     31                ./a.out ; \
     32        done ; \
     33        rm -f ./a.out ;

  • src/examples/Makefile.in

    r5802a4f r66f8528  
    3636PRE_UNINSTALL = :
    3737POST_UNINSTALL = :
     38build_triplet = @build@
     39host_triplet = @host@
    3840noinst_PROGRAMS = fstream_test$(EXEEXT) vector_test$(EXEEXT) \
    39         avl_test$(EXEEXT)
     41        avl_test$(EXEEXT) Bench$(EXEEXT)
    4042subdir = src/examples
    4143DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
    … …  
    4951CONFIG_CLEAN_VPATH_FILES =
    5052PROGRAMS = $(noinst_PROGRAMS)
     53Bench_SOURCES = Bench.c
     54Bench_OBJECTS = Bench.$(OBJEXT)
     55Bench_LDADD = $(LDADD)
    5156am_avl_test_OBJECTS = avl_test.$(OBJEXT) avl0.$(OBJEXT) avl1.$(OBJEXT) \
    5257        avl2.$(OBJEXT) avl3.$(OBJEXT) avl4.$(OBJEXT) \
    … …  
    8489am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
    8590am__v_GEN_0 = @echo "  GEN   " $@;
    86 SOURCES = $(avl_test_SOURCES) $(fstream_test_SOURCES) \
     91SOURCES = Bench.c $(avl_test_SOURCES) $(fstream_test_SOURCES) \
    8792        $(vector_test_SOURCES)
    88 DIST_SOURCES = $(avl_test_SOURCES) $(fstream_test_SOURCES) \
     93DIST_SOURCES = Bench.c $(avl_test_SOURCES) $(fstream_test_SOURCES) \
    8994        $(vector_test_SOURCES)
    9095ETAGS = etags
    … …  
    101106BACKEND_CC = @BACKEND_CC@
    102107CC = @CFA_BINDIR@/cfa
     108CCAS = @CCAS@
     109CCASDEPMODE = @CCASDEPMODE@
     110CCASFLAGS = @CCASFLAGS@
    103111CCDEPMODE = @CCDEPMODE@
    104112CFA_BACKEND_CC = @CFA_BACKEND_CC@
    … …  
    110118
    111119# applies to both programs
    112 CFLAGS = -g -Wall -Wno-unused-function # TEMPORARY: does not build with -O2
     120CFLAGS =
    113121CPP = @CPP@
    114122CPPFLAGS = @CPPFLAGS@
    … …  
    137145LIBS = @LIBS@
    138146LTLIBOBJS = @LTLIBOBJS@
     147MACHINE_TYPE = @MACHINE_TYPE@
    139148MAINT = @MAINT@
    140149MAKEINFO = @MAKEINFO@
    … …  
    168177am__untar = @am__untar@
    169178bindir = @bindir@
     179build = @build@
    170180build_alias = @build_alias@
     181build_cpu = @build_cpu@
     182build_os = @build_os@
     183build_vendor = @build_vendor@
    171184builddir = @builddir@
    172185datadir = @datadir@
    … …  
    175188dvidir = @dvidir@
    176189exec_prefix = @exec_prefix@
     190host = @host@
    177191host_alias = @host_alias@
     192host_cpu = @host_cpu@
     193host_os = @host_os@
     194host_vendor = @host_vendor@
    178195htmldir = @htmldir@
    179196includedir = @includedir@
    … …  
    199216top_builddir = @top_builddir@
    200217top_srcdir = @top_srcdir@
     218AM_CFLAGS = -g -Wall -Wno-unused-function -O2
    201219fstream_test_SOURCES = fstream_test.c
    202220vector_test_SOURCES = vector_int.c array.c vector_test.c
    … …  
    255273        -rm -f *.tab.c
    256274
     275@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Bench.Po@am__quote@
    257276@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/array.Po@am__quote@
    258277@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/avl-private.Po@am__quote@
    … …  
    580599
    581600
     601Bench : Bench.c
     602        @for ccflags in "-debug" "-nodebug"; do \
     603                echo ${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -lrt Bench.c;\
     604                ${CC} ${AM_CFLAGS} ${CFLAGS} $${ccflags} -lrt Bench.c;\
     605                ./a.out ; \
     606        done ; \
     607        rm -f ./a.out ;
     608
    582609# Tell versions [3.59,3.63) of GNU make to not export all variables.
    583610# Otherwise a system limit (for SysV at least) may be exceeded.
Note: See TracChangeset for help on using the changeset viewer.