Changeset bbfd0e0 for libcfa


Ignore:
Timestamp:
Aug 7, 2019, 3:23:56 PM (6 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
14347ac
Parents:
7e0017f5
Message:

Tentative support for distcc in cforall, right now nothing works because distcc doesn't understand cfa

Location:
libcfa
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • libcfa/Makefile.in

    r7e0017f5 rbbfd0e0  
    231231CFACC = @CFACC@
    232232CFACPP = @CFACPP@
     233CFADIR_HASH = @CFADIR_HASH@
    233234CFA_BINDIR = @CFA_BINDIR@
    234235CFA_INCDIR = @CFA_INCDIR@
    … …  
    274275LIPO = @LIPO@
    275276LN_S = @LN_S@
     277LOCAL_CFACC = @LOCAL_CFACC@
     278LOCAL_CFACPP = @LOCAL_CFACPP@
    276279LTLIBOBJS = @LTLIBOBJS@
    277280LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
    … …  
    293296PACKAGE_VERSION = @PACKAGE_VERSION@
    294297PATH_SEPARATOR = @PATH_SEPARATOR@
     298PRELUDEFLAG = @PRELUDEFLAG@
    295299RANLIB = @RANLIB@
    296300SED = @SED@

  • libcfa/configure

    r7e0017f5 rbbfd0e0  
    707707CONFIG_CFLAGS
    708708ARCH_FLAGS
     709PRELUDEFLAG
     710CFADIR_HASH
     711LOCAL_CFACPP
     712LOCAL_CFACC
    709713CFACPP
    710714CFACC
     715ENABLE_DISTCC_FALSE
     716ENABLE_DISTCC_TRUE
    711717CFA_VERSION
    712718DRIVER_DIR
    … …  
    783789enable_option_checking
    784790enable_silent_rules
     791enable_distcc
    785792with_cfa_name
    786793enable_shared
    … …  
    14451452  --enable-silent-rules   less verbose build output (undo: "make V=1")
    14461453  --disable-silent-rules  verbose build output (undo: "make V=0")
     1454  --enable-distcc     whether or not to enable distributed compilation
    14471455  --enable-shared[=PKGS]  build shared libraries [default=yes]
    14481456  --enable-static[=PKGS]  build static libraries [default=yes]
    … …  
    29412949
    29422950
    2943 CFACC=${DRIVER_DIR}cfa
    2944 CFACPP=${DRIVER_DIR}cfa-cpp
     2951# Check whether --enable-distcc was given.
     2952if test "${enable_distcc+set}" = set; then :
     2953  enableval=$enable_distcc; enable_distcc=$enableval
     2954else
     2955  enable_distcc=no
     2956fi
     2957
     2958
     2959echo -n "checking for distributated build... "
     2960if test x$enable_distcc = xno; then
     2961        CFACC=${DRIVER_DIR}cfa
     2962        CFACPP=${DRIVER_DIR}cfa-cpp
     2963        PRELUDEFLAG='-in-tree'
     2964        echo "no"
     2965else
     2966        path=$(readlink -f .)
     2967        CFADIR_HASH=$(openssl dgst -sha256 <<< $path)
     2968        CFADIR_HASH="${CFADIR_HASH: -10}"
     2969        CFACC="/home/tdelisle/workspace/master-cforall/main/tools/build/distcc ~/.cfadistcc/${CFADIR_HASH}/g++"
     2970        CFACPP="/home/tdelisle/workspace/master-cforall/main/tools/build/distcc ~/.cfadistcc/${CFADIR_HASH}/cfa-cpp"
     2971        PRELUDEFLAG='-dist-tree'
     2972        echo "yes (hash=${CFADIR_HASH})"
     2973fi
     2974LOCAL_CFACC=${DRIVER_DIR}cfa
     2975LOCAL_CFACPP=${DRIVER_DIR}cfa-cpp
     2976
     2977 if test x$enable_distcc = xyes; then
     2978  ENABLE_DISTCC_TRUE=
     2979  ENABLE_DISTCC_FALSE='#'
     2980else
     2981  ENABLE_DISTCC_TRUE='#'
     2982  ENABLE_DISTCC_FALSE=
     2983fi
     2984
     2985
     2986
     2987
     2988
     2989
    29452990
    29462991
    … …  
    1698217027fi
    1698317028
     17029if test -z "${ENABLE_DISTCC_TRUE}" && test -z "${ENABLE_DISTCC_FALSE}"; then
     17030  as_fn_error $? "conditional \"ENABLE_DISTCC\" was never defined.
     17031Usually this means the macro was only invoked conditionally." "$LINENO" 5
     17032fi
    1698417033if test -z "${BUILDLIB_TRUE}" && test -z "${BUILDLIB_FALSE}"; then
    1698517034  as_fn_error $? "conditional \"BUILDLIB\" was never defined.

  • libcfa/configure.ac

    r7e0017f5 rbbfd0e0  
    2727AC_ARG_VAR(CFA_VERSION, [The long version of cfa])
    2828
    29 CFACC=${DRIVER_DIR}cfa
    30 CFACPP=${DRIVER_DIR}cfa-cpp
     29AC_ARG_ENABLE(distcc,
     30        [  --enable-distcc     whether or not to enable distributed compilation],
     31        enable_distcc=$enableval, enable_distcc=no)
     32
     33echo -n "checking for distributated build... "
     34if test x$enable_distcc = xno; then
     35        CFACC=${DRIVER_DIR}cfa
     36        CFACPP=${DRIVER_DIR}cfa-cpp
     37        PRELUDEFLAG='-in-tree'
     38        echo "no"
     39else
     40        path=$(readlink -f .)
     41        CFADIR_HASH=$(openssl dgst -sha256 <<< $path)
     42        CFADIR_HASH="${CFADIR_HASH: -10}"
     43        CFACC="/home/tdelisle/workspace/master-cforall/main/tools/build/distcc ~/.cfadistcc/${CFADIR_HASH}/g++"
     44        CFACPP="/home/tdelisle/workspace/master-cforall/main/tools/build/distcc ~/.cfadistcc/${CFADIR_HASH}/cfa-cpp"
     45        PRELUDEFLAG='-dist-tree'
     46        echo "yes (hash=${CFADIR_HASH})"
     47fi
     48LOCAL_CFACC=${DRIVER_DIR}cfa
     49LOCAL_CFACPP=${DRIVER_DIR}cfa-cpp
     50
     51AM_CONDITIONAL([ENABLE_DISTCC], [test x$enable_distcc = xyes])
     52
    3153AC_SUBST(CFACC)
    3254AC_SUBST(CFACPP)
     55AC_SUBST(LOCAL_CFACC)
     56AC_SUBST(LOCAL_CFACPP)
     57AC_SUBST(CFADIR_HASH)
    3358AC_SUBST(CFA_VERSION)
     59AC_SUBST(PRELUDEFLAG)
    3460
    3561#==============================================================================

  • libcfa/prelude/Makefile.am

    r7e0017f5 rbbfd0e0  
    2323cfalib_DATA = gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c
    2424
    25 CC = @CFACC@
     25CC = @LOCAL_CFACC@
    2626AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC @ARCH_FLAGS@ @CONFIG_CFLAGS@
    2727AM_CFAFLAGS = @CONFIG_CFAFLAGS@
    … …  
    5454
    5555# create forward declarations for cfa builtins
    56 builtins.cf : builtins.c ${CC}
     56builtins.cf : builtins.c @LOCAL_CFACC@
    5757        ${AM_V_GEN}gcc ${AM_CFLAGS} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po -D__cforall
    5858        ${AM_V_at}sed -i 's/builtins.o/builtins.cf/g' $(DEPDIR)/builtins.Po
    … …  
    6060include $(DEPDIR)/builtins.Po
    6161
    62 bootloader.c : ${srcdir}/bootloader.cf prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACPP@
    63         ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
     62bootloader.c : ${srcdir}/bootloader.cf prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACPP@
     63        ${AM_V_GEN}@LOCAL_CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
    6464
    6565maintainer-clean-local :
    … …  
    6868MOSTLYCLEANFILES = bootloader.c builtins.cf extras.cf gcc-builtins.c gcc-builtins.cf prelude.cfa
    6969MAINTAINERCLEANFILES = ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}
     70
     71if ENABLE_DISTCC
     72distribution: @LOCAL_CFACC@ @LOCAL_CFACPP@ gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c $(srcdir)/../../tools/build/push2dist.sh
     73        ${AM_V_GEN}$(srcdir)/../../tools/build/push2dist.sh @CFADIR_HASH@
     74        echo "Dummy file to track distribution to remote hosts" > ${@}
     75
     76all: all-am distribution
     77endif ENABLE_DISTCC

  • libcfa/prelude/Makefile.in

    r7e0017f5 rbbfd0e0  
    167167AUTOMAKE = @AUTOMAKE@
    168168AWK = @AWK@
    169 CC = @CFACC@
     169CC = @LOCAL_CFACC@
    170170CCAS = @CCAS@
    171171CCASDEPMODE = @CCASDEPMODE@
    … …  
    174174CFACC = @CFACC@
    175175CFACPP = @CFACPP@
     176CFADIR_HASH = @CFADIR_HASH@
    176177CFA_BINDIR = @CFA_BINDIR@
    177178CFA_INCDIR = @CFA_INCDIR@
    … …  
    217218LIPO = @LIPO@
    218219LN_S = @LN_S@
     220LOCAL_CFACC = @LOCAL_CFACC@
     221LOCAL_CFACPP = @LOCAL_CFACPP@
    219222LTLIBOBJS = @LTLIBOBJS@
    220223LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
    … …  
    236239PACKAGE_VERSION = @PACKAGE_VERSION@
    237240PATH_SEPARATOR = @PATH_SEPARATOR@
     241PRELUDEFLAG = @PRELUDEFLAG@
    238242RANLIB = @RANLIB@
    239243SED = @SED@
    … …  
    555559
    556560# create forward declarations for cfa builtins
    557 builtins.cf : builtins.c ${CC}
     561builtins.cf : builtins.c @LOCAL_CFACC@
    558562        ${AM_V_GEN}gcc ${AM_CFLAGS} -E -P ${<} -o ${@} -MD -MP -MF $(DEPDIR)/builtins.Po -D__cforall
    559563        ${AM_V_at}sed -i 's/builtins.o/builtins.cf/g' $(DEPDIR)/builtins.Po
    … …  
    561565include $(DEPDIR)/builtins.Po
    562566
    563 bootloader.c : ${srcdir}/bootloader.cf prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACPP@
    564         ${AM_V_GEN}@CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
     567bootloader.c : ${srcdir}/bootloader.cf prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACPP@
     568        ${AM_V_GEN}@LOCAL_CFACPP@ --prelude-dir=${builddir} -tpm ${srcdir}/bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
    565569
    566570maintainer-clean-local :
    567571        rm -rf $(DEPDIR)
     572
     573@ENABLE_DISTCC_TRUE@distribution: @LOCAL_CFACC@ @LOCAL_CFACPP@ gcc-builtins.cf builtins.cf extras.cf prelude.cfa bootloader.c $(srcdir)/../../tools/build/push2dist.sh
     574@ENABLE_DISTCC_TRUE@    ${AM_V_GEN}$(srcdir)/../../tools/build/push2dist.sh @CFADIR_HASH@
     575@ENABLE_DISTCC_TRUE@    echo "Dummy file to track distribution to remote hosts" > ${@}
     576
     577@ENABLE_DISTCC_TRUE@all: all-am distribution
    568578
    569579# Tell versions [3.59,3.63) of GNU make to not export all variables.

  • libcfa/src/Makefile.am

    r7e0017f5 rbbfd0e0  
    3030# use -no-include-stdhdr to prevent rebuild cycles
    3131# The built sources must not depend on the installed headers
    32 AM_CFAFLAGS = -quiet -in-tree -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
     32AM_CFAFLAGS = -v @PRELUDEFLAG@ -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
    3333AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC @ARCH_FLAGS@ @CONFIG_CFLAGS@
    3434AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
    … …  
    6262# add dependency of cfa files
    6363libobjs = $(addsuffix .lo, $(basename $(filter %.cfa,$(libsrc))))
    64 $(libobjs) : @CFACC@ @CFACPP@ prelude.cfa
     64$(libobjs) : @LOCAL_CFACC@ @LOCAL_CFACPP@ prelude.cfa
    6565
    6666thread_libobjs = $(addsuffix .lo, $(basename $(filter %.cfa,$(thread_libsrc))))
    67 $(thread_libobjs) : @CFACC@ @CFACPP@ prelude.cfa
     67$(thread_libobjs) : @LOCAL_CFACC@ @LOCAL_CFACPP@ prelude.cfa
    6868
    6969
    … …  
    8484
    8585
    86 prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
    87         ${AM_V_GEN}$(CFACOMPILE) -quiet -in-tree -XCFA -l ${<} -c -o ${@}
     86prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @LOCAL_CFACPP@
     87        ${AM_V_GEN}$(CFACOMPILE) -quiet @PRELUDEFLAG@ -XCFA -l ${<} -c -o ${@}
    8888
    89 prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
     89prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @LOCAL_CFACPP@
    9090        ${AM_V_GEN}$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \
    91         $(CFACOMPILE) -quiet -in-tree -XCFA -l ${<} -c -o ${@}
     91        $(CFACOMPILE) -quiet @PRELUDEFLAG@ -XCFA -l ${<} -c -o ${@}
    9292
    9393

  • libcfa/src/Makefile.in

    r7e0017f5 rbbfd0e0  
    284284CFACC = @CFACC@
    285285CFACPP = @CFACPP@
     286CFADIR_HASH = @CFADIR_HASH@
    286287CFA_BINDIR = @CFA_BINDIR@
    287288CFA_INCDIR = @CFA_INCDIR@
    … …  
    327328LIPO = @LIPO@
    328329LN_S = @LN_S@
     330LOCAL_CFACC = @LOCAL_CFACC@
     331LOCAL_CFACPP = @LOCAL_CFACPP@
    329332LTLIBOBJS = @LTLIBOBJS@
    330333LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
    … …  
    346349PACKAGE_VERSION = @PACKAGE_VERSION@
    347350PATH_SEPARATOR = @PATH_SEPARATOR@
     351PRELUDEFLAG = @PRELUDEFLAG@
    348352RANLIB = @RANLIB@
    349353SED = @SED@
    … …  
    440444# use -no-include-stdhdr to prevent rebuild cycles
    441445# The built sources must not depend on the installed headers
    442 AM_CFAFLAGS = -quiet -in-tree -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
     446AM_CFAFLAGS = -v @PRELUDEFLAG@ -I$(srcdir)/stdhdr @CONFIG_CFAFLAGS@
    443447AM_CFLAGS = -g -Wall -Wno-unused-function -fPIC @ARCH_FLAGS@ @CONFIG_CFLAGS@
    444448AM_CCASFLAGS = -g -Wall -Wno-unused-function @ARCH_FLAGS@ @CONFIG_CFLAGS@
    … …  
    936940        $(LTCFACOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
    937941        $(am__mv) $$depbase.Tpo $$depbase.Plo
    938 $(libobjs) : @CFACC@ @CFACPP@ prelude.cfa
    939 $(thread_libobjs) : @CFACC@ @CFACPP@ prelude.cfa
     942$(libobjs) : @LOCAL_CFACC@ @LOCAL_CFACPP@ prelude.cfa
     943$(thread_libobjs) : @LOCAL_CFACC@ @LOCAL_CFACPP@ prelude.cfa
    940944
    941945-include $(libdeps)
    … …  
    943947-include $(thread_libdeps)
    944948
    945 prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
    946         ${AM_V_GEN}$(CFACOMPILE) -quiet -in-tree -XCFA -l ${<} -c -o ${@}
    947 
    948 prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@
     949prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @LOCAL_CFACPP@
     950        ${AM_V_GEN}$(CFACOMPILE) -quiet @PRELUDEFLAG@ -XCFA -l ${<} -c -o ${@}
     951
     952prelude.lo: prelude.cfa extras.cf gcc-builtins.cf builtins.cf @LOCAL_CFACC@ @LOCAL_CFACPP@
    949953        ${AM_V_GEN}$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \
    950         $(CFACOMPILE) -quiet -in-tree -XCFA -l ${<} -c -o ${@}
     954        $(CFACOMPILE) -quiet @PRELUDEFLAG@ -XCFA -l ${<} -c -o ${@}
    951955
    952956#----------------------------------------------------------------------------------------------------------------
Note: See TracChangeset for help on using the changeset viewer.