Changeset a3e7d34 for src/driver

Timestamp:

Jun 3, 2016, 10:55:29 AM (9 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

Location:

src/driver

Files:

• Makefile.in (modified) (2 diffs)
• cc1.cc (modified) (2 diffs)
• cfa.cc (modified) (3 diffs)

src/driver/Makefile.in

@@ -80 +80 @@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CFA_BACKEND_CC = @CFA_BACKEND_CC@
 CFA_BINDIR = @CFA_BINDIR@
 CFA_INCDIR = @CFA_INCDIR@
@@ -98 +99 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
-GCC_PATH = @GCC_PATH@
 GREP = @GREP@
 INSTALL = @INSTALL@

src/driver/cc1.cc

@@ -10 +10 @@
 // Created On       : Fri Aug 26 14:23:51 2005
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu May  5 16:04:30 2016
-// Update Count     : 77
+// Last Modified On : Thu Jun  2 17:24:26 2016
+// Update Count     : 79
 //
 
@@ -30 +30 @@
 
 
-string compiler_name( GCC_PATH );                                               // path/name of C compiler
+string compiler_name( CFA_BACKEND_CC );                                 // path/name of C compiler
 
 string D__GCC_BPREFIX__( "-D__GCC_BPREFIX__=" );

src/driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Apr 20 18:31:28 2016
-// Update Count     : 133
+// Last Modified On : Thu Jun  2 17:24:25 2016
+// Update Count     : 137
 //
 
@@ -75 +75 @@
         string langstd;                                                                         // language standard
 
-        string compiler_path( GCC_PATH );                                       // path/name of C compiler
+        string compiler_path( CFA_BACKEND_CC );                         // path/name of C compiler
         string compiler_name;                                                           // name of C compiler
 
@@ -317 +317 @@
                 nargs += 1;
         } else {
-                cerr << argv[0] << " error, compiler " << compiler_name << " not supported." << endl;
+                cerr << argv[0] << " error, compiler \"" << compiler_name << "\" unsupported." << endl;
                 exit( EXIT_FAILURE );
         } // if