Changes in src/driver/cfa.cc [157d094:dffaeac]

File:

• src/driver/cfa.cc (modified) (12 diffs)

src/driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 14 14:16:33 2018
-// Update Count     : 244
+// Last Modified On : Fri Jul 13 17:40:12 2018
+// Update Count     : 258
 //
 
@@ -37 +37 @@
 } // prefix
 
+enum { NumSuffixes = 2 };
+const string suffixes[NumSuffixes] = { "cfa", "hfa", };
+
+bool suffix( string arg ) {
+        //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;
+        string sx = arg.substr( dot + 1 );
+        for ( int i = 0; i < NumSuffixes; i += 1 ) {
+                if ( sx == suffixes[i] ) return true;
+        } // for
+        return false;
+} // suffix
+
 
 void shuffle( const char *args[], int S, int E, int N ) {
         // S & E index 1 passed the end so adjust with -1
-#ifdef __DEBUG_H__
+        #ifdef __DEBUG_H__
         cerr << "shuffle:" << S << " " << E << " " << N << endl;
-#endif // __DEBUG_H__
+        #endif // __DEBUG_H__
         for ( int j = E-1 + N; j > S-1 + N; j -=1 ) {
-#ifdef __DEBUG_H__
+                #ifdef __DEBUG_H__
                 cerr << "\t" << j << " " << j-N << endl;
-#endif // __DEBUG_H__
+                #endif // __DEBUG_H__
                 args[j] = args[j-N];
         } // for
@@ -79 +94 @@
         bool std_flag = false;                                                          // -std= flag
         bool noincstd_flag = false;                                                     // -no-include-stdhdr= flag
+        bool xflag = false;                                                                     // user supplied -x flag
         bool debugging __attribute(( unused )) = false;         // -g flag
 
@@ -88 +104 @@
         int nlibs = 0;
 
-#ifdef __DEBUG_H__
+        #ifdef __DEBUG_H__
         cerr << "CFA:" << endl;
-#endif // __DEBUG_H__
+        #endif // __DEBUG_H__
 
         // process command-line arguments
 
         for ( int i = 1; i < argc; i += 1 ) {
-#ifdef __DEBUG_H__
+                #ifdef __DEBUG_H__
                 cerr << "argv[" << i << "]:\"" << argv[i] << "\"" << endl;
-#endif // __DEBUG_H__
+                #endif // __DEBUG_H__
                 arg = argv[i];                                                                  // convert to string value
-#ifdef __DEBUG_H__
+                #ifdef __DEBUG_H__
                 cerr << "arg:\"" << arg << "\"" << endl;
-#endif // __DEBUG_H__
+                #endif // __DEBUG_H__
                 if ( prefix( arg, "-" ) ) {
                         // pass through arguments
@@ -162 +178 @@
                                 args[nargs] = argv[i];                                  // pass the argument along
                                 nargs += 1;
-                        } else if ( arg == "-x" ) {                                     // lost so force along
+                        } else if ( arg == "-x" ) {
+                                xflag = true;
                                 args[nargs] = argv[i];                                  // pass the argument along
                                 nargs += 1;
@@ -168 +185 @@
                                 args[nargs] = argv[i];                                  // pass the argument along
                                 nargs += 1;
-                                args[nargs] = ( *new string( string("-D__GCC_X__=") + argv[i] ) ).c_str(); // add the argument for -x
-                                nargs += 1;
-                        } else if ( prefix( arg, "-x" ) ) {                     // lost so force along
-                                args[nargs] = argv[i];                                  // pass the argument along
-                                nargs += 1;
-                                args[nargs] = ( *new string( string("-D__GCC_X__=") + arg.substr(2) ) ).c_str(); // add the argument for -x
-                                nargs += 1;
+                                // args[nargs] = ( *new string( string("-D__GCC_X__=") + argv[i] ) ).c_str(); // add the argument for -x
+                                // nargs += 1;
+                        } else if ( prefix( arg, "-x" ) ) {
+                                xflag = true;
+                                args[nargs] = argv[i];                                  // pass the argument along
+                                nargs += 1;
+                                // args[nargs] = ( *new string( string("-D__GCC_X__=") + arg.substr(2) ) ).c_str(); // add the argument for -x
+                                // nargs += 1;
                         } else if ( arg == "-w" ) {
                                 args[nargs] = argv[i];                                  // pass the argument along
@@ -246 +264 @@
                         } // if
                 } else {
+                        bool opt = false;
+                        if ( ! xflag && suffix( arg ) ) {
+                                args[nargs] = "-x";
+                                nargs += 1;
+                                args[nargs] = "c";
+                                nargs += 1;
+                                // args[nargs] = ( *new string( string("-D__GCC_X__=c") ) ).c_str(); // add the argument for -x
+                                // nargs += 1;
+                                opt = true;
+                        } // if
                         // concatenate other arguments
                         args[nargs] = argv[i];
                         nargs += 1;
+                        if ( opt ) {
+                                args[nargs] = "-x";
+                                nargs += 1;
+                                args[nargs] = "none";
+                                nargs += 1;
+                                // args[nargs] = ( *new string( string("-D__GCC_X__=none") ) ).c_str(); // add the argument for -x
+                                // nargs += 1;
+                        } // if
                         nonoptarg = true;
+                        xflag = false;
                 } // if
         } // for
 
