Changeset 381bea6 for driver/cc1.cc

Timestamp:

Aug 27, 2018, 5:53:45 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

e5ea867

Parents:

b7c89aa (diff), 2a9d12d (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 cleanup-dtors

File:

• driver/cc1.cc (modified) (5 diffs)

driver/cc1.cc

@@ -10 +10 @@
 // Created On       : Fri Aug 26 14:23:51 2005
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 19 10:46:11 2018
-// Update Count     : 111
+// Last Modified On : Thu Aug 23 09:48:40 2018
+// Update Count     : 122
 //
 
@@ -47 +47 @@
 const string suffixes[NumSuffixes] = { "cfa", "hfa", };
 
-bool suffix( string arg ) {
+
+void suffix( string arg, const char * args[], int & nargs ) {
         //std::cerr << arg << std::endl;
         size_t dot = arg.find_last_of( "." );
         //std::cerr << dot << " " << (dot != string::npos ? arg.substr( dot + 1 ) : "fred" ) << std::endl;
-        if ( dot == string::npos ) return false;
+        if ( dot == string::npos ) return;
         string sx = arg.substr( dot + 1 );
         for ( int i = 0; i < NumSuffixes; i += 1 ) {
-                if ( sx == suffixes[i] ) return true;
-        } // for
-        return false;
+                if ( sx == suffixes[i] ) {
+                        args[nargs] = "-x";
+                        nargs += 1;
+                        args[nargs] = "c";
+                        nargs += 1;
+                        return;
+                } // if
+        } // for
 } // suffix
 
 
-void checkEnv( const char *args[], int &nargs ) {
+void checkEnv( const char * args[], int & nargs ) {
         char *value;
 
-        value = getenv( "__COMPILER__" );
+        value = getenv( "__CFA_COMPILER__" );
         if ( value != NULL ) {
                 compiler_name = value;
@@ -263 +269 @@
 
                 args[0] = compiler_name.c_str();
+                suffix( cpp_in, args, nargs );                                  // check suffix
                 args[nargs] = cpp_in;
                 nargs += 1;
@@ -310 +317 @@
 
                 args[0] = compiler_name.c_str();
-                if ( suffix( cpp_in ) ) {
-                        args[nargs] = "-x";
-                        nargs += 1;
-                        args[nargs] = "c";
-                        nargs += 1;
-                } // if
+                suffix( cpp_in, args, nargs );                                  // check suffix
                 args[nargs] = cpp_in;                                                   // input to cpp
                 nargs += 1;
@@ -354 +356 @@
 
         if ( fork() == 0 ) {                                                            // child runs CFA
-                cargs[0] = ( *new string( bprefix + "/cfa-cpp" ) ).c_str();
+                cargs[0] = ( *new string( bprefix + "cfa-cpp" ) ).c_str();
 
                 // Source file-name used to generate routine names containing global initializations for TU.