Changeset e9e4e9ee for src/driver/cc1.cc

Timestamp:

Jan 19, 2017, 11:04:27 AM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, resolv-new, with_gc

Children:

2175062

Parents:

5ebb2fbc (diff), 68e6031 (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:/u/cforall/software/cfa/cfa-cc

File:

• src/driver/cc1.cc (modified) (3 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 : Fri Jun 10 09:27:37 2016
-// Update Count     : 80
+// Last Modified On : Wed Jan 18 08:14:21 2017
+// Update Count     : 81
 //
 
@@ -169 +169 @@
                                 i += 1;                                                                 // and the argument
 
-                                // all other flags
+                        // all other flags
 
                         } else if ( arg == "-o" ) {
@@ -178 +178 @@
                                 nargs += 1;
                                 // CPP flags with an argument
-                                if ( arg == "-D" || arg == "-I" || arg == "-MF" || arg == "-MT" || arg == "-MQ" ||
+                                if ( arg == "-D" || arg == "-U" || arg == "-I" || arg == "-MF" || arg == "-MT" || arg == "-MQ" ||
                                          arg == "-include" || arg == "-imacros" || arg == "-idirafter" || arg == "-iprefix" ||
                                          arg == "-iwithprefix" || arg == "-iwithprefixbefore" || arg == "-isystem" || arg == "-isysroot" ) {