Ignore:
Timestamp:
Aug 27, 2018, 4:40:34 PM (8 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct
Children:
b7c89aa
Parents:
f9feab8 (diff), 305581d (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 cleanup-dtors

File:
1 moved

Legend:

Unmodified
Added
Removed
  • benchmark/Makefile.in

    rf9feab8 r90152a4  
    9393host_triplet = @host@
    9494noinst_PROGRAMS =
    95 subdir = src/benchmark
     95subdir = benchmark
    9696ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    97 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
     97am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
     98        $(top_srcdir)/configure.ac
    9899am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    99100        $(ACLOCAL_M4)
     
    124125  esac
    125126am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
    126 am__DIST_COMMON = $(srcdir)/Makefile.in compile
     127am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/src/cfa.make \
     128        compile
    127129DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    128130ACLOCAL = @ACLOCAL@
     
    135137AWK = @AWK@
    136138BACKEND_CC = @BACKEND_CC@
    137 CC = @CFA_BINDIR@/@CFA_NAME@
     139BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
     140CC = @CC@
    138141CCAS = @CCAS@
    139142CCASDEPMODE = @CCASDEPMODE@
    140143CCASFLAGS = @CCASFLAGS@
    141144CCDEPMODE = @CCDEPMODE@
     145CFACC = @CFACC@
     146CFACPP = @CFACPP@
    142147CFA_BACKEND_CC = @CFA_BACKEND_CC@
    143148CFA_BINDIR = @CFA_BINDIR@
     
    147152CFA_NAME = @CFA_NAME@
    148153CFA_PREFIX = @CFA_PREFIX@
    149 
    150 # applies to both programs
    151 CFLAGS =
     154CFLAGS = @CFLAGS@
    152155CPP = @CPP@
    153156CPPFLAGS = @CPPFLAGS@
     
    158161DEFS = @DEFS@
    159162DEPDIR = @DEPDIR@
     163DRIVER_DIR = @DRIVER_DIR@
    160164ECHO_C = @ECHO_C@
    161165ECHO_N = @ECHO_N@
     
    164168EXEEXT = @EXEEXT@
    165169GREP = @GREP@
     170HOST_FLAGS = @HOST_FLAGS@
    166171INSTALL = @INSTALL@
    167172INSTALL_DATA = @INSTALL_DATA@
     
    173178LEXLIB = @LEXLIB@
    174179LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
     180LIBCFA_TARGET_DIRS = @LIBCFA_TARGET_DIRS@
     181LIBCFA_TARGET_MAKEFILES = @LIBCFA_TARGET_MAKEFILES@
    175182LIBOBJS = @LIBOBJS@
    176183LIBS = @LIBS@
    177184LTLIBOBJS = @LTLIBOBJS@
    178 MACHINE_TYPE = @MACHINE_TYPE@
    179 MAINT = @MAINT@
    180185MAKEINFO = @MAKEINFO@
    181186MKDIR_P = @MKDIR_P@
     
    193198SHELL = @SHELL@
    194199STRIP = @STRIP@
     200TARGET_HOSTS = @TARGET_HOSTS@
    195201VERSION = @VERSION@
    196202YACC = @YACC@
     
    248254top_builddir = @top_builddir@
    249255top_srcdir = @top_srcdir@
    250 AM_CFLAGS = -g -Wall -Wno-unused-function -O2
     256AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
     257CFACOMPILE = $(CFACC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) $(AM_CFLAGS) $(CFLAGS)
     258AM_V_CFA = $(am__v_CFA_@AM_V@)
     259am__v_CFA_ = $(am__v_CFA_@AM_DEFAULT_V@)
     260am__v_CFA_0 = @echo "  CFA     " $@;
     261am__v_CFA_1 =
     262
     263# applies to both programs
     264UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
     265AM_CFLAGS = -O2 -Wall -I$(srcdir) -lrt -pthread
     266AM_CFAFLAGS = -quiet -in-tree -nodebug
     267AM_UPPFLAGS = -quiet -nodebug -multi
    251268TOOLSDIR = ${abs_top_srcdir}/tools/
    252269REPEAT = ${TOOLSDIR}repeat
    253270STATS = ${TOOLSDIR}stat.py
    254271repeats = 30
     272skipcompile = no
    255273TIME_FORMAT = "%E"
    256274PRINT_FORMAT = %20s: #Comments needed for spacing
     275testdir = $(top_srcdir)/tests
    257276all: all-am
    258277
    259278.SUFFIXES:
    260 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
     279.SUFFIXES: .cfa .o
     280$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/src/cfa.make $(am__configure_deps)
    261281        @for dep in $?; do \
    262282          case '$(am__configure_deps)' in \
     
    267287          esac; \
    268288        done; \
    269         echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/benchmark/Makefile'; \
     289        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign benchmark/Makefile'; \
    270290        $(am__cd) $(top_srcdir) && \
    271           $(AUTOMAKE) --foreign src/benchmark/Makefile
     291          $(AUTOMAKE) --foreign benchmark/Makefile
    272292Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    273293        @case '$?' in \
     
    278298            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
    279299        esac;
     300$(top_srcdir)/src/cfa.make $(am__empty):
    280301
    281302$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
    282303        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    283304
    284 $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
     305$(top_srcdir)/configure: $(am__configure_deps)
    285306        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    286 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
     307$(ACLOCAL_M4): $(am__aclocal_m4_deps)
    287308        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
    288309$(am__aclocal_m4_deps):
     
    444465
    445466
     467.cfa.o: $(CFACC) $(CFACPP)
     468        $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
     469        $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     470        $(am__mv) $$depbase.Tpo $$depbase.Po
     471
     472LIBFIBRE_DIR ?= /home/tdelisle/software/KOS/src/
     473
    446474.NOTPARALLEL:
    447475
     
    458486
    459487%.runquiet :
    460         @+make $(basename $@)
    461         @./a.out
     488        @+make $(basename $@) CFLAGS="-w"
     489        @taskset -c 1 ./a.out
    462490        @rm -f a.out
    463491
     
    473501        @echo -e '\t"githash": "'${githash}'",'
    474502        @echo -e '\t"arch": "'   ${arch}   '",'
     503@DOifskipcompile@
    475504        @echo -e '\t"compile": {'
    476505        @+make compile TIME_FORMAT='%e,' PRINT_FORMAT='\t\t\"%s\" :'
    477506        @echo -e '\t\t"dummy" : {}'
    478507        @echo -e '\t},'
     508@DOendif@
    479509        @echo -e '\t"ctxswitch": {'
    480510        @echo -en '\t\t"coroutine":'
     
    502532        @echo "}"
    503533
     534loop$(EXEEXT):
     535        $(COMPILE) -DBENCH_N=5000000000 loop.c
     536
     537function$(EXEEXT):
     538        $(COMPILE) -DBENCH_N=5000000000 function.c
     539
     540fetch_add$(EXEEXT):
     541        $(COMPILE) -DBENCH_N=500000000  fetch_add.c
     542
    504543ctxswitch$(EXEEXT): \
     544        loop.run                                \
     545        function.run                    \
     546        fetch_add.run                   \
    505547        ctxswitch-pthread.run           \
    506548        ctxswitch-cfa_coroutine.run     \
    507549        ctxswitch-cfa_thread.run        \
     550        ctxswitch-cfa_thread2.run       \
    508551        ctxswitch-upp_coroutine.run     \
    509552        ctxswitch-upp_thread.run        \
     553        -ctxswitch-kos_fibre.run        \
     554        -ctxswitch-kos_fibre2.run       \
    510555        ctxswitch-goroutine.run         \
    511556        ctxswitch-java_thread.run
    512557
     558ctxswitch-pthread$(EXEEXT):
     559        @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
     560
    513561ctxswitch-cfa_coroutine$(EXEEXT):
    514         @${CC}        ctxswitch/cfa_cor.c   -DBENCH_N=50000000  -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     562        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
    515563
    516564ctxswitch-cfa_thread$(EXEEXT):
    517         @${CC}        ctxswitch/cfa_thrd.c  -DBENCH_N=50000000  -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     565        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
     566
     567ctxswitch-cfa_thread2$(EXEEXT):
     568        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
    518569
    519570ctxswitch-upp_coroutine$(EXEEXT):
    520         @u++          ctxswitch/upp_cor.cc  -DBENCH_N=50000000  -I. -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     571        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
    521572
    522573ctxswitch-upp_thread$(EXEEXT):
    523         @u++          ctxswitch/upp_thrd.cc -DBENCH_N=50000000  -I. -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
    524 
    525 ctxswitch-pthread$(EXEEXT):
    526         @@BACKEND_CC@ ctxswitch/pthreads.c  -DBENCH_N=50000000  -I. -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     574        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
     575
     576ctxswitch-kos_fibre$(EXEEXT):
     577        @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
     578
     579ctxswitch-kos_fibre2$(EXEEXT):
     580        @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
    527581
    528582ctxswitch-goroutine$(EXEEXT):
    529         @go build -o a.out ctxswitch/goroutine.go
     583        @go build -o a.out $(srcdir)/ctxswitch/goroutine.go
    530584
    531585ctxswitch-java_thread$(EXEEXT):
    532         @javac ctxswitch/JavaThread.java
     586        @javac $(srcdir)/ctxswitch/JavaThread.java
    533587        @echo "#!/bin/sh" > a.out
    534588        @echo "cd ctxswitch && java JavaThread" >> a.out
     
    536590
    537591mutex$(EXEEXT) :\
    538         mutex-function.run      \
    539         mutex-fetch_add.run     \
     592        loop.run                        \
     593        function.run            \
     594        fetch_add.run           \
    540595        mutex-pthread_lock.run  \
    541596        mutex-upp.run           \
     
    545600        mutex-java_thread.run
    546601
    547 mutex-function$(EXEEXT):
    548         @@BACKEND_CC@ mutex/function.c    -DBENCH_N=500000000   -I. -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
    549 
    550 mutex-fetch_add$(EXEEXT):
    551         @@BACKEND_CC@ mutex/fetch_add.c   -DBENCH_N=500000000   -I. -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
    552 
    553602mutex-pthread_lock$(EXEEXT):
    554         @@BACKEND_CC@ mutex/pthreads.c    -DBENCH_N=50000000    -I. -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     603        @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
    555604
    556605mutex-upp$(EXEEXT):
    557         @u++          mutex/upp.cc        -DBENCH_N=50000000    -I. -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     606        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
    558607
    559608mutex-cfa1$(EXEEXT):
    560         @${CC}        mutex/cfa1.c        -DBENCH_N=5000000     -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     609        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.c
    561610
    562611mutex-cfa2$(EXEEXT):
    563         @${CC}        mutex/cfa2.c        -DBENCH_N=5000000     -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     612        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.c
    564613
    565614mutex-cfa4$(EXEEXT):
    566         @${CC}        mutex/cfa4.c        -DBENCH_N=5000000     -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     615        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.c
    567616
    568617mutex-java_thread$(EXEEXT):
    569         @javac mutex/JavaThread.java
     618        @javac $(srcdir)/mutex/JavaThread.java
    570619        @echo "#!/bin/sh" > a.out
    571620        @echo "cd mutex && java JavaThread" >> a.out
     
    573622
    574623signal$(EXEEXT) :\
     624        signal-pthread_cond.run \
    575625        signal-upp.run          \
    576626        signal-cfa1.run         \
    577627        signal-cfa2.run         \
    578         signal-cfa4.run
     628        signal-cfa4.run         \
     629        signal-java_thread.run
     630
     631signal-pthread_cond$(EXEEXT):
     632        @$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
    579633
    580634signal-upp$(EXEEXT):
    581         @u++          schedint/upp.cc     -DBENCH_N=5000000     -I. -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     635        @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
    582636
    583637signal-cfa1$(EXEEXT):
    584         @${CC}        schedint/cfa1.c     -DBENCH_N=500000      -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     638        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.c
    585639
    586640signal-cfa2$(EXEEXT):
    587         @${CC}        schedint/cfa2.c     -DBENCH_N=500000      -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     641        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.c
    588642
    589643signal-cfa4$(EXEEXT):
    590         @${CC}        schedint/cfa4.c     -DBENCH_N=500000      -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     644        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.c
    591645
    592646signal-java_thread$(EXEEXT):
    593         @javac schedint/JavaThread.java
     647        @javac $(srcdir)/schedint/JavaThread.java
    594648        @echo "#!/bin/sh" > a.out
    595649        @echo "cd schedint && java JavaThread" >> a.out
     
    603657
    604658waitfor-upp$(EXEEXT):
    605         @u++          schedext/upp.cc     -DBENCH_N=5000000     -I. -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     659        @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
    606660
    607661waitfor-cfa1$(EXEEXT):
    608         @${CC}        schedext/cfa1.c     -DBENCH_N=500000      -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     662        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.c
    609663
    610664waitfor-cfa2$(EXEEXT):
    611         @${CC}        schedext/cfa2.c     -DBENCH_N=500000      -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     665        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.c
    612666
    613667waitfor-cfa4$(EXEEXT):
    614         @${CC}        schedext/cfa4.c     -DBENCH_N=500000      -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     668        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.c
    615669
    616670creation$(EXEEXT) :\
     
    625679
    626680creation-cfa_coroutine$(EXEEXT):
    627         @${CC}        creation/cfa_cor.c   -DBENCH_N=10000000   -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     681        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
    628682
    629683creation-cfa_coroutine_eager$(EXEEXT):
    630         @${CC}        creation/cfa_cor.c   -DBENCH_N=10000000   -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags} -DEAGER
     684        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
    631685
    632686creation-cfa_thread$(EXEEXT):
    633         @${CC}        creation/cfa_thrd.c  -DBENCH_N=10000000   -I. -nodebug -lrt -quiet @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     687        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.c
    634688
    635689creation-upp_coroutine$(EXEEXT):
    636         @u++          creation/upp_cor.cc  -DBENCH_N=50000000   -I. -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     690        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
    637691
    638692creation-upp_thread$(EXEEXT):
    639         @u++          creation/upp_thrd.cc -DBENCH_N=50000000   -I. -nodebug -lrt -quiet             ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     693        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
    640694
    641695creation-pthread$(EXEEXT):
    642         @@BACKEND_CC@ creation/pthreads.c  -DBENCH_N=250000     -I. -lrt -pthread                    ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     696        @$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
    643697
    644698creation-goroutine$(EXEEXT):
    645         @go build -o a.out creation/goroutine.go
     699        @go build -o a.out $(srcdir)/creation/goroutine.go
    646700
    647701creation-java_thread$(EXEEXT):
    648         @javac creation/JavaThread.java
     702        @javac $(srcdir)/creation/JavaThread.java
    649703        @echo "#!/bin/sh" > a.out
    650704        @echo "cd creation && java JavaThread" >> a.out
     
    662716
    663717compile-array$(EXEEXT):
    664         @${CC} -nodebug -quiet -fsyntax-only -w ../tests/array.c                @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     718        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.c
    665719
    666720compile-attributes$(EXEEXT):
    667         @${CC} -nodebug -quiet -fsyntax-only -w ../tests/attributes.c   @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     721        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.c
    668722
    669723compile-empty$(EXEEXT):
    670         @${CC} -nodebug -quiet -fsyntax-only -w compile/empty.c         @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     724        @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.c
    671725
    672726compile-expression$(EXEEXT):
    673         @${CC} -nodebug -quiet -fsyntax-only -w ../tests/expression.c   @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     727        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.c
    674728
    675729compile-io$(EXEEXT):
    676         @${CC} -nodebug -quiet -fsyntax-only -w ../tests/io.c                   @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     730        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.c
    677731
    678732compile-monitor$(EXEEXT):
    679         @${CC} -nodebug -quiet -fsyntax-only -w ../tests/monitor.c              @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     733        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.c
    680734
    681735compile-operators$(EXEEXT):
    682         @${CC} -nodebug -quiet -fsyntax-only -w ../tests/operators.c    @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     736        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.c
    683737
    684738compile-thread$(EXEEXT):
    685         @${CC} -nodebug -quiet -fsyntax-only -w ../tests/thread.c               @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     739        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.c
    686740
    687741compile-typeof$(EXEEXT):
    688         @${CC} -nodebug -quiet -fsyntax-only -w ../tests/typeof.c               @CFA_FLAGS@ ${AM_CFLAGS} ${CFLAGS} ${ccflags}
     742        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.c
    689743
    690744# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.