Changeset e3215c5

Timestamp:

May 13, 2018, 8:28:32 AM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

a83d08b

Parents:

a8de0f4

Message:

add gcc -x flag

Location:

src/driver

Files:

• cc1.cc (modified) (3 diffs)
• cfa.cc (modified) (5 diffs)

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 : Wed May  2 17:57:43 2018
-// Update Count     : 224
+// Last Modified On : Sat May 12 17:07:53 2018
+// Update Count     : 240
 //
 
@@ -158 +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" ) {
@@ -240 +253 @@
         } // for
 
+//    if ( MACHINE_TYPE == "x86_64" ) {
+//              args[nargs] = "-mcx16";                                                 // allow double-wide CAA
+//              nargs += 1;
+//    } // if
+
 #ifdef __DEBUG_H__
         cerr << "args:";
@@ -268 +286 @@
         if ( link ) {
                 #if ! defined(HAVE_LIBCFA_RELEASE)
-                        if( !debug ) {
+                        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 ) {
+                        if ( debug ) {
                                 cerr << "error: Option -debug is unavailable, libcfa-d was not installed." << endl;
                                 exit( EXIT_FAILURE );
-                                }
+                        } // if
                 #endif
 
@@ -292 +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";