-#ifdef __x86_64__
+        #ifdef __x86_64__
         args[nargs] = "-mcx16";                                                         // allow double-wide CAA
         nargs += 1;
-#endif // __x86_64__
-
-#ifdef __DEBUG_H__
+        #endif // __x86_64__
+
+        #ifdef __DEBUG_H__
         cerr << "args:";
         for ( int i = 1; i < nargs; i += 1 ) {
@@ -264 +301 @@
         } // for
         cerr << endl;
-#endif // __DEBUG_H__
+        #endif // __DEBUG_H__
 
         if ( cpp_flag && CFA_flag ) {
@@ -283 +320 @@
         nargs += 1;
 
-#ifdef HAVE_LIBCFA
+        #ifdef HAVE_LIBCFA
         if ( link ) {
                 #if ! defined(HAVE_LIBCFA_RELEASE)
-                        if ( ! debug ) {
-                                cerr << "error: Option -nodebug is unavailable, libcfa was not installed." << endl;
-                                exit( EXIT_FAILURE );
-                        } // if
+                if ( ! debug ) {
+                        cerr << "error: Option -nodebug is unavailable, libcfa was not installed." << endl;
+                        exit( EXIT_FAILURE );
+                } // if
                 #endif
                 #if ! defined(HAVE_LIBCFA_DEBUG)
-                        if ( debug ) {
-                                cerr << "error: Option -debug is unavailable, libcfa-d was not installed." << endl;
-                                exit( EXIT_FAILURE );
-                        } // if
+                if ( debug ) {
+                        cerr << "error: Option -debug is unavailable, libcfa-d was not installed." << endl;
+                        exit( EXIT_FAILURE );
+                } // if
                 #endif
 
@@ -323 +360 @@
                 nargs += 1;
         } // if
-#endif // HAVE_LIBCFA
+        #endif // HAVE_LIBCFA
 
         // Add exception flags (unconditionally)
@@ -419 +456 @@
         args[nargs] = NULL;                                                                     // terminate with NULL
 
-#ifdef __DEBUG_H__
+        #ifdef __DEBUG_H__
         cerr << "nargs: " << nargs << endl;
         cerr << "args:" << endl;
@@ -425 +462 @@
                 cerr << " \"" << args[i] << "\"" << endl;
         } // for
-#endif // __DEBUG_H__
+        #endif // __DEBUG_H__
 
         if ( ! quiet ) {