Changeset 22f94a4 for driver/cfa.cc

Timestamp:

Aug 11, 2020, 4:40:15 PM (5 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

Children:

0d070ca

Parents:

07d867b (diff), 129674b (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 new-ast

File:

• driver/cfa.cc (modified) (5 diffs)

driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jan 31 16:48:03 2020
-// Update Count     : 421
+// Last Modified On : Sat May 30 18:28:23 2020
+// Update Count     : 433
 //
 
@@ -185 +185 @@
                                 args[nargs++] = argv[i];                                // pass argument along
                                 if ( arg == "-o" ) o_file = i;                  // remember file
-                        } else if ( arg == "-XCFA" ) {                          // CFA pass through
-                                i += 1;
-                                if ( i == argc ) continue;                              // next argument available ?
-                                Putenv( argv, argv[i] );
-
-                                // CFA specific arguments
+                        } else if ( strncmp(arg.c_str(), "-XCFA", 5) == 0 ) {                           // CFA pass through
+                                if(arg.size() == 5) {
+                                        i += 1;
+                                        if ( i == argc ) continue;                              // next argument available ?
+                                        Putenv( argv, argv[i] );
+
+                                        // CFA specific arguments
+                                }
+                                else if(arg[5] == ',') {
+                                        Putenv( argv, argv[i] + 6 );
+
+                                        // CFA specific arguments
+                                }
+                                else {
+                                        args[nargs++] = argv[i];
+                                }
 
                         } else if ( arg == "-CFA" ) {
@@ -243 +253 @@
                                         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
@@ -302 +317 @@
 
         #ifdef __x86_64__
-        args[nargs++] = "-mcx16";                                                       // allow double-wide CAA
+        args[nargs++] = "-mcx16";                                                       // allow double-wide CAS
         #endif // __x86_64__
 
@@ -420 +435 @@
                 args[nargs++] = "-Wl,--pop-state";
                 args[nargs++] = "-pthread";
+                #ifdef __x86_64__
+                args[nargs++] = "-latomic";                                             // allow double-wide CAS
+                #endif // __x86_64__
                 args[nargs++] = "-ldl";
                 args[nargs++] = "-lrt";