Changes in / [20b66f7:ff1efc10]


Ignore:
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • INSTALL

    r20b66f7 rff1efc10  
    2222  it is important not to put quotes around the directory path; Cforall may
    2323  appear to build, but the installed version may not work properly.
     24
     25--with-backend-compiler=PROGRAM specifies the installed path of gcc.  It
     26  defaults to the first command named 'gcc' in the current PATH.
     27
     28cfa-cc itself is built with the version of g++ specified by the environment
     29variable CXX.  If CXX is unset, cfa-cc is built using the first command named
     30'g++' in the current PATH.

  • Jenkins/TestRegen

    r20b66f7 rff1efc10  
    7070        //escapes the sandbox
    7171        //Also specify the compiler by hand
    72         sh "./configure CXX=clang++ CC=gcc-6 --host=${arch} --enable-silent-rules --quiet"
     72        sh "./configure CXX=clang++ --host=${arch} --with-backend-compiler=gcc-6 --prefix=${install_dir} --enable-silent-rules --quiet"
    7373
    7474        //Compile the project
    75         sh 'make -j 8 --no-print-directory'
     75        sh 'make -j 8 --no-print-directory install'
    7676
    7777        //Regenerate the desired tests

  • Jenkinsfile

    r20b66f7 rff1efc10  
    114114                        }
    115115
    116                         sh "${SrcDir}/configure CXX=${Settings.Compiler.CXX} CC=${Settings.Compiler.CC} ${Settings.Architecture.flags} ${targets} --quiet"
     116                        sh "${SrcDir}/configure CXX=${Settings.Compiler.cpp_cc} ${Settings.Architecture.flags} ${targets} --with-backend-compiler=${Settings.Compiler.cfa_cc} --quiet"
    117117
    118118                        //Compile the project
    … …  
    235235//Description of a compiler (Must be serializable since pipelines are persistent)
    236236class CC_Desc implements Serializable {
    237         public String name
    238         public String CC
    239         public String CXX
    240 
    241         CC_Desc(String name, String CC, String CXX) {
    242                 this.name = name
    243                 this.CC = CC
    244                 this.CXX = CXX
     237        public String cc_name
     238        public String cpp_cc
     239        public String cfa_cc
     240
     241        CC_Desc(String cc_name, String cpp_cc, String cfa_cc) {
     242                this.cc_name = cc_name
     243                this.cpp_cc = cpp_cc
     244                this.cfa_cc = cfa_cc
    245245        }
    246246}
    … …  
    309309
    310310                def full = param.RunAllTests ? " (Full)" : ""
    311                 this.DescShort = "${ this.Compiler.name }:${ this.Architecture.name }${full}"
    312 
    313                 this.DescLong = """Compiler              : ${ this.Compiler.name } (${ this.Compiler.CXX }/${ this.Compiler.CC })
     311                this.DescShort = "${ this.Compiler.cc_name }:${ this.Architecture.name }${full}"
     312
     313                this.DescLong = """Compiler              : ${ this.Compiler.cc_name } (${ this.Compiler.cpp_cc }/${ this.Compiler.cfa_cc })
    314314Architecture            : ${ this.Architecture.name }
    315315Arc Flags               : ${ this.Architecture.flags }

  • Makefile.am

    r20b66f7 rff1efc10  
    1616
    1717AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
     18BACKEND_CC = @BACKEND_CC@     # C compiler used to compile Cforall programs, versus C++ compiler used to build cfa command
    1819
    1920MAINTAINERCLEANFILES = lib/* bin/* tests/.deps/* tests/.out/*

  • Makefile.in

    r20b66f7 rff1efc10  
    252252AUTOMAKE = @AUTOMAKE@
    253253AWK = @AWK@
     254BACKEND_CC = @BACKEND_CC@     # C compiler used to compile Cforall programs, versus C++ compiler used to build cfa command
    254255BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    255256CC = @CC@

  • benchmark/Makefile.in

    r20b66f7 rff1efc10  
    188188AUTOMAKE = @AUTOMAKE@
    189189AWK = @AWK@
     190BACKEND_CC = @BACKEND_CC@
    190191BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    191192CC = @CC@

  • configure

    r20b66f7 rff1efc10  
    626626LTLIBOBJS
    627627LIBOBJS
    628 CFA_BACKEND_CC
    629628ALLOCA
    630629EGREP
    … …  
    688687CFA_INCDIR
    689688CFA_PREFIX
     689CFA_BACKEND_CC
     690BACKEND_CC
    690691DOendif
    691692DOifskipcompile
    … …  
    762763enable_silent_rules
    763764with_cfa_name
     765with_backend_compiler
    764766with_target_hosts
    765767enable_dependency_tracking
    … …  
    14211423  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
    14221424  --with-cfa-name=NAME     NAME too which cfa will be installed
     1425  --with-backend-compiler=PROGRAM     PROGRAM that performs the final code compilation (must be gcc-compatible)
    14231426  --with-target-hosts=HOSTS     HOSTS comma seperated list of hosts to build for, format ARCH:debug|nodebug|nolib
    14241427
    … …  
    31633166
    31643167#==============================================================================
     3168# backend compiler implementation
     3169
     3170# Check whether --with-backend-compiler was given.
     3171if test "${with_backend_compiler+set}" = set; then :
     3172  withval=$with_backend_compiler; backendcompiler=$withval
     3173else
     3174  backendcompiler=""
     3175fi
     3176
     3177if test "x$backendcompiler" != "x"; then
     3178       BACKEND_CC=${backendcompiler}
     3179else
     3180       # Extract the first word of "gcc", so it can be a program name with args.
     3181set dummy gcc; ac_word=$2
     3182{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
     3183$as_echo_n "checking for $ac_word... " >&6; }
     3184if ${ac_cv_path_BACKEND_CC+:} false; then :
     3185  $as_echo_n "(cached) " >&6
     3186else
     3187  case $BACKEND_CC in
     3188  [\\/]* | ?:[\\/]*)
     3189  ac_cv_path_BACKEND_CC="$BACKEND_CC" # Let the user override the test with a path.
     3190  ;;
     3191  *)
     3192  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
     3193for as_dir in $PATH
     3194do
     3195  IFS=$as_save_IFS
     3196  test -z "$as_dir" && as_dir=.
     3197    for ac_exec_ext in '' $ac_executable_extensions; do
     3198  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     3199    ac_cv_path_BACKEND_CC="$as_dir/$ac_word$ac_exec_ext"
     3200    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     3201    break 2
     3202  fi
     3203done
     3204  done
     3205IFS=$as_save_IFS
     3206
     3207  ;;
     3208esac
     3209fi
     3210BACKEND_CC=$ac_cv_path_BACKEND_CC
     3211if test -n "$BACKEND_CC"; then
     3212  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BACKEND_CC" >&5
     3213$as_echo "$BACKEND_CC" >&6; }
     3214else
     3215  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
     3216$as_echo "no" >&6; }
     3217fi
     3218
     3219       # check gcc installed
     3220       if test "x$BACKEND_CC" = "x"; then
     3221               as_fn_error $? "some version of gcc is needed. Get it at ftp://ftp.gnu.org" "$LINENO" 5
     3222               exit 1
     3223       fi
     3224fi
     3225
     3226cat >>confdefs.h <<_ACEOF
     3227#define CFA_BACKEND_CC "${BACKEND_CC}"
     3228_ACEOF
     3229
     3230
     3231
     3232#==============================================================================
    31653233# Installation paths
    31663234
    … …  
    63136381fi
    63146382done
    6315 
    6316 
    6317 #==============================================================================
    6318 # backend compiler implementation
    6319 
    6320 cat >>confdefs.h <<_ACEOF
    6321 #define CFA_BACKEND_CC "${CC}"
    6322 _ACEOF
    6323 
    63246383
    63256384

  • configure.ac

    r20b66f7 rff1efc10  
    5555AC_SUBST([DOendif])
    5656AM_SUBST_NOTMAKE([DOendif])
     57
     58#==============================================================================
     59# backend compiler implementation
     60AC_ARG_WITH(backend-compiler,
     61       [  --with-backend-compiler=PROGRAM     PROGRAM that performs the final code compilation (must be gcc-compatible) ],
     62       backendcompiler=$withval, backendcompiler="")
     63if test "x$backendcompiler" != "x"; then
     64       BACKEND_CC=${backendcompiler}
     65else
     66       AC_PATH_PROG(BACKEND_CC, gcc, [])       # check gcc installed
     67       if test "x$BACKEND_CC" = "x"; then
     68               AC_MSG_ERROR(some version of gcc is needed. Get it at ftp://ftp.gnu.org)
     69               exit 1
     70       fi
     71fi
     72AC_DEFINE_UNQUOTED(CFA_BACKEND_CC, "${BACKEND_CC}", [Location of include files.])
     73AC_SUBST(CFA_BACKEND_CC)
    5774
    5875#==============================================================================
    … …  
    211228
    212229#==============================================================================
    213 # backend compiler implementation
    214 AC_DEFINE_UNQUOTED(CFA_BACKEND_CC, "${CC}", [Backend compiler to use.])
    215 AC_SUBST(CFA_BACKEND_CC)
    216 
    217 #==============================================================================
    218230AC_CONFIG_FILES([
    219231        Makefile

  • driver/Makefile.in

    r20b66f7 rff1efc10  
    181181AUTOMAKE = @AUTOMAKE@
    182182AWK = @AWK@
     183BACKEND_CC = @BACKEND_CC@
    183184BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    184185CC = @CC@

  • libcfa/configure

    r20b66f7 rff1efc10  
    29702970                CONFIG_CFAFLAGS="-nodebug"
    29712971                CONFIG_BUILDLIB="no"
    2972         ;;
    2973         *)
    2974         as_fn_error $? "'Invalid value $CONFIGURATION for \$CONFIGURATION'" "$LINENO" 5
    29752972        ;;
    29762973esac

  • libcfa/src/Makefile.in

    r20b66f7 rff1efc10  
    922922$(libobjs) : @CFACC@ @CFACPP@ prelude.cfa
    923923
    924 -include $(libdeps)
     924include $(libdeps)
     925
     926$(libdeps):
     927        @mkdir -p $(dir $@)
     928        @echo '#dummy' > $@
    925929
    926930prelude.o : prelude.cfa extras.cf gcc-builtins.cf builtins.cf @CFACC@ @CFACPP@

  • src/Makefile.in

    r20b66f7 rff1efc10  
    395395AUTOMAKE = @AUTOMAKE@
    396396AWK = @AWK@
     397BACKEND_CC = @BACKEND_CC@
    397398BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    398399CC = @CC@

  • tests/Makefile.in

    r20b66f7 rff1efc10  
    176176AUTOMAKE = @AUTOMAKE@
    177177AWK = @AWK@
     178BACKEND_CC = @BACKEND_CC@
    178179BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    179180CC = @CFACC@

  • tests/preempt_longrun/Makefile.in

    r20b66f7 rff1efc10  
    337337AUTOMAKE = @AUTOMAKE@
    338338AWK = @AWK@
     339BACKEND_CC = @BACKEND_CC@
    339340BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    340341CC = @CFACC@

  • tools/Makefile.am

    r20b66f7 rff1efc10  
    1717AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
    1818
     19CC = @BACKEND_CC@
    1920AM_CFLAGS = -Wall -Wextra -O2 -g
    2021

  • tools/Makefile.in

    r20b66f7 rff1efc10  
    186186AUTOMAKE = @AUTOMAKE@
    187187AWK = @AWK@
     188BACKEND_CC = @BACKEND_CC@
    188189BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    189 CC = @CC@
     190CC = @BACKEND_CC@
    190191CCAS = @CCAS@
    191192CCASDEPMODE = @CCASDEPMODE@

  • tools/prettyprinter/Makefile.in

    r20b66f7 rff1efc10  
    210210AUTOMAKE = @AUTOMAKE@
    211211AWK = @AWK@
     212BACKEND_CC = @BACKEND_CC@
    212213BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    213214CC = @CC@
Note: See TracChangeset for help on using the changeset viewer.