Changeset e01bfbc for src


Ignore:
Timestamp:
Jun 3, 2016, 1:12:02 PM (9 years ago)
Author:
Rob Schluntz <rschlunt@…>
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:
10a7775
Parents:
2edd5502 (diff), aec9a67 (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' into ctor

Location:
src
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • src/Makefile.in

    r2edd5502 re01bfbc  
    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

    r2edd5502 re01bfbc  
    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

    r2edd5502 re01bfbc  
    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

    r2edd5502 re01bfbc  
    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

    r2edd5502 re01bfbc  
    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

    r2edd5502 re01bfbc  
    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

    r2edd5502 re01bfbc  
    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.