Changeset a3e7d34


Ignore:
Timestamp:
Jun 3, 2016, 10:55:29 AM (8 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
Children:
992c26d
Parents:
848fb00 (diff), e24f13a (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Files:
11 edited

Legend:

Unmodified
Added
Removed

  • Makefile.in

    r848fb00 ra3e7d34  
    118118CC = @CC@
    119119CCDEPMODE = @CCDEPMODE@
     120CFA_BACKEND_CC = @CFA_BACKEND_CC@
    120121CFA_BINDIR = @CFA_BINDIR@
    121122CFA_INCDIR = @CFA_INCDIR@
    … …  
    136137EGREP = @EGREP@
    137138EXEEXT = @EXEEXT@
    138 GCC_PATH = @GCC_PATH@
    139139GREP = @GREP@
    140140INSTALL = @INSTALL@

  • config.h.in

    r848fb00 ra3e7d34  
    11/* config.h.in.  Generated from configure.ac by autoheader.  */
     2
     3/* Location of include files. */
     4#undef CFA_BACKEND_CC
    25
    36/* Location of cfa command. */
    … …  
    2023/* Define to 1 if using `alloca.c'. */
    2124#undef C_ALLOCA
    22 
    23 /* Path/name of C compiler. */
    24 #undef GCC_PATH
    2525
    2626/* Define to 1 if you have `alloca', as a function or macro. */

  • configure

    r848fb00 ra3e7d34  
    643643CFA_INCDIR
    644644CFA_PREFIX
     645CFA_BACKEND_CC
    645646BACKEND_CC
    646 GCC_PATH
    647647MAINT
    648648MAINTAINER_MODE_FALSE
    … …  
    29222922# Check whether --with-backend-compiler was given.
    29232923if test "${with_backend_compiler+set}" = set; then :
    2924   withval=$with_backend_compiler; backcompiler=$withval
    2925 else
    2926   backcompiler=""
    2927 fi
    2928 
    2929   if test x$backcompiler != x; then
    2930         cat >>confdefs.h <<_ACEOF
    2931 #define GCC_PATH "${backcompiler}"
    2932 _ACEOF
    2933 
    2934         BACKEND_CC=${backcompiler}
    2935   else
     2924  withval=$with_backend_compiler; backendcompiler=$withval
     2925else
     2926  backendcompiler=""
     2927fi
     2928
     2929if test "x$backendcompiler" != x; then
     2930        BACKEND_CC=${backendcompiler}
     2931else
    29362932        # Extract the first word of "gcc", so it can be a program name with args.
    29372933set dummy gcc; ac_word=$2
    29382934{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
    29392935$as_echo_n "checking for $ac_word... " >&6; }
    2940 if ${ac_cv_path_GCC_PATH+:} false; then :
     2936if ${ac_cv_path_BACKEND_CC+:} false; then :
    29412937  $as_echo_n "(cached) " >&6
    29422938else
    2943   case $GCC_PATH in
     2939  case $BACKEND_CC in
    29442940  [\\/]* | ?:[\\/]*)
    2945   ac_cv_path_GCC_PATH="$GCC_PATH" # Let the user override the test with a path.
     2941  ac_cv_path_BACKEND_CC="$BACKEND_CC" # Let the user override the test with a path.
    29462942  ;;
    29472943  *)
    … …  
    29532949    for ac_exec_ext in '' $ac_executable_extensions; do
    29542950  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    2955     ac_cv_path_GCC_PATH="$as_dir/$ac_word$ac_exec_ext"
     2951    ac_cv_path_BACKEND_CC="$as_dir/$ac_word$ac_exec_ext"
    29562952    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
    29572953    break 2
    … …  
    29612957IFS=$as_save_IFS
    29622958
    2963   test -z "$ac_cv_path_GCC_PATH" && ac_cv_path_GCC_PATH="N/A"
    29642959  ;;
    29652960esac
    29662961fi
    2967 GCC_PATH=$ac_cv_path_GCC_PATH
    2968 if test -n "$GCC_PATH"; then
    2969   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCC_PATH" >&5
    2970 $as_echo "$GCC_PATH" >&6; }
     2962BACKEND_CC=$ac_cv_path_BACKEND_CC
     2963if test -n "$BACKEND_CC"; then
     2964  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BACKEND_CC" >&5
     2965$as_echo "$BACKEND_CC" >&6; }
    29712966else
    29722967  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
    … …  
    29752970
    29762971
    2977         if test "$GCC_PATH" = "N/A"; then
     2972        if test "x$BACKEND_CC" = "x"; then
    29782973                as_fn_error $? "some version of gcc is needed. Get it at ftp://ftp.gnu.org" "$LINENO" 5
    29792974                exit 1
    29802975        fi
     2976fi
    29812977
    29822978cat >>confdefs.h <<_ACEOF
    2983 #define GCC_PATH "${GCC_PATH}"
    2984 _ACEOF
    2985 
    2986         BACKEND_CC=${GCC_PATH}
    2987   fi
     2979#define CFA_BACKEND_CC "${BACKEND_CC}"
     2980_ACEOF
     2981
    29882982
    29892983

  • configure.ac

    r848fb00 ra3e7d34  
    2020
    2121AC_ARG_WITH(backend-compiler,
    22             [  --with-backend-compiler=PROGRAM     PROGRAM that performs the final code compilation (must be gcc-compatible) ],
    23             backcompiler=$withval, backcompiler="")
    24   if test x$backcompiler != x; then
    25         AC_DEFINE_UNQUOTED(GCC_PATH, "${backcompiler}")
    26         BACKEND_CC=${backcompiler}
    27   else
    28         AC_PATH_PROG(GCC_PATH, gcc, N/A)
    29         if test "$GCC_PATH" = "N/A"; then
     22        [  --with-backend-compiler=PROGRAM     PROGRAM that performs the final code compilation (must be gcc-compatible) ],
     23        backendcompiler=$withval, backendcompiler="")
     24if test "x$backendcompiler" != x; then
     25        BACKEND_CC=${backendcompiler}
     26else
     27        AC_PATH_PROG(BACKEND_CC, gcc, [])
     28        if test "x$BACKEND_CC" = "x"; then
    3029                AC_MSG_ERROR(some version of gcc is needed. Get it at ftp://ftp.gnu.org)
    3130                exit 1
    3231        fi
    33         AC_DEFINE_UNQUOTED(GCC_PATH, "${GCC_PATH}", [Path/name of C compiler.])
    34         BACKEND_CC=${GCC_PATH}
    35   fi
    36 AC_SUBST(BACKEND_CC)
     32fi
     33AC_DEFINE_UNQUOTED(CFA_BACKEND_CC, "${BACKEND_CC}", [Location of include files.])
     34AC_SUBST(CFA_BACKEND_CC)
    3735
    3836if test "x$prefix" = "xNONE"; then

  • src/Makefile.in

    r848fb00 ra3e7d34  
    240240CC = @CC@
    241241CCDEPMODE = @CCDEPMODE@
     242CFA_BACKEND_CC = @CFA_BACKEND_CC@
    242243CFA_BINDIR = @CFA_BINDIR@
    243244CFA_INCDIR = @CFA_INCDIR@
    … …  
    258259EGREP = @EGREP@
    259260EXEEXT = @EXEEXT@
    260 GCC_PATH = @GCC_PATH@
    261261GREP = @GREP@
    262262INSTALL = @INSTALL@

  • src/driver/Makefile.in

    r848fb00 ra3e7d34  
    8080CC = @CC@
    8181CCDEPMODE = @CCDEPMODE@
     82CFA_BACKEND_CC = @CFA_BACKEND_CC@
    8283CFA_BINDIR = @CFA_BINDIR@
    8384CFA_INCDIR = @CFA_INCDIR@
    … …  
    9899EGREP = @EGREP@
    99100EXEEXT = @EXEEXT@
    100 GCC_PATH = @GCC_PATH@
    101101GREP = @GREP@
    102102INSTALL = @INSTALL@

  • src/driver/cc1.cc

    r848fb00 ra3e7d34  
    1010// Created On       : Fri Aug 26 14:23:51 2005
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Thu May  5 16:04:30 2016
    13 // Update Count     : 77
     12// Last Modified On : Thu Jun  2 17:24:26 2016
     13// Update Count     : 79
    1414//
    1515
    … …  
    3030
    3131
    32 string compiler_name( GCC_PATH );                                               // path/name of C compiler
     32string compiler_name( CFA_BACKEND_CC );                                 // path/name of C compiler
    3333
    3434string D__GCC_BPREFIX__( "-D__GCC_BPREFIX__=" );

  • src/driver/cfa.cc

    r848fb00 ra3e7d34  
    1010// Created On       : Tue Aug 20 13:44:49 2002
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Wed Apr 20 18:31:28 2016
    13 // Update Count     : 133
     12// Last Modified On : Thu Jun  2 17:24:25 2016
     13// Update Count     : 137
    1414//
    1515
    … …  
    7575        string langstd;                                                                         // language standard
    7676
    77         string compiler_path( GCC_PATH );                                       // path/name of C compiler
     77        string compiler_path( CFA_BACKEND_CC );                         // path/name of C compiler
    7878        string compiler_name;                                                           // name of C compiler
    7979
    … …  
    317317                nargs += 1;
    318318        } else {
    319                 cerr << argv[0] << " error, compiler " << compiler_name << " not supported." << endl;
     319                cerr << argv[0] << " error, compiler \"" << compiler_name << "\" unsupported." << endl;
    320320                exit( EXIT_FAILURE );
    321321        } // if

  • src/examples/Makefile.in

    r848fb00 ra3e7d34  
    8686CC = @CFA_BINDIR@/cfa
    8787CCDEPMODE = @CCDEPMODE@
     88CFA_BACKEND_CC = @CFA_BACKEND_CC@
    8889CFA_BINDIR = @CFA_BINDIR@
    8990CFA_INCDIR = @CFA_INCDIR@
    … …  
    106107EGREP = @EGREP@
    107108EXEEXT = @EXEEXT@
    108 GCC_PATH = @GCC_PATH@
    109109GREP = @GREP@
    110110INSTALL = @INSTALL@

  • src/libcfa/Makefile.in

    r848fb00 ra3e7d34  
    113113CC = ${abs_top_srcdir}/src/driver/cfa
    114114CCDEPMODE = @CCDEPMODE@
     115CFA_BACKEND_CC = @CFA_BACKEND_CC@
    115116CFA_BINDIR = @CFA_BINDIR@
    116117CFA_INCDIR = @CFA_INCDIR@
    … …  
    131132EGREP = @EGREP@
    132133EXEEXT = @EXEEXT@
    133 GCC_PATH = @GCC_PATH@
    134134GREP = @GREP@
    135135INSTALL = @INSTALL@

  • src/libcfa/iostream.c

    r848fb00 ra3e7d34  
    99// Author           : Peter A. Buhr
    1010// Created On       : Wed May 27 17:56:53 2015
    11 // Last Modified By : Rob Schluntz
    12 // Last Modified On : Mon May 02 15:13:55 2016
    13 // Update Count     : 302
     11// Last Modified By : Peter A. Buhr
     12// Last Modified On : Thu May 26 10:08:31 2016
     13// Update Count     : 305
    1414//
    1515
    … …  
    2121#include <float.h>                                                                              // DBL_DIG, LDBL_DIG
    2222#include <complex.h>                                                                    // creal, cimag
    23 #include <ctype.h>                                                                              // isspace, ispunct
    2423}
    2524
    … …  
    336335} // ?|?
    337336
    338 _Istream_cstrUC cstr( char * str ) { _Istream_cstrUC s = { str }; return s; }
     337_Istream_cstrUC cstr( char * str ) { return (_Istream_cstrUC){ str }; }
    339338forall( dtype istype | istream( istype ) )
    340339istype * ?|?( istype * is, _Istream_cstrUC cstr ) {
    … …  
    343342} // cstr
    344343
    345 _Istream_cstrC cstr( char * str, int size ) { _Istream_cstrC s = { str, size }; return s; }
     344_Istream_cstrC cstr( char * str, int size ) { return (_Istream_cstrC){ str, size }; }
    346345forall( dtype istype | istream( istype ) )
    347346istype * ?|?( istype * is, _Istream_cstrC cstr ) {
Note: See TracChangeset for help on using the changeset viewer.