Changes in driver/cc1.cc [bec4d24:d6f4488]

File:

• driver/cc1.cc (modified) (15 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 Sep  3 16:57:05 2018
-// Update Count     : 125
+// Last Modified On : Thu Aug 23 09:48:40 2018
+// Update Count     : 122
 //
 
@@ -32 +32 @@
 string compiler_name( CFA_BACKEND_CC );                                 // path/name of C compiler
 
+string D__GCC_X__( "-D__GCC_X__=" );
 string D__GCC_BPREFIX__( "-D__GCC_BPREFIX__=" );
 string D__CFA_FLAGPREFIX__( "-D__CFA_FLAG__=" );
@@ -45 +46 @@
 enum { NumSuffixes = 2 };
 const string suffixes[NumSuffixes] = { "cfa", "hfa", };
+
 
 void suffix( string arg, const char * args[], int & nargs ) {
@@ -114 +116 @@
 void Stage1( const int argc, const char * const argv[] ) {
         int code;
+        int i;
 
         string arg;
@@ -136 +139 @@
         cerr << "Stage1" << endl;
         #endif // __DEBUG_H__
+
+        // process all the arguments
+
         checkEnv( args, nargs );                                                        // arguments passed via environment variables
-        #ifdef __DEBUG_H__
-        for ( int i = 1; i < argc; i += 1 ) {
+
+        for ( i = 1; i < argc; i += 1 ) {
+                #ifdef __DEBUG_H__
                 cerr << "argv[" << i << "]:\"" << argv[i] << "\"" << endl;
-        } // for
-        #endif // __DEBUG_H__
-
-        // process all the arguments
-
-        for ( int i = 1; i < argc; i += 1 ) {
+                #endif // __DEBUG_H__
                 arg = argv[i];
+                #ifdef __DEBUG_H__
+                cerr << "arg:\"" << arg << "\"" << endl;
+                #endif // __DEBUG_H__
                 if ( prefix( arg, "-" ) ) {
                         // strip g++ flags that are inappropriate or cause duplicates in subsequent passes
@@ -180 +185 @@
                                 ncargs += 1;
                                 i += 1;                                                                 // and the argument
+                        // } else if ( prefix( arg, D__GCC_X__ ) ) {
+                        //      args[nargs] = "-x";
+                        //      nargs += 1;
+                        //      args[nargs] = ( *new string( arg.substr( D__GCC_X__.size() ) ) ).c_str(); // pass the flag along
+                        //      nargs += 1;
+                        // } else if ( arg == "-D" && prefix( argv[i + 1], D__GCC_X__.substr(2) ) ) {
+                        //      args[nargs] = "-x";
+                        //      nargs += 1;
+                        //      args[nargs] = ( *new string( string( argv[i + 1] ).substr( D__GCC_X__.size() - 2 ) ) ).c_str(); // pass the flag along
+                        //      nargs += 1;
+                        //      i += 1;                                                                 // and the argument
                         } else if ( prefix( arg, D__GCC_BPREFIX__ ) ) {
                                 bprefix = arg.substr( D__GCC_BPREFIX__.size() );
@@ -235 +251 @@
         #ifdef __DEBUG_H__
         cerr << "args:";
-        for ( int i = 1; i < nargs; i += 1 ) {
+        for ( i = 1; i < nargs; i += 1 ) {
                 cerr << " " << args[i];
         } // for
@@ -266 +282 @@
                 #ifdef __DEBUG_H__
                 cerr << "nargs: " << nargs << endl;
-                for ( int i = 0; args[i] != NULL; i += 1 ) {
+                for ( i = 0; args[i] != NULL; i += 1 ) {
                         cerr << args[i] << " ";
                 } // for
@@ -308 +324 @@
                 #ifdef __DEBUG_H__
                 cerr << "cpp nargs: " << nargs << endl;
-                for ( int i = 0; args[i] != NULL; i += 1 ) {
+                for ( i = 0; args[i] != NULL; i += 1 ) {
                         cerr << args[i] << " ";
                 } // for
@@ -361 +377 @@
                 #ifdef __DEBUG_H__
                 cerr << "cfa-cpp ncargs: " << o_name << " " << CFA_flag << " " << ncargs << endl;
-                for ( int i = 0; cargs[i] != NULL; i += 1 ) {
+                for ( i = 0; cargs[i] != NULL; i += 1 ) {
                         cerr << cargs[i] << " ";
                 } // for
@@ -391 +407 @@
 
 void Stage2( const int argc, const char * const * argv ) {
+        int i;
+
         string arg;
 
@@ -401 +419 @@
         cerr << "Stage2" << endl;
         #endif // __DEBUG_H__
+
+        // process all the arguments
+
         checkEnv( args, nargs );                                                        // arguments passed via environment variables
-        #ifdef __DEBUG_H__
-        for ( int i = 1; i < argc; i += 1 ) {
+
+        for ( i = 1; i < argc; i += 1 ) {
+                #ifdef __DEBUG_H__
                 cerr << "argv[" << i << "]:\"" << argv[i] << "\"" << endl;
-        } // for
-        #endif // __DEBUG_H__
-
-        // process all the arguments
-
-        for ( int i = 1; i < argc; i += 1 ) {
+                #endif // __DEBUG_H__
                 arg = argv[i];
+                #ifdef __DEBUG_H__
+                cerr << "arg:\"" << arg << "\"" << endl;
+                #endif // __DEBUG_H__
                 if ( prefix( arg, "-" ) ) {
                         // strip inappropriate flags
@@ -456 +476 @@
         #ifdef __DEBUG_H__
         cerr << "args:";
-        for ( int i = 1; i < nargs; i += 1 ) {
+        for ( i = 1; i < nargs; i += 1 ) {
                 cerr << " " << args[i];
         } // for
@@ -472 +492 @@
         #ifdef __DEBUG_H__
         cerr << "stage2 nargs: " << nargs << endl;
-        for ( int i = 0; args[i] != NULL; i += 1 ) {
+        for ( i = 0; args[i] != NULL; i += 1 ) {
                 cerr << args[i] << " ";
         } // for
@@ -486 +506 @@
 int main( const int argc, const char * const argv[], __attribute__((unused)) const char * const env[] ) {
         #ifdef __DEBUG_H__
-        for ( int int i = 0; env[i] != NULL; i += 1 ) {
+        for ( int i = 0; env[i] != NULL; i += 1 ) {
                 cerr << env[i] << endl;
         } // for