Changeset 97392b69 for driver

Timestamp:

Jun 10, 2020, 4:19:30 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

ab8a023

Parents:

a5873bd (diff), ee06db5c (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 branch 'master' into relaxed_ready

Location:

driver

Files:

• cc1.cc (modified) (6 diffs)
• cfa.cc (modified) (4 diffs)

driver/cc1.cc

@@ -10 +10 @@
 // Created On       : Fri Aug 26 14:23:51 2005
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Oct 20 08:14:33 2019
-// Update Count     : 385
+// Last Modified On : Sat May 30 18:09:05 2020
+// Update Count     : 404
 //
 
@@ -38 +38 @@
 static string o_file;
 static string bprefix;
+static string lang;                                                                             // -x flag
 
 
@@ -73 +74 @@
                         if ( prefix( val, "-compiler=" ) ) {
                                 compiler_path = val.substr( 10 );
+                        } else if ( prefix( val, "-x=" ) ) {
+                                lang = val.substr( 3 );
                         } // if
                 } // if
@@ -100 +103 @@
                         } else if ( prefix( val, "-B=" ) ) {            // location of cfa-cpp
                                 bprefix = val.substr( 3 );
+                        } else if ( prefix( val, "-x=" ) ) {            // ignore
                         } else {                                                                        // normal flag for cfa-cpp
                                 args[nargs++] = ( *new string( arg.substr( arg.find_first_of( "=" ) + 1 ) ) ).c_str();
@@ -247 +251 @@
 
                 args[0] = compiler_path.c_str();
-                suffix( cpp_in, args, nargs );                                  // check suffix
+                if ( lang.size() == 0 ) {
+                        suffix( cpp_in, args, nargs );                          // check suffix
+                } else {
+                        args[nargs++] = "-x";
+                        args[nargs++] = ( *new string( lang.c_str() ) ).c_str();
+                } // if
                 args[nargs++] = cpp_in;
                 if ( o_flag ) {                                                                 // location for output
@@ -280 +289 @@
 
                 args[0] = compiler_path.c_str();
-                suffix( cpp_in, args, nargs );                                  // check suffix
+                if ( lang.size() == 0 ) {
+                        suffix( cpp_in, args, nargs );                          // check suffix
+                } else {
+                        args[nargs++] = "-x";
+                        args[nargs++] = ( *new string( lang.c_str() ) ).c_str();
+                } // if
                 args[nargs++] = cpp_in;                                                 // input to cpp
                 args[nargs] = nullptr;                                                  // terminate argument list

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 18 13:26:26 2020
-// Update Count     : 424
+// Last Modified On : Sat May 30 18:28:23 2020
+// Update Count     : 433
 //
 
@@ -243 +243 @@
                                         lang = arg.substr( 2 );
                                 } // if
-                                x_flag = lang != "none";
+                                if ( x_flag ) {
+                                        cerr << argv[0] << " warning, only one -x flag per compile, ignoring subsequent flag." << endl;
+                                } else {
+                                        x_flag = true;
+                                        Putenv( argv, string( "-x=" ) + lang );
+                                } // if
                         } else if ( prefix( arg, "-std=" ) || prefix( arg, "--std=" ) ) {
                                 std_flag = true;                                                // -std=XX provided
@@ -301 +306 @@
         } // for
 
+        #ifdef __x86_64__
+        args[nargs++] = "-mcx16";                                                       // allow double-wide CAS
+        #endif // __x86_64__
+
         #ifdef __DEBUG_H__
         cerr << "args:";
@@ -415 +424 @@
                 args[nargs++] = "-lcfa";
                 args[nargs++] = "-Wl,--pop-state";
+                args[nargs++] = "-pthread";
                 #ifdef __x86_64__
-                args[nargs++] = "-mcx16";                                               // allow double-wide CAS
-                args[nargs++] = "-latomic";
+                args[nargs++] = "-latomic";                                             // allow double-wide CAS
                 #endif // __x86_64__
-                args[nargs++] = "-pthread";
                 args[nargs++] = "-ldl";
                 args[nargs++] = "-lrt";