Ignore:
Timestamp:
Jan 23, 2019, 4:52:16 PM (7 years ago)
Author:
Thierry Delisle <tdelisle@…>
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:
a200795
Parents:
9b086ca (diff), 1d832f4 (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 edited

Legend:

Unmodified
Added
Removed

  • benchmark/Makefile.in

    r9b086ca rcde3891  
    1717######################## -*- Mode: Makefile-Automake -*- ######################
    1818###############################################################################
    19 
    2019VPATH = @srcdir@
    2120am__is_gnu_make = { \
    … …  
    9291build_triplet = @build@
    9392host_triplet = @host@
    94 noinst_PROGRAMS =
     93EXTRA_PROGRAMS = dummy$(EXEEXT)
     94@WITH_LIBFIBRE_TRUE@am__append_1 = \
     95@WITH_LIBFIBRE_TRUE@    ctxswitch-kos_fibre.run  \
     96@WITH_LIBFIBRE_TRUE@    ctxswitch-kos_fibre2.run
     97
    9598subdir = benchmark
    9699ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    97 am__aclocal_m4_deps = $(top_srcdir)/automake/cfa.m4 \
    98         $(top_srcdir)/configure.ac
     100am__aclocal_m4_deps = $(top_srcdir)/automake/libtool.m4 \
     101        $(top_srcdir)/automake/ltoptions.m4 \
     102        $(top_srcdir)/automake/ltsugar.m4 \
     103        $(top_srcdir)/automake/ltversion.m4 \
     104        $(top_srcdir)/automake/lt~obsolete.m4 \
     105        $(top_srcdir)/automake/cfa.m4 $(top_srcdir)/configure.ac
    99106am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    100107        $(ACLOCAL_M4)
    … …  
    104111CONFIG_CLEAN_FILES =
    105112CONFIG_CLEAN_VPATH_FILES =
    106 PROGRAMS = $(noinst_PROGRAMS)
     113am_dummy_OBJECTS = dummyC.$(OBJEXT) dummyCXX.$(OBJEXT)
     114dummy_OBJECTS = $(am_dummy_OBJECTS)
     115dummy_LDADD = $(LDADD)
     116AM_V_lt = $(am__v_lt_@AM_V@)
     117am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
     118am__v_lt_0 = --silent
     119am__v_lt_1 =
    107120AM_V_P = $(am__v_P_@AM_V@)
    108121am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
    … …  
    117130am__v_at_0 = @
    118131am__v_at_1 =
    119 SOURCES =
    120 DIST_SOURCES =
     132DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
     133depcomp = $(SHELL) $(top_srcdir)/automake/depcomp
     134am__depfiles_maybe = depfiles
     135am__mv = mv -f
     136COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
     137        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
     138LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
     139        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
     140        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
     141        $(AM_CFLAGS) $(CFLAGS)
     142AM_V_CC = $(am__v_CC_@AM_V@)
     143am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
     144am__v_CC_0 = @echo "  CC      " $@;
     145am__v_CC_1 =
     146CCLD = $(CC)
     147LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
     148        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
     149        $(AM_LDFLAGS) $(LDFLAGS) -o $@
     150AM_V_CCLD = $(am__v_CCLD_@AM_V@)
     151am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
     152am__v_CCLD_0 = @echo "  CCLD    " $@;
     153am__v_CCLD_1 =
     154CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
     155        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
     156LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
     157        $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
     158        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
     159        $(AM_CXXFLAGS) $(CXXFLAGS)
     160AM_V_CXX = $(am__v_CXX_@AM_V@)
     161am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
     162am__v_CXX_0 = @echo "  CXX     " $@;
     163am__v_CXX_1 =
     164CXXLD = $(CXX)
     165CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
     166        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
     167        $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
     168AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
     169am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
     170am__v_CXXLD_0 = @echo "  CXXLD   " $@;
     171am__v_CXXLD_1 =
     172SOURCES = $(dummy_SOURCES)
     173DIST_SOURCES = $(dummy_SOURCES)
    121174am__can_run_installinfo = \
    122175  case $$AM_UPDATE_INFO_DIR in \
    … …  
    125178  esac
    126179am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
    127 am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/src/cfa.make \
    128         compile
     180# Read a list of newline-separated strings from the standard input,
     181# and print each of them once, without duplicates.  Input order is
     182# *not* preserved.
     183am__uniquify_input = $(AWK) '\
     184  BEGIN { nonempty = 0; } \
     185  { items[$$0] = 1; nonempty = 1; } \
     186  END { if (nonempty) { for (i in items) print i; }; } \
     187'
     188# Make sure the list of sources is unique.  This is necessary because,
     189# e.g., the same source file might be shared among _SOURCES variables
     190# for different programs/libraries.
     191am__define_uniq_tagged_files = \
     192  list='$(am__tagged_files)'; \
     193  unique=`for i in $$list; do \
     194    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
     195  done | $(am__uniquify_input)`
     196ETAGS = etags
     197CTAGS = ctags
     198am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/automake/depcomp \
     199        $(top_srcdir)/src/cfa.make compile
    129200DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    130201ACLOCAL = @ACLOCAL@
    … …  
    132203AMTAR = @AMTAR@
    133204AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
     205AR = @AR@
    134206AUTOCONF = @AUTOCONF@
    135207AUTOHEADER = @AUTOHEADER@
    136208AUTOMAKE = @AUTOMAKE@
    137209AWK = @AWK@
    138 BACKEND_CC = @BACKEND_CC@
    139210BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    140211CC = @CC@
    … …  
    156227CPPFLAGS = @CPPFLAGS@
    157228CXX = @CXX@
     229CXXCPP = @CXXCPP@
    158230CXXDEPMODE = @CXXDEPMODE@
    159231CXXFLAGS = @CXXFLAGS@
    … …  
    161233DEFS = @DEFS@
    162234DEPDIR = @DEPDIR@
     235DLLTOOL = @DLLTOOL@
    163236DRIVER_DIR = @DRIVER_DIR@
     237DSYMUTIL = @DSYMUTIL@
     238DUMPBIN = @DUMPBIN@
    164239ECHO_C = @ECHO_C@
    165240ECHO_N = @ECHO_N@
    … …  
    167242EGREP = @EGREP@
    168243EXEEXT = @EXEEXT@
     244FGREP = @FGREP@
    169245GREP = @GREP@
    170246HOST_FLAGS = @HOST_FLAGS@
    … …  
    174250INSTALL_SCRIPT = @INSTALL_SCRIPT@
    175251INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
     252LD = @LD@
    176253LDFLAGS = @LDFLAGS@
    177254LEX = @LEX@
    … …  
    182259LIBOBJS = @LIBOBJS@
    183260LIBS = @LIBS@
     261LIBTOOL = @LIBTOOL@
     262LIPO = @LIPO@
     263LN_S = @LN_S@
    184264LTLIBOBJS = @LTLIBOBJS@
     265LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
    185266MAKEINFO = @MAKEINFO@
     267MANIFEST_TOOL = @MANIFEST_TOOL@
    186268MKDIR_P = @MKDIR_P@
     269NM = @NM@
     270NMEDIT = @NMEDIT@
     271OBJDUMP = @OBJDUMP@
    187272OBJEXT = @OBJEXT@
     273OTOOL = @OTOOL@
     274OTOOL64 = @OTOOL64@
    188275PACKAGE = @PACKAGE@
    189276PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
    … …  
    195282PATH_SEPARATOR = @PATH_SEPARATOR@
    196283RANLIB = @RANLIB@
     284SED = @SED@
    197285SET_MAKE = @SET_MAKE@
    198286SHELL = @SHELL@
    … …  
    206294abs_top_builddir = @abs_top_builddir@
    207295abs_top_srcdir = @abs_top_srcdir@
     296ac_ct_AR = @ac_ct_AR@
    208297ac_ct_CC = @ac_ct_CC@
    209298ac_ct_CXX = @ac_ct_CXX@
     299ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
    210300am__include = @am__include@
    211301am__leading_dot = @am__leading_dot@
    … …  
    255345top_srcdir = @top_srcdir@
    256346AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
     347ACLOCAL_AMFLAGS = -I automake
    257348CFACOMPILE = $(CFACC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) $(AM_CFLAGS) $(CFLAGS)
     349LTCFACOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
     350        $(LIBTOOLFLAGS) --mode=compile $(CFACC) $(DEFS) \
     351        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CFAFLAGS) $(CFAFLAGS) \
     352        $(AM_CFLAGS) $(CFLAGS)
     353
    258354AM_V_CFA = $(am__v_CFA_@AM_V@)
    259355am__v_CFA_ = $(am__v_CFA_@AM_DEFAULT_V@)
    260356am__v_CFA_0 = @echo "  CFA     " $@;
    261357am__v_CFA_1 =
     358AM_V_JAVAC = $(am__v_JAVAC_@AM_V@)
     359am__v_JAVAC_ = $(am__v_JAVAC_@AM_DEFAULT_V@)
     360am__v_JAVAC_0 = @echo "  JAVAC   " $@;
     361am__v_JAVAC_1 =
     362AM_V_GOC = $(am__v_GOC_@AM_V@)
     363am__v_GOC_ = $(am__v_GOC_@AM_DEFAULT_V@)
     364am__v_GOC_0 = @echo "  GOC     " $@;
     365am__v_GOC_1 =
     366UPPCC = u++
     367UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
     368AM_V_UPP = $(am__v_UPP_@AM_V@)
     369am__v_UPP_ = $(am__v_UPP_@AM_DEFAULT_V@)
     370am__v_UPP_0 = @echo "  UPP     " $@;
     371am__v_UPP_1 =
    262372
    263373# applies to both programs
    264 UPPCOMPILE = $(UPPCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_UPPFLAGS) $(UPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_CFLAGS) $(CFLAGS)
    265374AM_CFLAGS = -O2 -Wall -I$(srcdir) -lrt -pthread
    266375AM_CFAFLAGS = -quiet -in-tree -nodebug
    267376AM_UPPFLAGS = -quiet -nodebug -multi
    268 TOOLSDIR = ${abs_top_srcdir}/tools/
    269 REPEAT = ${TOOLSDIR}repeat
    270 STATS = ${TOOLSDIR}stat.py
     377TOOLSDIR = ${abs_top_builddir}/tools/
     378REPEAT = ${abs_top_builddir}/tools/repeat
     379STATS = ${abs_top_srcdir}/tools/stat.py
    271380repeats = 30
    272381skipcompile = no
    273382TIME_FORMAT = "%E"
    274383PRINT_FORMAT = %20s: #Comments needed for spacing
     384dummy_SOURCES = dummyC.c dummyCXX.cpp
     385CTXSWITCH_DEPEND = loop.run function.run fetch_add.run \
     386        ctxswitch-pthread.run ctxswitch-cfa_coroutine.run \
     387        ctxswitch-cfa_thread.run ctxswitch-cfa_thread2.run \
     388        ctxswitch-upp_coroutine.run ctxswitch-upp_thread.run \
     389        ctxswitch-goroutine.run ctxswitch-java_thread.run \
     390        $(am__append_1)
    275391testdir = $(top_srcdir)/tests
    276392all: all-am
    277393
    278394.SUFFIXES:
    279 .SUFFIXES: .cfa .o
     395.SUFFIXES: .c .cfa .cpp .lo .o .obj
    280396$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(top_srcdir)/src/cfa.make $(am__configure_deps)
    281397        @for dep in $?; do \
    … …  
    309425$(am__aclocal_m4_deps):
    310426
    311 clean-noinstPROGRAMS:
    312         -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
    313 tags TAGS:
    314 
    315 ctags CTAGS:
    316 
    317 cscope cscopelist:
    318 
     427dummy$(EXEEXT): $(dummy_OBJECTS) $(dummy_DEPENDENCIES) $(EXTRA_dummy_DEPENDENCIES)
     428        @rm -f dummy$(EXEEXT)
     429        $(AM_V_CXXLD)$(CXXLINK) $(dummy_OBJECTS) $(dummy_LDADD) $(LIBS)
     430
     431mostlyclean-compile:
     432        -rm -f *.$(OBJEXT)
     433
     434distclean-compile:
     435        -rm -f *.tab.c
     436
     437@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummyC.Po@am__quote@
     438@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dummyCXX.Po@am__quote@
     439
     440.c.o:
     441@am__fastdepCC_TRUE@    $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
     442@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     443@am__fastdepCC_TRUE@    $(am__mv) $$depbase.Tpo $$depbase.Po
     444@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
     445@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     446@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
     447
     448.c.obj:
     449@am__fastdepCC_TRUE@    $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
     450@am__fastdepCC_TRUE@    $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
     451@am__fastdepCC_TRUE@    $(am__mv) $$depbase.Tpo $$depbase.Po
     452@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
     453@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     454@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
     455
     456.c.lo:
     457@am__fastdepCC_TRUE@    $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
     458@am__fastdepCC_TRUE@    $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     459@am__fastdepCC_TRUE@    $(am__mv) $$depbase.Tpo $$depbase.Plo
     460@AMDEP_TRUE@@am__fastdepCC_FALSE@       $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
     461@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     462@am__fastdepCC_FALSE@   $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
     463
     464.cpp.o:
     465@am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
     466@am__fastdepCXX_TRUE@   $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     467@am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
     468@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
     469@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     470@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
     471
     472.cpp.obj:
     473@am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
     474@am__fastdepCXX_TRUE@   $(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
     475@am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Po
     476@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
     477@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     478@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
     479
     480.cpp.lo:
     481@am__fastdepCXX_TRUE@   $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
     482@am__fastdepCXX_TRUE@   $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     483@am__fastdepCXX_TRUE@   $(am__mv) $$depbase.Tpo $$depbase.Plo
     484@AMDEP_TRUE@@am__fastdepCXX_FALSE@      $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
     485@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     486@am__fastdepCXX_FALSE@  $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
     487
     488mostlyclean-libtool:
     489        -rm -f *.lo
     490
     491clean-libtool:
     492        -rm -rf .libs _libs
     493
     494ID: $(am__tagged_files)
     495        $(am__define_uniq_tagged_files); mkid -fID $$unique
     496tags: tags-am
     497TAGS: tags
     498
     499tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
     500        set x; \
     501        here=`pwd`; \
     502        $(am__define_uniq_tagged_files); \
     503        shift; \
     504        if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
     505          test -n "$$unique" || unique=$$empty_fix; \
     506          if test $$# -gt 0; then \
     507            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     508              "$$@" $$unique; \
     509          else \
     510            $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
     511              $$unique; \
     512          fi; \
     513        fi
     514ctags: ctags-am
     515
     516CTAGS: ctags
     517ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
     518        $(am__define_uniq_tagged_files); \
     519        test -z "$(CTAGS_ARGS)$$unique" \
     520          || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
     521             $$unique
     522
     523GTAGS:
     524        here=`$(am__cd) $(top_builddir) && pwd` \
     525          && $(am__cd) $(top_srcdir) \
     526          && gtags -i $(GTAGS_ARGS) "$$here"
     527cscopelist: cscopelist-am
     528
     529cscopelist-am: $(am__tagged_files)
     530        list='$(am__tagged_files)'; \
     531        case "$(srcdir)" in \
     532          [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
     533          *) sdir=$(subdir)/$(srcdir) ;; \
     534        esac; \
     535        for i in $$list; do \
     536          if test -f "$$i"; then \
     537            echo "$(subdir)/$$i"; \
     538          else \
     539            echo "$$sdir/$$i"; \
     540          fi; \
     541        done >> $(top_builddir)/cscope.files
     542
     543distclean-tags:
     544        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
    319545
    320546distdir: $(DISTFILES)
    … …  
    350576check-am: all-am
    351577check: check-am
    352 all-am: Makefile $(PROGRAMS)
     578all-am: Makefile
    353579installdirs:
    354580install: install-am
    … …  
    384610clean: clean-am
    385611
    386 clean-am: clean-generic clean-noinstPROGRAMS mostlyclean-am
     612clean-am: clean-generic clean-libtool mostlyclean-am
    387613
    388614distclean: distclean-am
     615        -rm -rf ./$(DEPDIR)
    389616        -rm -f Makefile
    390 distclean-am: clean-am distclean-generic
     617distclean-am: clean-am distclean-compile distclean-generic \
     618        distclean-tags
    391619
    392620dvi: dvi-am
    … …  
    431659
    432660maintainer-clean: maintainer-clean-am
     661        -rm -rf ./$(DEPDIR)
    433662        -rm -f Makefile
    434663maintainer-clean-am: distclean-am maintainer-clean-generic
    … …  
    436665mostlyclean: mostlyclean-am
    437666
    438 mostlyclean-am: mostlyclean-generic
     667mostlyclean-am: mostlyclean-compile mostlyclean-generic \
     668        mostlyclean-libtool
    439669
    440670pdf: pdf-am
    … …  
    450680.MAKE: install-am install-strip
    451681
    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 \
     682.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
     683        clean-libtool cscopelist-am ctags ctags-am distclean \
     684        distclean-compile distclean-generic distclean-libtool \
     685        distclean-tags distdir dvi dvi-am html html-am info info-am \
    455686        install install-am install-data install-data-am install-dvi \
    456687        install-dvi-am install-exec install-exec-am install-html \
    … …  
    459690        install-strip installcheck installcheck-am installdirs \
    460691        maintainer-clean maintainer-clean-generic mostlyclean \
    461         mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
    462         uninstall-am
     692        mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
     693        pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am
    463694
    464695.PRECIOUS: Makefile
    465696
    466697
    467 .cfa.o: $(CFACC) $(CFACPP)
     698.cfa.o:
    468699        $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
    469700        $(CFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
    470701        $(am__mv) $$depbase.Tpo $$depbase.Po
    471702
    472 LIBFIBRE_DIR ?= /home/tdelisle/software/KOS/src/
     703.cfa.lo:
     704        $(AM_V_CFA)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
     705        $(LTCFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
     706        $(am__mv) $$depbase.Tpo $$depbase.Plo
     707
     708dummyC.c:
     709        @echo "int main() { return 0; }" > ${@}
     710
     711dummyCXX.cpp:
     712        @echo "int main() { return 0; }" > ${@}
    473713
    474714.NOTPARALLEL:
    … …  
    483723        @${STATS} .result.log
    484724        @echo "------------------------------------------------------"
    485         @rm -f a.out .result.log
     725        @rm -f a.out .result.log *.class
    486726
    487727%.runquiet :
    … …  
    495735
    496736${REPEAT} :
    497         @+make -C ${TOOLSDIR} repeat
     737        @+make -C ${abs_top_builddir}/tools repeat
    498738
    499739jenkins$(EXEEXT):
    … …  
    533773
    534774loop$(EXEEXT):
    535         $(COMPILE) -DBENCH_N=5000000000 loop.c
     775        $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/loop.c
    536776
    537777function$(EXEEXT):
    538         $(COMPILE) -DBENCH_N=5000000000 function.c
     778        $(AM_V_CC)$(COMPILE) -DBENCH_N=5000000000 $(srcdir)/function.c
    539779
    540780fetch_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
     781        $(AM_V_CC)$(COMPILE) -DBENCH_N=500000000  $(srcdir)/fetch_add.c
     782
     783@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre$(EXEEXT):
     784@WITH_LIBFIBRE_TRUE@    $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre.cpp  -I$(LIBFIBRE_DIR) -lfibre
     785
     786@WITH_LIBFIBRE_TRUE@ctxswitch-kos_fibre2$(EXEEXT):
     787@WITH_LIBFIBRE_TRUE@    $(AM_V_CXX)$(CXXCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/kos_fibre2.cpp -I$(LIBFIBRE_DIR) -lfibre
     788
     789ctxswitch$(EXEEXT): $(CTXSWITCH_DEPEND)
    557790
    558791ctxswitch-pthread$(EXEEXT):
    559         @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
     792        $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/ctxswitch/pthreads.c
    560793
    561794ctxswitch-cfa_coroutine$(EXEEXT):
    562         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.c
     795        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_cor.cfa
    563796
    564797ctxswitch-cfa_thread$(EXEEXT):
    565         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.c
     798        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd.cfa
    566799
    567800ctxswitch-cfa_thread2$(EXEEXT):
    568         @$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.c
     801        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/cfa_thrd2.cfa
    569802
    570803ctxswitch-upp_coroutine$(EXEEXT):
    571         @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
     804        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_cor.cc
    572805
    573806ctxswitch-upp_thread$(EXEEXT):
    574         @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    575 
    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
     807        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/ctxswitch/upp_thrd.cc
    581808
    582809ctxswitch-goroutine$(EXEEXT):
    583         @go build -o a.out $(srcdir)/ctxswitch/goroutine.go
     810        $(AM_V_GOC)go build -o a.out $(srcdir)/ctxswitch/goroutine.go
    584811
    585812ctxswitch-java_thread$(EXEEXT):
    586         @javac $(srcdir)/ctxswitch/JavaThread.java
     813        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/ctxswitch/JavaThread.java
    587814        @echo "#!/bin/sh" > a.out
    588         @echo "cd ctxswitch && java JavaThread" >> a.out
     815        @echo "java JavaThread" >> a.out
    589816        @chmod a+x a.out
    590817
    … …  
    601828
    602829mutex-pthread_lock$(EXEEXT):
    603         @$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
     830        $(AM_V_CC)$(COMPILE)    -DBENCH_N=50000000 $(srcdir)/mutex/pthreads.c
    604831
    605832mutex-upp$(EXEEXT):
    606         @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
     833        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/mutex/upp.cc
    607834
    608835mutex-cfa1$(EXEEXT):
    609         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.c
     836        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa1.cfa
    610837
    611838mutex-cfa2$(EXEEXT):
    612         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.c
     839        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa2.cfa
    613840
    614841mutex-cfa4$(EXEEXT):
    615         @$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.c
     842        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=5000000  $(srcdir)/mutex/cfa4.cfa
    616843
    617844mutex-java_thread$(EXEEXT):
    618         @javac $(srcdir)/mutex/JavaThread.java
     845        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/mutex/JavaThread.java
    619846        @echo "#!/bin/sh" > a.out
    620         @echo "cd mutex && java JavaThread" >> a.out
     847        @echo "java JavaThread" >> a.out
    621848        @chmod a+x a.out
    622849
    … …  
    630857
    631858signal-pthread_cond$(EXEEXT):
    632         @$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
     859        $(AM_V_CC)$(COMPILE)    -DBENCH_N=500000  $(srcdir)/schedint/pthreads.c
    633860
    634861signal-upp$(EXEEXT):
    635         @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
     862        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedint/upp.cc
    636863
    637864signal-cfa1$(EXEEXT):
    638         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.c
     865        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa1.cfa
    639866
    640867signal-cfa2$(EXEEXT):
    641         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.c
     868        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa2.cfa
    642869
    643870signal-cfa4$(EXEEXT):
    644         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.c
     871        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedint/cfa4.cfa
    645872
    646873signal-java_thread$(EXEEXT):
    647         @javac $(srcdir)/schedint/JavaThread.java
     874        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/schedint/JavaThread.java
    648875        @echo "#!/bin/sh" > a.out
    649         @echo "cd schedint && java JavaThread" >> a.out
     876        @echo "java JavaThread" >> a.out
    650877        @chmod a+x a.out
    651878
    … …  
    657884
    658885waitfor-upp$(EXEEXT):
    659         @$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
     886        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=5000000 $(srcdir)/schedext/upp.cc
    660887
    661888waitfor-cfa1$(EXEEXT):
    662         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.c
     889        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa1.cfa
    663890
    664891waitfor-cfa2$(EXEEXT):
    665         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.c
     892        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa2.cfa
    666893
    667894waitfor-cfa4$(EXEEXT):
    668         @$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.c
     895        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=500000  $(srcdir)/schedext/cfa4.cfa
    669896
    670897creation$(EXEEXT) :\
    … …  
    679906
    680907creation-cfa_coroutine$(EXEEXT):
    681         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
     908        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa
    682909
    683910creation-cfa_coroutine_eager$(EXEEXT):
    684         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.c
     911        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_cor.cfa  -DEAGER
    685912
    686913creation-cfa_thread$(EXEEXT):
    687         @$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.c
     914        $(AM_V_CFA)$(CFACOMPILE) -DBENCH_N=10000000 $(srcdir)/creation/cfa_thrd.cfa
    688915
    689916creation-upp_coroutine$(EXEEXT):
    690         @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
     917        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_cor.cc
    691918
    692919creation-upp_thread$(EXEEXT):
    693         @$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
     920        $(AM_V_UPP)$(UPPCOMPILE) -DBENCH_N=50000000 $(srcdir)/creation/upp_thrd.cc
    694921
    695922creation-pthread$(EXEEXT):
    696         @$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
     923        $(AM_V_CC)$(COMPILE)    -DBENCH_N=250000   $(srcdir)/creation/pthreads.c
    697924
    698925creation-goroutine$(EXEEXT):
    699         @go build -o a.out $(srcdir)/creation/goroutine.go
     926        $(AM_V_GOC)go build -o a.out $(srcdir)/creation/goroutine.go
    700927
    701928creation-java_thread$(EXEEXT):
    702         @javac $(srcdir)/creation/JavaThread.java
     929        $(AM_V_JAVAC)javac -d $(builddir) $(srcdir)/creation/JavaThread.java
    703930        @echo "#!/bin/sh" > a.out
    704         @echo "cd creation && java JavaThread" >> a.out
     931        @echo "java JavaThread" >> a.out
    705932        @chmod a+x a.out
    706933
    … …  
    716943
    717944compile-array$(EXEEXT):
    718         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.c
     945        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/array.cfa
    719946
    720947compile-attributes$(EXEEXT):
    721         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.c
     948        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/attributes.cfa
    722949
    723950compile-empty$(EXEEXT):
    724         @$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.c
     951        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(srcdir)/compile/empty.cfa
    725952
    726953compile-expression$(EXEEXT):
    727         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.c
     954        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/expression.cfa
    728955
    729956compile-io$(EXEEXT):
    730         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.c
     957        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/io1.cfa
    731958
    732959compile-monitor$(EXEEXT):
    733         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.c
     960        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/monitor.cfa
    734961
    735962compile-operators$(EXEEXT):
    736         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.c
     963        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/operators.cfa
    737964
    738965compile-thread$(EXEEXT):
    739         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.c
     966        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/concurrent/thread.cfa
    740967
    741968compile-typeof$(EXEEXT):
    742         @$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.c
     969        $(AM_V_CFA)$(CFACOMPILE) -fsyntax-only -w $(testdir)/typeof.cfa
    743970
    744971# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.