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

File:

• src/driver/cfa.cc (modified) (7 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 Feb  5 22:05:28 2018
-// Update Count     : 166
+// Last Modified On : Mon May 14 14:16:33 2018
+// Update Count     : 244
 //
 
@@ -19 +19 @@
 #include <unistd.h>                                                                             // execvp
 #include <string>                                                                               // STL version
-
+#include <string.h>                                                                             // strcmp
+
+#include "Common/SemanticError.h"
 #include "config.h"                                                                             // configure info
 
@@ -156 +158 @@
                                 args[nargs] = argv[i];                                  // pass the argument along
                                 nargs += 1;
-                        } else if ( prefix( arg, "-std=" ) ) {
+                        } else if ( prefix( arg, "-std=" ) || prefix( arg, "--std=" ) ) {
                                 std_flag = true;                                                // -std=XX provided
                                 args[nargs] = argv[i];                                  // pass the argument along
                                 nargs += 1;
+                        } else if ( arg == "-x" ) {                                     // lost so force along
+                                args[nargs] = argv[i];                                  // pass the argument along
+                                nargs += 1;
+                                i += 1;                                                                 // advance to argument
+                                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;
+                        } else if ( arg == "-w" ) {
+                                args[nargs] = argv[i];                                  // pass the argument along
+                                nargs += 1;
+                                args[nargs] = ( *new string( string("-D__CFA_FLAG__=") + arg ) ).c_str(); // add the argument for cfa-cpp
+                                nargs += 1;
+                        } else if ( prefix( arg, "-W" ) ) {                     // check before next tests
+                                if ( arg == "-Werror" || arg == "-Wall" ) {
+                                        args[nargs] = argv[i];                          // pass the argument along
+                                        nargs += 1;
+                                        args[nargs] = ( *new string( string("-D__CFA_FLAG__=") + arg ) ).c_str(); // add the argument for cfa-cpp
+                                        nargs += 1;
+                                } else {
+                                        unsigned int adv = prefix( arg, "-Wno-" ) ? 5 : 2;
+                                        args[nargs] = argv[i];                          // conditionally pass the argument along
+                                        const char * warning = argv[i] + adv;     // extract warning
+                                        if ( SemanticWarning_Exist( warning ) ) { // replace the argument for cfa-cpp
+                                                args[nargs] = ( *new string( string("-D__CFA_FLAG__=") + arg ) ).c_str();
+                                        } // if
+                                        nargs += 1;
+                                } // if
                         } else if ( prefix( arg, "-B" ) ) {
                                 Bprefix = arg.substr(2);                                // strip the -B flag
@@ -218 +253 @@
         } // for
 
+#ifdef __x86_64__
+        args[nargs] = "-mcx16";                                                         // allow double-wide CAA
+        nargs += 1;
+#endif // __x86_64__
+
 #ifdef __DEBUG_H__
         cerr << "args:";
@@ -246 +286 @@
         if ( link ) {
                 #if ! defined(HAVE_LIBCFA_RELEASE)
-                        if( !debug ) {
-                                cerr << "error: Option -nodebug is not available, libcfa was not installed." << endl;
+                        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 not available, libcfa-d was not installed." << endl;
+                        if ( debug ) {
+                                cerr << "error: Option -debug is unavailable, libcfa-d was not installed." << endl;
                                 exit( EXIT_FAILURE );
-                                }
+                        } // if
                 #endif
 
@@ -270 +310 @@
                 args[nargs] = "-L" CFA_LIBDIR;
                 nargs += 1;
-                if( debug ) {
+                if ( debug ) {
                         args[nargs] = "-lcfa-d";
                 } else {
                         args[nargs] = "-lcfa";
-                }
+                } // if
                 nargs += 1;
                 args[nargs] = "-lpthread";
@@ -355 +395 @@
                 args[nargs] = "-Wno-deprecated";
                 nargs += 1;
-                if ( ! std_flag ) {                                                             // default c99, if none specified
-                        args[nargs] = "-std=gnu99";
+                if ( ! std_flag ) {                                                             // default c11, if none specified
+                        args[nargs] = "-std=gnu11";
                         nargs += 1;
                 } // if