Changeset facc44f


Ignore:
Timestamp:
Feb 20, 2017, 12:05:40 PM (5 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
bd9bcc8
Parents:
cf97ccb
Message:

Added option to compile without concurrency using --disable-threading on the configure (will fail concurrency related tests)

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • configure

    rcf97ccb rfacc44f  
    658658CFA_INCDIR
    659659CFA_PREFIX
     660BUILD_CONCURRENCY_FALSE
     661BUILD_CONCURRENCY_TRUE
    660662BUILD_NO_LIB_FALSE
    661663BUILD_NO_LIB_TRUE
     
    742744enable_target_release
    743745enable_target_debug
     746enable_threading
    744747enable_dependency_tracking
    745748'
     
    13861389  --enable-target-release Build and install the release target
    13871390  --enable-target-debug   Build and install the debug target
     1391  --enable-threading      Build and install libcfa with threading support
     1392                          (Enabled by default)
    13881393  --disable-dependency-tracking  speeds up one-time build
    13891394  --enable-dependency-tracking   do not reject slow dependency extractors
     
    31233128fi
    31243129
     3130# Check whether --enable-threading was given.
     3131if test "${enable_threading+set}" = set; then :
     3132  enableval=$enable_threading; case "${enableval}" in
     3133  yes) build_threading-"yes" ;;
     3134  no)  build_threading="no" ;;
     3135  *) as_fn_error $? "bad value ${enableval} for --enable-debug" "$LINENO" 5 ;;
     3136esac
     3137else
     3138  build_threading="yes"
     3139fi
     3140
    31253141
    31263142case "$enable_target_release" in
     
    31973213  BUILD_NO_LIB_TRUE='#'
    31983214  BUILD_NO_LIB_FALSE=
     3215fi
     3216
     3217 if test "x$build_threading" = "xyes"; then
     3218  BUILD_CONCURRENCY_TRUE=
     3219  BUILD_CONCURRENCY_FALSE='#'
     3220else
     3221  BUILD_CONCURRENCY_TRUE='#'
     3222  BUILD_CONCURRENCY_FALSE=
    31993223fi
    32003224
     
    63186342if test -z "${BUILD_NO_LIB_TRUE}" && test -z "${BUILD_NO_LIB_FALSE}"; then
    63196343  as_fn_error $? "conditional \"BUILD_NO_LIB\" was never defined.
     6344Usually this means the macro was only invoked conditionally." "$LINENO" 5
     6345fi
     6346if test -z "${BUILD_CONCURRENCY_TRUE}" && test -z "${BUILD_CONCURRENCY_FALSE}"; then
     6347  as_fn_error $? "conditional \"BUILD_CONCURRENCY\" was never defined.
    63206348Usually this means the macro was only invoked conditionally." "$LINENO" 5
    63216349fi
  • configure.ac

    rcf97ccb rfacc44f  
    5757AC_ARG_ENABLE(target-release, AS_HELP_STRING([--enable-target-release], [Build and install the release target]))
    5858AC_ARG_ENABLE(target-debug, AS_HELP_STRING([--enable-target-debug], [Build and install the debug target]))
     59AC_ARG_ENABLE(threading, AS_HELP_STRING([--enable-threading], [Build and install libcfa with threading support (Enabled by default)]),
     60[case "${enableval}" in
     61  yes) build_threading-"yes" ;;
     62  no)  build_threading="no" ;;
     63  *) AC_MSG_ERROR([bad value ${enableval} for --enable-debug]) ;;
     64esac],[build_threading="yes"])
    5965
    6066case "$enable_target_release" in
     
    112118AM_CONDITIONAL([BUILD_DEBUG], [test "x$build_debug" = "xyes"])
    113119AM_CONDITIONAL([BUILD_NO_LIB], [test "x$build_release$build_debug" = "xnono"])
     120AM_CONDITIONAL([BUILD_CONCURRENCY], [test "x$build_threading" = "xyes"])
    114121
    115122if test "x$prefix" = "xNONE"; then
  • src/libcfa/Makefile.am

    rcf97ccb rfacc44f  
    4040CC = ${abs_top_srcdir}/src/driver/cfa
    4141
    42 headers = limits stdlib math iostream fstream iterator rational assert containers/vector concurrency/coroutines concurrency/threads concurrency/kernel
    43 runtimehdrs = concurrency
     42headers = limits stdlib math iostream fstream iterator rational assert
     43
     44# not all platforms support concurrency, add option do disable it
     45if BUILD_CONCURRENCY
     46headers += containers/vector concurrency/coroutines concurrency/threads concurrency/kernel
     47endif
     48
    4449libobjs = ${headers:=.o}
     50libsrc = libcfa-prelude.c ${headers:=.c}
     51
     52# not all platforms support concurrency, add option do disable it
     53if BUILD_CONCURRENCY
     54libsrc += concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
     55endif
    4556
    4657# extensionless header files are overridden by -o flag in default makerule => explicitly override default rule to silently do nothing
     
    5667${libobjs} : ${abs_top_srcdir}/src/driver/cfa-cpp ${cfalib_DATA} # add dependency to cfa-cpp so all libraries are rebuilt with new translator
    5768
    58 libsrc = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
    5969
    6070libcfa_a_SOURCES = ${libsrc}
  • src/libcfa/Makefile.in

    rcf97ccb rfacc44f  
    4141@BUILD_RELEASE_TRUE@am__append_1 = libcfa.a
    4242@BUILD_DEBUG_TRUE@am__append_2 = libcfa-d.a
     43
     44# not all platforms support concurrency, add option do disable it
     45@BUILD_CONCURRENCY_TRUE@am__append_3 = containers/vector concurrency/coroutines concurrency/threads concurrency/kernel
     46
     47# not all platforms support concurrency, add option do disable it
     48@BUILD_CONCURRENCY_TRUE@am__append_4 = concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
    4349subdir = src/libcfa
    44 DIST_COMMON = $(nobase_cfa_include_HEADERS) $(srcdir)/Makefile.am \
    45         $(srcdir)/Makefile.in
     50DIST_COMMON = $(am__nobase_cfa_include_HEADERS_DIST) \
     51        $(srcdir)/Makefile.am $(srcdir)/Makefile.in
    4652ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    4753am__aclocal_m4_deps = $(top_srcdir)/configure.ac
     
    9197libcfa_d_a_AR = $(AR) $(ARFLAGS)
    9298libcfa_d_a_LIBADD =
     99am__libcfa_d_a_SOURCES_DIST = libcfa-prelude.c limits.c stdlib.c \
     100        math.c iostream.c fstream.c iterator.c rational.c assert.c \
     101        containers/vector.c concurrency/coroutines.c \
     102        concurrency/threads.c concurrency/kernel.c \
     103        concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
    93104am__dirstamp = $(am__leading_dot)dirstamp
    94 am__objects_1 = libcfa_d_a-limits.$(OBJEXT) \
     105@BUILD_CONCURRENCY_TRUE@am__objects_1 = containers/libcfa_d_a-vector.$(OBJEXT) \
     106@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_d_a-coroutines.$(OBJEXT) \
     107@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_d_a-threads.$(OBJEXT) \
     108@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_d_a-kernel.$(OBJEXT)
     109am__objects_2 = libcfa_d_a-limits.$(OBJEXT) \
    95110        libcfa_d_a-stdlib.$(OBJEXT) libcfa_d_a-math.$(OBJEXT) \
    96111        libcfa_d_a-iostream.$(OBJEXT) libcfa_d_a-fstream.$(OBJEXT) \
    97112        libcfa_d_a-iterator.$(OBJEXT) libcfa_d_a-rational.$(OBJEXT) \
    98         libcfa_d_a-assert.$(OBJEXT) \
    99         containers/libcfa_d_a-vector.$(OBJEXT) \
    100         concurrency/libcfa_d_a-coroutines.$(OBJEXT) \
    101         concurrency/libcfa_d_a-threads.$(OBJEXT) \
    102         concurrency/libcfa_d_a-kernel.$(OBJEXT)
    103 am__objects_2 = libcfa_d_a-libcfa-prelude.$(OBJEXT) $(am__objects_1) \
    104         concurrency/CtxSwitch-@MACHINE_TYPE@.$(OBJEXT) \
    105         concurrency/libcfa_d_a-invoke.$(OBJEXT)
    106 am_libcfa_d_a_OBJECTS = $(am__objects_2)
     113        libcfa_d_a-assert.$(OBJEXT) $(am__objects_1)
     114@BUILD_CONCURRENCY_TRUE@am__objects_3 = concurrency/CtxSwitch-@MACHINE_TYPE@.$(OBJEXT) \
     115@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_d_a-invoke.$(OBJEXT)
     116am__objects_4 = libcfa_d_a-libcfa-prelude.$(OBJEXT) $(am__objects_2) \
     117        $(am__objects_3)
     118am_libcfa_d_a_OBJECTS = $(am__objects_4)
    107119libcfa_d_a_OBJECTS = $(am_libcfa_d_a_OBJECTS)
    108120libcfa_a_AR = $(AR) $(ARFLAGS)
    109121libcfa_a_LIBADD =
    110 am__objects_3 = libcfa_a-limits.$(OBJEXT) libcfa_a-stdlib.$(OBJEXT) \
     122am__libcfa_a_SOURCES_DIST = libcfa-prelude.c limits.c stdlib.c math.c \
     123        iostream.c fstream.c iterator.c rational.c assert.c \
     124        containers/vector.c concurrency/coroutines.c \
     125        concurrency/threads.c concurrency/kernel.c \
     126        concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
     127@BUILD_CONCURRENCY_TRUE@am__objects_5 =  \
     128@BUILD_CONCURRENCY_TRUE@        containers/libcfa_a-vector.$(OBJEXT) \
     129@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_a-coroutines.$(OBJEXT) \
     130@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_a-threads.$(OBJEXT) \
     131@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_a-kernel.$(OBJEXT)
     132am__objects_6 = libcfa_a-limits.$(OBJEXT) libcfa_a-stdlib.$(OBJEXT) \
    111133        libcfa_a-math.$(OBJEXT) libcfa_a-iostream.$(OBJEXT) \
    112134        libcfa_a-fstream.$(OBJEXT) libcfa_a-iterator.$(OBJEXT) \
    113135        libcfa_a-rational.$(OBJEXT) libcfa_a-assert.$(OBJEXT) \
    114         containers/libcfa_a-vector.$(OBJEXT) \
    115         concurrency/libcfa_a-coroutines.$(OBJEXT) \
    116         concurrency/libcfa_a-threads.$(OBJEXT) \
    117         concurrency/libcfa_a-kernel.$(OBJEXT)
    118 am__objects_4 = libcfa_a-libcfa-prelude.$(OBJEXT) $(am__objects_3) \
    119         concurrency/CtxSwitch-@MACHINE_TYPE@.$(OBJEXT) \
    120         concurrency/libcfa_a-invoke.$(OBJEXT)
    121 am_libcfa_a_OBJECTS = $(am__objects_4)
     136        $(am__objects_5)
     137@BUILD_CONCURRENCY_TRUE@am__objects_7 = concurrency/CtxSwitch-@MACHINE_TYPE@.$(OBJEXT) \
     138@BUILD_CONCURRENCY_TRUE@        concurrency/libcfa_a-invoke.$(OBJEXT)
     139am__objects_8 = libcfa_a-libcfa-prelude.$(OBJEXT) $(am__objects_6) \
     140        $(am__objects_7)
     141am_libcfa_a_OBJECTS = $(am__objects_8)
    122142libcfa_a_OBJECTS = $(am_libcfa_a_OBJECTS)
    123143DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
     
    147167am__v_GEN_0 = @echo "  GEN   " $@;
    148168SOURCES = $(libcfa_d_a_SOURCES) $(libcfa_a_SOURCES)
    149 DIST_SOURCES = $(libcfa_d_a_SOURCES) $(libcfa_a_SOURCES)
     169DIST_SOURCES = $(am__libcfa_d_a_SOURCES_DIST) \
     170        $(am__libcfa_a_SOURCES_DIST)
     171am__nobase_cfa_include_HEADERS_DIST = limits stdlib math iostream \
     172        fstream iterator rational assert containers/vector \
     173        concurrency/coroutines concurrency/threads concurrency/kernel \
     174        ${shell echo stdhdr/*} concurrency/invoke.h
    150175HEADERS = $(nobase_cfa_include_HEADERS)
    151176ETAGS = etags
     
    276301EXTRA_FLAGS = -g -Wall -Wno-unused-function -I${abs_top_srcdir}/src/libcfa/libhdr -imacros libcfa-prelude.c @CFA_FLAGS@
    277302AM_CCASFLAGS = @CFA_FLAGS@
    278 headers = limits stdlib math iostream fstream iterator rational assert containers/vector concurrency/coroutines concurrency/threads concurrency/kernel
    279 runtimehdrs = concurrency
     303headers = limits stdlib math iostream fstream iterator rational assert \
     304        $(am__append_3)
    280305libobjs = ${headers:=.o}
    281 libsrc = libcfa-prelude.c ${headers:=.c} concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/invoke.c
     306libsrc = libcfa-prelude.c ${headers:=.c} $(am__append_4)
    282307libcfa_a_SOURCES = ${libsrc}
    283308libcfa_a_CFLAGS = -nodebug -O2
Note: See TracChangeset for help on using the changeset viewer.