Changeset 3b56166 for driver

Timestamp:

Feb 10, 2020, 11:17:38 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

3966d9a, 41efd33

Parents:

807a632 (diff), d231700 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

driver

Files:

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

driver/cc1.cc

@@ -335 +335 @@
         #endif // __DEBUG_H__
 
+        enum {
+                Color_Auto   = 0,
+                Color_Always = 1,
+                Color_Never  = 2,
+        } color_arg = Color_Auto;
+
+        const char * color_names[3] = { "--colors=auto", "--colors=always", "--colors=never" };
+
         // process all the arguments
 
@@ -341 +349 @@
                 if ( prefix( arg, "-" ) ) {
                         // strip inappropriate flags
+
+                        if ( prefix( arg, "-fdiagnostics-color=" ) ) {
+                                string choice = arg.substr(20);
+                                     if(choice == "always") color_arg = Color_Always;
+                                else if(choice == "never" ) color_arg = Color_Never;
+                                else if(choice == "auto"  ) color_arg = Color_Auto;
+                        } else if ( arg == "-fno-diagnostics-color" ) {
+                                color_arg = Color_Auto;
+                        }
 
                         if ( arg == "-quiet" || arg == "-version" || arg == "-fpreprocessed" ||
@@ -440 +457 @@
                         cargs[ncargs++] = cfa_cpp_out.c_str();
                 } // if
+
+                cargs[ncargs++] = color_names[color_arg];
+
                 cargs[ncargs] = 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 : Tue Sep 10 17:00:15 2019
-// Update Count     : 420
+// Last Modified On : Fri Jan 31 16:48:03 2020
+// Update Count     : 421
 //
 
@@ -187 +187 @@
                         } else if ( arg == "-XCFA" ) {                          // CFA pass through
                                 i += 1;
+                                if ( i == argc ) continue;                              // next argument available ?
                                 Putenv( argv, argv[i] );
 
@@ -401 +402 @@
                 args[nargs++] = "-Xlinker";
                 args[nargs++] = "--undefined=__cfaabi_appready_startup";
+                args[nargs++] = "-z";
+                args[nargs++] = "execstack";
 
                 // include the cfa library in case it is needed
@@ -409 +412 @@
                 args[nargs++] = "-Wl,--pop-state";
                 args[nargs++] = "-lcfa";
-                args[nargs++] = "-lpthread";
+                args[nargs++] = "-pthread";
                 args[nargs++] = "-ldl";
                 args[nargs++] = "-lrt";