Changeset ff29f08 for src/driver

Timestamp:

May 18, 2018, 2:09:21 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

2472a19

Parents:

f6f0cca3 (diff), c7d8100c (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 remote-tracking branch 'origin/master' into with_gc

Location:

src/driver

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• cc1.cc (modified) (3 diffs)
• cfa.cc (modified) (7 diffs)

src/driver/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 08:49:31 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Fri Oct 28 13:46:06 2016
-## Update Count     : 10
+## Last Modified On : Mon Apr 30 17:44:17 2018
+## Update Count     : 11
 ###############################################################################
 
 # applies to both programs
-AM_CXXFLAGS = -Wall -O2 -g -std=c++14
+AM_CXXFLAGS = -Wall -O2 -g -std=c++14 -I${abs_top_srcdir}/src
 if BUILD_NO_LIB
 else

src/driver/Makefile.in

@@ -294 +294 @@
 
 # applies to both programs
-AM_CXXFLAGS = -Wall -O2 -g -std=c++14 $(am__append_1) $(am__append_2) \
-        $(am__append_3)
+AM_CXXFLAGS = -Wall -O2 -g -std=c++14 -I${abs_top_srcdir}/src \
+        $(am__append_1) $(am__append_2) $(am__append_3)
 cfa_SOURCES = cfa.cc
 

src/driver/cc1.cc

@@ -10 +10 @@
 // Created On       : Fri Aug 26 14:23:51 2005
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Jan 18 08:14:21 2017
-// Update Count     : 81
+// Last Modified On : Sat May 12 16:11:53 2018
+// Update Count     : 94
 //
 
@@ -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__=" );
@@ -162 +163 @@
                                 cargs[ncargs] = ( *new string( string( argv[i + 1] ).substr( D__CFA_FLAGPREFIX__.size() - 2 ) ) ).c_str();
                                 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__ ) ) {

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