Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • benchmark/Makefile.in

    r47c1928 r5e49e47  
    9292build_triplet = @build@
    9393host_triplet = @host@
     94EXTRA_PROGRAMS = dummy$(EXEEXT)
    9495noinst_PROGRAMS =
     96@WITH_LIBFIBRE_TRUE@am__append_1 = \
     97@WITH_LIBFIBRE_TRUE@    ctxswitch-kos_fibre.run  \
     98@WITH_LIBFIBRE_TRUE@    ctxswitch-kos_fibre2.run
     99
    95100subdir = benchmark
    96101ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    … …  
    105110CONFIG_CLEAN_VPATH_FILES =
    106111PROGRAMS = $(noinst_PROGRAMS)
     112am_dummy_OBJECTS = dummyC.$(OBJEXT) dummyCXX.$(OBJEXT)
     113dummy_OBJECTS = $(am_dummy_OBJECTS)
     114dummy_LDADD = $(LDADD)
    107115AM_V_P = $(am__v_P_@AM_V@)
    108116am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
    … …  
    117125am__v_at_0 = @
    118126am__v_at_1 =
    119 SOURCES =
    120 DIST_SOURCES =
     127DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
     128depcomp = $(SHELL) $(top_srcdir)/automake/depcomp
     129am__depfiles_maybe = depfiles
     130am__mv = mv -f
     131COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
     132        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
     133AM_V_CC = $(am__v_CC_@AM_V@)
     134am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
     135am__v_CC_0 = @echo "  CC      " $@;
     136am__v_CC_1 =
     137CCLD = $(CC)
     138LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
     139AM_V_CCLD = $(am__v_CCLD_@AM_V@)
     140am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
     141am__v_CCLD_0 = @echo "  CCLD    " $@;
     142am__v_CCLD_1 =
     143CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
     144        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
     145AM_V_CXX = $(am__v_CXX_@AM_V@)
     146am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
     147am__v_CXX_0 = @echo "  CXX     " $@;
     148am__v_CXX_1 =
     149CXXLD = $(CXX)
     150CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
     151        -o $@
     152AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
     153am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
     154am__v_CXXLD_0 = @echo "  CXXLD   " $@;
     155am__v_CXXLD_1 =
     156SOURCES = $(dummy_SOURCES)
     157DIST_SOURCES = $(dummy_SOURCES)
    121158am__can_run_installinfo = \
    122159  case $$AM_UPDATE_INFO_DIR in \
    … …  
    125162  esac
    126163am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
    127 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/src/cfa.make \
    128         compile
     164# Read a list of newline-separated strings from the standard input,
     165# and print each of them once, without duplicates.  Input order is
     166# *not* preserved.
     167am__uniquify_input = $(AWK) '\
     168  BEGIN { nonempty = 0; } \
     169  { items[$$0] = 1; nonempty = 1; } \
     170  END { if (nonempty) { for (i in items) print i; }; } \
     171'
     172# Make sure the list of sources is unique.  This is necessary because,
     173# e.g., the same source file might be shared among _SOURCES variables
     174# for different programs/libraries.
     175am__define_uniq_tagged_files = \
     176  list='$(am__tagged_files)'; \
     177  unique=`for i in $$list; do \
     178    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
     179  done | $(am__uniquify_input)`
     180ETAGS = etags
     181CTAGS = ctags
     182am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/automake/depcomp \
     183        $(top_srcdir)/src/cfa.make compile
    129184DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    130185ACLOCAL = @ACLOCAL@
    … …  
    256311AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
    257312CFACOMPILE = $(CFACC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) $(AM_CFLAGS) $(CFLAGS)
     313LTCFACOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
     314        $(LIBTOOLFLAGS) --mode=compile $(CFACC) $(DEFS) \
     315        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) \
     316        $(AM_CFLAGS) $(CFLAGS)
     317
    258318AM_V_CFA = $(am__v_CFA_@AM_V@)
    259319am__v_CFA_ = $(am__v_CFA_@AM_DEFAULT_V@)
    … …  
    262322
    263323# applies to both programs
     324UPPCC = u++
    264325UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
    265326AM_CFLAGS = -O2 -Wall -I$(srcdir) -lrt -pthread
    266327AM_CFAFLAGS = -quiet -in-tree -nodebug
    267328AM_UPPFLAGS = -quiet -nodebug -multi
    268 TOOLSDIR = ${abs_top_srcdir}/tools/
    269 REPEAT = ${TOOLSDIR}repeat
    270 STATS = ${TOOLSDIR}stat.py
     329TOOLSDIR = ${abs_top_builddir}/tools/
     330REPEAT = ${abs_top_builddir}/tools/repeat
     331STATS = ${abs_top_srcdir}/tools/stat.py
    271332repeats = 30
    272333skipcompile = no
    273334TIME_FORMAT = "%E"
    274335PRINT_FORMAT = %20s: #Comments needed for spacing
     336dummy_SOURCES = dummyC.c dummyCXX.cpp
     337CTXSWITCH_DEPEND = loop.run function.run fetch_add.run \
     338        ctxswitch-pthread.run ctxswitch-cfa_coroutine.run \
     339        ctxswitch-cfa_thread.run ctxswitch-cfa_thread2.run \
     340        ctxswitch-upp_coroutine.run ctxswitch-upp_thread.run \
     341        ctxswitch-goroutine.run ctxswitch-java_thread.run \
     342        $(am__append_1)
    275343testdir = $(top_srcdir)/tests
    276344all: all-am
    277345
    278346.SUFFIXES:
    279 .SUFFIXES: .cfa .o
     347.SUFFIXES: .c .cfa .cpp .lo .o .obj
    280348$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/src/cfa.make $(am__configure_deps)
    281349        @for dep in $?; do \
    … …  
    311379clean-noinstPROGRAMS:
    312380        -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
    313 tags TAGS:
    314 
    315 ctags CTAGS:
    316 
    317 cscope cscopelist:
    318 
     381
     382dummy$(EXEEXT): $(dummy_OBJECTS) $(dummy_DEPENDENCIES) $(EXTRA_dummy_DEPENDENCIES)
     383        @rm -f dummy$(EXEEXT)
     384        $(AM_V_CXXLD)$(CXXLINK) $(dummy_OBJECTS) $(dummy_LDADD) $(LIBS)
     385
     386mostlyclean-compile:
     387        -rm -f *.$(OBJEXT)
     388
     389distclean-compile:
     390        -rm -f *.tab.c
     391
     392@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummyC.Po@am__quote@
     393@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummyCXX.Po@am__quote@
     394
     395.c.o:
     396@am__fastdepCC_TRUE@    $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
     397@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     398@am__fastdepCC_TRUE@    $(am__mv) $$depbase.Tpo $$depbase.Po
     399@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
     400@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     401@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
     402
     403.c.obj:
     404@am__fastdepCC_TRUE@    $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
     405@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
     406@am__fastdepCC_TRUE@    $(am__mv) $$depbase.Tpo $$depbase.Po
     407@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
     408@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     409@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
     410
     411.cpp.o:
     412@am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
     413@am__fastdepCXX_TRUE@   $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     414@am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
     415@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
     416@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     417@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
     418
     419.cpp.obj:
     420@am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
     421@am__fastdepCXX_TRUE@   $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
     422@am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
     423@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
     424@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     425@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
     426
     427ID: $(am__tagged_files)
     428        $(am__define_uniq_tagged_files); mkid -fID $$unique
     429tags: tags-am
     430TAGS: tags
     431
     432tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
     433        set x; \
     434        here=`pwd`; \
     435        $(am__define_uniq_tagged_files); \
     436        shift; \
     437        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
     438          test -n "$$unique" || unique=$$empty_fix; \
     439          if test $$# -gt 0; then \
     440            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     441              "$$@" $$unique; \
     442          else \
     443            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     444              $$unique; \
     445          fi; \
     446        fi
     447ctags: ctags-am
     448
     449CTAGS: ctags
     450ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
     451        $(am__define_uniq_tagged_files); \
     452        test -z "$(CTAGS_ARGS)$$unique" \
     453          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
     454             $$unique
     455
     456GTAGS:
     457        here=`$(am__cd) $(top_builddir) && pwd` \
     458          && $(am__cd) $(top_srcdir) \
     459          && gtags -i $(GTAGS_ARGS) "$$here"
     460cscopelist: cscopelist-am
     461
     462cscopelist-am: $(am__tagged_files)
     463        list='$(am__tagged_files)'; \
     464        case "$(srcdir)" in \
     465          [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
     466          *) sdir=$(subdir)/$(srcdir) ;; \
     467        esac; \
     468        for i in $$list; do \
     469          if test -f "$$i"; then \
     470            echo "$(subdir)/$$i"; \
     471          else \
     472            echo "$$sdir/$$i"; \
     473          fi; \
     474        done >> $(top_builddir)/cscope.files
     475
     476distclean-tags:
     477        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
    319478
    320479distdir: $(DISTFILES)
    … …  
    387546
    388547distclean: distclean-am
     548        -rm -rf ./$(DEPDIR)
    389549        -rm -f Makefile
    390 distclean-am: clean-am distclean-generic
     550distclean-am: clean-am distclean-compile distclean-generic \
     551        distclean-tags
    391552
    392553dvi: dvi-am
    … …  
    431592
    432593maintainer-clean: maintainer-clean-am
     594        -rm -rf ./$(DEPDIR)
    433595        -rm -f Makefile
    434596maintainer-clean-am: distclean-am maintainer-clean-generic
    … …  
    436598mostlyclean: mostlyclean-am
    437599
    438 mostlyclean-am: mostlyclean-generic
     600mostlyclean-am: mostlyclean-compile mostlyclean-generic
    439601
    440602pdf: pdf-am
    … …  
    450612.MAKE: install-am install-strip
    451613
    452 .PHONY: all all-am check check-am clean clean-generic \
    453         clean-noinstPROGRAMS cscopelist-am ctags-am distclean \
    454         distclean-generic distdir dvi dvi-am html html-am info info-am \
    455         install install-am install-data install-data-am install-dvi \
    456         install-dvi-am install-exec install-exec-am install-html \
    457         install-html-am install-info install-info-am install-man \
    458         install-pdf install-pdf-am install-ps install-ps-am \
    459         install-strip installcheck installcheck-am installdirs \
    460         maintainer-clean maintainer-clean-generic mostlyclean \
    461         mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
     614.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
     615        clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
     616        distclean-compile distclean-generic distclean-tags distdir dvi \
     617        dvi-am html html-am info info-am install install-am \
     618        install-data install-data-am install-dvi install-dvi-am \
     619        install-exec install-exec-am install-html install-html-am \
     620        install-info install-info-am install-man install-pdf \
     621        install-pdf-am install-ps install-ps-am install-strip \
     622        installcheck installcheck-am installdirs maintainer-clean \
     623        maintainer-clean-generic mostlyclean mostlyclean-compile \
     624        mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \
    462625        uninstall-am
    463626
    … …  
    465628
    466629
    467 .cfa.o: $(CFACC) $(CFACPP)
     630.cfa.o:
    468631        $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
    469632        $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
    470633        $(am__mv) $$depbase.Tpo $$depbase.Po
    471634
    472 LIBFIBRE_DIR ?= /home/tdelisle/software/KOS/src/
     635.cfa.lo:
     636        $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
     637        $(LTCFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     638        $(am__mv) $$depbase.Tpo $$depbase.Plo
     639
     640dummyC.c:
     641        @echo "int main() { return 0; }" > ${@}
     642
     643dummyCXX.cpp:
     644        @echo "int main() { return 0; }" > ${@}
    473645
    474646.NOTPARALLEL:
    … …  
    495667
    496668${REPEAT} :
    497         @+make -C ${TOOLSDIR} repeat
     669        @+make -C ${abs_top_builddir}/tools repeat
    498670
    499671jenkins$(EXEEXT):
    … …  
    533705
    534706loop$(EXEEXT):
    535         $(COMPILE) -DBENCH_N=5000000000 loop.c
     707        $(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
    536708
    537709function$(EXEEXT):
    538         $(COMPILE) -DBENCH_N=5000000000 function.c
     710        $(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
    539711
    540712fetch_add$(EXEEXT):
    541         $(COMPILE) -DBENCH_N=500000000  fetch_add.c
    542 
    543 ctxswitch$(EXEEXT): \
    544         loop.run                                \
    545         function.run                    \
    546         fetch_add.run                   \
    547         ctxswitch-pthread.run           \
    548         ctxswitch-cfa_coroutine.run     \
    549         ctxswitch-cfa_thread.run        \
    550         ctxswitch-cfa_thread2.run       \
    551         ctxswitch-upp_coroutine.run     \
    552         ctxswitch-upp_thread.run        \
    553         -ctxswitch-kos_fibre.run        \
    554         -ctxswitch-kos_fibre2.run       \
    555         ctxswitch-goroutine.run         \
    556         ctxswitch-java_thread.run
     713        $(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
     714
     715@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre$(EXEEXT):
     716@WITH_LIBFIBRE_TRUE@    @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
     717
     718@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre2$(EXEEXT):
     719@WITH_LIBFIBRE_TRUE@    @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
     720
     721ctxswitch$(EXEEXT): $(CTXSWITCH_DEPEND)
    557722
    558723ctxswitch-pthread$(EXEEXT):
    … …  
    560725
    561726ctxswitch-cfa_coroutine$(EXEEXT):
    562         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
     727        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
    563728
    564729ctxswitch-cfa_thread$(EXEEXT):
    565         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
     730        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
    566731
    567732ctxswitch-cfa_thread2$(EXEEXT):
    568         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
     733        @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
    569734
    570735ctxswitch-upp_coroutine$(EXEEXT):
    … …  
    574739        @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    575740
    576 ctxswitch-kos_fibre$(EXEEXT):
    577         @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
    578 
    579 ctxswitch-kos_fibre2$(EXEEXT):
    580         @$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
    581 
    582741ctxswitch-goroutine$(EXEEXT):
    583742        @go build -o a.out $(srcdir)/ctxswitch/goroutine.go
    584743
    585744ctxswitch-java_thread$(EXEEXT):
    586         @javac $(srcdir)/ctxswitch/JavaThread.java
     745        @javac -d . $(srcdir)/ctxswitch/JavaThread.java
    587746        @echo "#!/bin/sh" > a.out
    588         @echo "cd ctxswitch && java JavaThread" >> a.out
     747        @echo "java JavaThread" >> a.out
    589748        @chmod a+x a.out
    590749
    … …  
    607766
    608767mutex-cfa1$(EXEEXT):
    609         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.c
     768        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
    610769
    611770mutex-cfa2$(EXEEXT):
    612         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.c
     771        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
    613772
    614773mutex-cfa4$(EXEEXT):
    615         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.c
     774        @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
    616775
    617776mutex-java_thread$(EXEEXT):
    618         @javac $(srcdir)/mutex/JavaThread.java
     777        @javac -d . $(srcdir)/mutex/JavaThread.java
    619778        @echo "#!/bin/sh" > a.out
    620         @echo "cd mutex && java JavaThread" >> a.out
     779        @echo "java JavaThread" >> a.out
    621780        @chmod a+x a.out
    622781
    … …  
    636795
    637796signal-cfa1$(EXEEXT):
    638         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.c
     797        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
    639798
    640799signal-cfa2$(EXEEXT):
    641         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.c
     800        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
    642801
    643802signal-cfa4$(EXEEXT):
    644         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.c
     803        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
    645804
    646805signal-java_thread$(EXEEXT):
    647         @javac $(srcdir)/schedint/JavaThread.java
     806        @javac -d . $(srcdir)/schedint/JavaThread.java
    648807        @echo "#!/bin/sh" > a.out
    649         @echo "cd schedint && java JavaThread" >> a.out
     808        @echo "java JavaThread" >> a.out
    650809        @chmod a+x a.out
    651810
    … …  
    660819
    661820waitfor-cfa1$(EXEEXT):
    662         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.c
     821        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
    663822
    664823waitfor-cfa2$(EXEEXT):
    665         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.c
     824        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
    666825
    667826waitfor-cfa4$(EXEEXT):
    668         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.c
     827        @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
    669828
    670829creation$(EXEEXT) :\
    … …  
    679838
    680839creation-cfa_coroutine$(EXEEXT):
    681         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
     840        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
    682841
    683842creation-cfa_coroutine_eager$(EXEEXT):
    684         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
     843        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa -DEAGER
    685844
    686845creation-cfa_thread$(EXEEXT):
    687         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.c
     846        @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
    688847
    689848creation-upp_coroutine$(EXEEXT):
    … …  
    700859
    701860creation-java_thread$(EXEEXT):
    702         @javac $(srcdir)/creation/JavaThread.java
     861        @javac -d . $(srcdir)/creation/JavaThread.java
    703862        @echo "#!/bin/sh" > a.out
    704         @echo "cd creation && java JavaThread" >> a.out
     863        @echo "java JavaThread" >> a.out
    705864        @chmod a+x a.out
    706865
    … …  
    716875
    717876compile-array$(EXEEXT):
    718         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.c
     877        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
    719878
    720879compile-attributes$(EXEEXT):
    721         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.c
     880        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
    722881
    723882compile-empty$(EXEEXT):
    724         @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.c
     883        @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
    725884
    726885compile-expression$(EXEEXT):
    727         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.c
     886        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
    728887
    729888compile-io$(EXEEXT):
    730         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.c
     889        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
    731890
    732891compile-monitor$(EXEEXT):
    733         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.c
     892        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
    734893
    735894compile-operators$(EXEEXT):
    736         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.c
     895        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
    737896
    738897compile-thread$(EXEEXT):
    739         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.c
     898        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
    740899
    741900compile-typeof$(EXEEXT):
    742         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.c
     901        @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
    743902
    744903# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.