Changeset 95d0a5db


Ignore:
Timestamp:
Dec 13, 2018, 4:22:08 PM (5 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum
Children:
93fe3154
Parents:
0765121
Message:

Removed backend_cc, everything now uses CC or CXX

Files:
14 edited

Legend:

Unmodified
Added
Removed

  • Makefile.am

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

  • Makefile.in

    r0765121 r95d0a5db  
    252252AUTOMAKE = @AUTOMAKE@
    253253AWK = @AWK@
    254 BACKEND_CC = @BACKEND_CC@     # C compiler used to compile Cforall programs, versus C++ compiler used to build cfa command
    255254BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    256255CC = @CC@

  • benchmark/Makefile.in

    r0765121 r95d0a5db  
    188188AUTOMAKE = @AUTOMAKE@
    189189AWK = @AWK@
    190 BACKEND_CC = @BACKEND_CC@
    191190BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    192191CC = @CC@

  • configure

    r0765121 r95d0a5db  
    626626LTLIBOBJS
    627627LIBOBJS
     628CFA_BACKEND_CC
    628629ALLOCA
    629630EGREP
    … …  
    687688CFA_INCDIR
    688689CFA_PREFIX
    689 CFA_BACKEND_CC
    690 BACKEND_CC
    691690DOendif
    692691DOifskipcompile
    … …  
    763762enable_silent_rules
    764763with_cfa_name
    765 with_backend_compiler
    766764with_target_hosts
    767765enable_dependency_tracking
    … …  
    14231421  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
    14241422  --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)
    14261423  --with-target-hosts=HOSTS     HOSTS comma seperated list of hosts to build for, format ARCH:debug|nodebug|nolib
    14271424
    … …  
    31663163
    31673164#==============================================================================
    3168 # backend compiler implementation
    3169 
    3170 # Check whether --with-backend-compiler was given.
    3171 if test "${with_backend_compiler+set}" = set; then :
    3172   withval=$with_backend_compiler; backendcompiler=$withval
    3173 else
    3174   backendcompiler=""
    3175 fi
    3176 
    3177 if test "x$backendcompiler" != "x"; then
    3178        BACKEND_CC=${backendcompiler}
    3179 else
    3180        # Extract the first word of "gcc", so it can be a program name with args.
    3181 set 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; }
    3184 if ${ac_cv_path_BACKEND_CC+:} false; then :
    3185   $as_echo_n "(cached) " >&6
    3186 else
    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
    3193 for as_dir in $PATH
    3194 do
    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
    3203 done
    3204   done
    3205 IFS=$as_save_IFS
    3206 
    3207   ;;
    3208 esac
    3209 fi
    3210 BACKEND_CC=$ac_cv_path_BACKEND_CC
    3211 if test -n "$BACKEND_CC"; then
    3212   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BACKEND_CC" >&5
    3213 $as_echo "$BACKEND_CC" >&6; }
    3214 else
    3215   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    3216 $as_echo "no" >&6; }
    3217 fi
    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
    3224 fi
    3225 
    3226 cat >>confdefs.h <<_ACEOF
    3227 #define CFA_BACKEND_CC "${BACKEND_CC}"
    3228 _ACEOF
    3229 
    3230 
    3231 
    3232 #==============================================================================
    32333165# Installation paths
    32343166
    … …  
    63816313fi
    63826314done
     6315
     6316
     6317#==============================================================================
     6318# backend compiler implementation
     6319
     6320cat >>confdefs.h <<_ACEOF
     6321#define CFA_BACKEND_CC "${CC}"
     6322_ACEOF
     6323
    63836324
    63846325

  • configure.ac

    r0765121 r95d0a5db  
    5555AC_SUBST([DOendif])
    5656AM_SUBST_NOTMAKE([DOendif])
    57 
    58 #==============================================================================
    59 # backend compiler implementation
    60 AC_ARG_WITH(backend-compiler,
    61        [  --with-backend-compiler=PROGRAM     PROGRAM that performs the final code compilation (must be gcc-compatible) ],
    62        backendcompiler=$withval, backendcompiler="")
    63 if test "x$backendcompiler" != "x"; then
    64        BACKEND_CC=${backendcompiler}
    65 else
    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
    71 fi
    72 AC_DEFINE_UNQUOTED(CFA_BACKEND_CC, "${BACKEND_CC}", [Location of include files.])
    73 AC_SUBST(CFA_BACKEND_CC)
    7457
    7558#==============================================================================
    … …  
    228211
    229212#==============================================================================
     213# backend compiler implementation
     214AC_DEFINE_UNQUOTED(CFA_BACKEND_CC, "${CC}", [Backend compiler to use.])
     215AC_SUBST(CFA_BACKEND_CC)
     216
     217#==============================================================================
    230218AC_CONFIG_FILES([
    231219        Makefile

  • driver/Makefile.in

    r0765121 r95d0a5db  
    181181AUTOMAKE = @AUTOMAKE@
    182182AWK = @AWK@
    183 BACKEND_CC = @BACKEND_CC@
    184183BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    185184CC = @CC@

  • libcfa/configure

    r0765121 r95d0a5db  
    29702970                CONFIG_CFAFLAGS="-nodebug"
    29712971                CONFIG_BUILDLIB="no"
     2972        ;;
     2973        *)
     2974        as_fn_error $? "'Invalid value $CONFIGURATION for \$CONFIGURATION'" "$LINENO" 5
    29722975        ;;
    29732976esac

  • libcfa/src/Makefile.in

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

  • src/Makefile.in

    r0765121 r95d0a5db  
    395395AUTOMAKE = @AUTOMAKE@
    396396AWK = @AWK@
    397 BACKEND_CC = @BACKEND_CC@
    398397BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    399398CC = @CC@

  • tests/Makefile.in

    r0765121 r95d0a5db  
    176176AUTOMAKE = @AUTOMAKE@
    177177AWK = @AWK@
    178 BACKEND_CC = @BACKEND_CC@
    179178BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    180179CC = @CFACC@

  • tests/preempt_longrun/Makefile.in

    r0765121 r95d0a5db  
    337337AUTOMAKE = @AUTOMAKE@
    338338AWK = @AWK@
    339 BACKEND_CC = @BACKEND_CC@
    340339BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    341340CC = @CFACC@

  • tools/Makefile.am

    r0765121 r95d0a5db  
    1717AUTOMAKE_OPTIONS = foreign    # do not require all the GNU file names
    1818
    19 CC = @BACKEND_CC@
    2019AM_CFLAGS = -Wall -Wextra -O2 -g
    2120

  • tools/Makefile.in

    r0765121 r95d0a5db  
    186186AUTOMAKE = @AUTOMAKE@
    187187AWK = @AWK@
    188 BACKEND_CC = @BACKEND_CC@
    189188BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    190 CC = @BACKEND_CC@
     189CC = @CC@
    191190CCAS = @CCAS@
    192191CCASDEPMODE = @CCASDEPMODE@

  • tools/prettyprinter/Makefile.in

    r0765121 r95d0a5db  
    210210AUTOMAKE = @AUTOMAKE@
    211211AWK = @AWK@
    212 BACKEND_CC = @BACKEND_CC@
    213212BUILD_IN_TREE_FLAGS = @BUILD_IN_TREE_FLAGS@
    214213CC = @CC@
Note: See TracChangeset for help on using the changeset viewer.