Changeset d83b266 for driver/cc1.cc

Timestamp:

Jul 26, 2021, 2:42:34 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

0a061c0

Parents:

c86ee4c (diff), 98233b3 (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

File:

• driver/cc1.cc (modified) (3 diffs)

driver/cc1.cc

@@ -10 +10 @@
 // Created On       : Fri Aug 26 14:23:51 2005
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jun  1 23:07:21 2021
-// Update Count     : 415
+// Last Modified On : Wed Jul 21 09:46:24 2021
+// Update Count     : 419
 //
 
@@ -372 +372 @@
                         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;
+                                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;
@@ -587 +587 @@
                 Stage2( argc, argv );
         } else {
-                cerr << "Usage: " << argv[0] << " input-file [output-file] [options]" << endl;
+                cerr << "Usage: " << argv[0] << " [-E input-file [output-file] ] | [-fpreprocessed input-file output-file] [options]" << endl;
                 exit( EXIT_FAILURE );
         } // if