Changeset 417a630 for driver

Timestamp:

Aug 26, 2019, 4:15:08 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

b544afa

Parents:

5a43ab8

Message:

second attempt at moving cfa-cpp to cc1 stage 2

Location:

driver

Files:

• cc1.cc (modified) (4 diffs)
• cfa.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 : Mon Aug 26 07:52:19 2019
-// Update Count     : 374
+// Last Modified On : Mon Aug 26 14:21:22 2019
+// Update Count     : 375
 //
 
@@ -33 +33 @@
 
 
-static string installlibdir( CFA_LIBDIR );                              // fixed location of cc1 and cfa-cpp commands when installed
 static string compiler_path( CFA_BACKEND_CC );                  // path/name of C compiler
 static bool CFA_flag = false;                                                   // -CFA flag
 static bool save_temps = false;                                                 // -save-temps flag
 static string o_file;
+static string bprefix;
 
 
@@ -98 +98 @@
                         } else if ( prefix( val, "-o=" ) ) {            // output file for -CFA
                                 o_file = val.substr( 3 );
+                        } else if ( prefix( val, "-B=" ) ) {            // location of cfa-cpp
+                                bprefix = val.substr( 3 );
                         } else {
                                 args[nargs++] = ( *new string( arg.substr( __CFA_FLAGPREFIX__.size() + 4 ) ) ).c_str();
@@ -428 +430 @@
 
         if ( fork() == 0 ) {                                                            // child runs CFA
-                cargs[0] = ( *new string( installlibdir + "cfa-cpp" ) ).c_str();
+                cargs[0] = ( *new string( bprefix + "cfa-cpp" ) ).c_str();
                 cargs[ncargs++] = cpp_in;
 

driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Aug 23 16:27:07 2019
-// Update Count     : 411
+// Last Modified On : Mon Aug 26 14:25:44 2019
+// Update Count     : 414
 //
 
@@ -82 +82 @@
         string heading;                                                                         // banner printed at start of cfa compilation
         string arg;                                                                                     // current command-line argument during command-line parsing
-        string Bprefix;                                                                         // path where gcc looks for compiler command steps
+        string bprefix;                                                                         // path where gcc looks for compiler command steps
         string langstd;                                                                         // language standard
 
@@ -211 +211 @@
                                 } // if
                         } else if ( prefix( arg, "-B" ) ) {
-                                Bprefix = arg.substr(2);                                // strip the -B flag
-                                args[nargs++] = ( *new string( string("-D__GCC_BPREFIX__=") + Bprefix ) ).c_str();
+                                bprefix = arg.substr(2);                                // strip the -B flag
+//                              args[nargs++] = ( *new string( string("-D__GCC_BPREFIX__=") + bprefix ) ).c_str();
                         } else if ( arg == "-c" || arg == "-S" || arg == "-E" || arg == "-M" || arg == "-MM" ) {
                                 args[nargs++] = argv[i];                                // pass argument along
@@ -370 +370 @@
         } // if
 
-        if ( Bprefix.length() == 0 ) {
-                Bprefix = ! intree ? installlibdir : srcdriverdir;
-                if ( Bprefix[Bprefix.length() - 1] != '/' ) Bprefix += '/';
-                args[nargs++] = ( *new string( string("-D__GCC_BPREFIX__=") + Bprefix ) ).c_str();
+        if ( bprefix.length() == 0 ) {
+                bprefix = ! intree ? installlibdir : srcdriverdir;
+                if ( bprefix[bprefix.length() - 1] != '/' ) bprefix += '/';
+//              args[nargs++] = ( *new string( string("-D__GCC_BPREFIX__=") + bprefix ) ).c_str();
+                Putenv( argv, ( *new string( string("-B=") + bprefix ) ).c_str() );
         } // if
 
@@ -401 +402 @@
                 args[nargs++] = "-fgnu89-inline";
                 args[nargs++] = "-D__int8_t_defined";                   // prevent gcc type-size attributes
-                args[nargs++] = ( *new string( string("-B") + Bprefix ) ).c_str();
+                args[nargs++] = ( *new string( string("-B") + bprefix ) ).c_str();
         } else {
                 cerr << argv[0] << " error, compiler \"" << compiler_name << "\" unsupported." << endl;