Changeset d60ccbf for src/driver/cc1.cc

Timestamp:

Aug 12, 2015, 2:27:31 PM (10 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

f32c7f4

Parents:

e45215c (diff), e869d663 (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 designate

Conflicts:

src/CodeGen/CodeGenerator.h

File:

• src/driver/cc1.cc (modified) (2 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 : Sat May 30 08:58:29 2015
-// Update Count     : 51
+// Last Modified On : Thu Jul 16 17:09:14 2015
+// Update Count     : 54
 //
 
@@ -319 +319 @@
                 uargs[0] = ( *new string( bprefix + "/cfa-cpp" ) ).c_str();
 
-                uargs[nuargs] = "-p";
-                nuargs += 1;
-
                 uargs[nuargs] = tmpname;
                 nuargs += 1;