Changeset 3f7e12cb for src/driver/cfa.cc

Timestamp:

Nov 8, 2017, 5:43:33 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

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:

954908d

Parents:

78315272 (diff), e35f30a (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:

• src/driver/cfa.cc (modified) (3 diffs)

src/driver/cfa.cc

@@ -9 +9 @@
 // Author           : Peter A. Buhr
 // Created On       : Tue Aug 20 13:44:49 2002
-// Last Modified By : Andrew Beach
-// Last Modified On : Thr Aug 17 15:24:00 2017
-// Update Count     : 156
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Oct 31 11:40:44 2017
+// Update Count     : 160
 //
 
@@ -305 +305 @@
         } // if
 
+        shuffle( args, sargs, nargs, 1 );                                       // make room at front of argument list
+        nargs += 1;
         if ( CFA_flag ) {
+                args[sargs] = "-D__CFA_FLAG__=-N";
                 args[nargs] = "-D__CFA_PREPROCESS_";
                 nargs += 1;
-        } // if
+        } else {
+                args[sargs] = "-D__CFA_FLAG__=-L";
+        } // if
+        sargs += 1;
 
         if ( debug ) {
@@ -345 +351 @@
                 } // if
                 args[nargs] = "-fgnu89-inline";
+                nargs += 1;
+                args[nargs] = "-D__int8_t_defined";                             // prevent gcc type-size attributes
                 nargs += 1;
                 args[nargs] = ( *new string( string("-B") + Bprefix + "/" ) ).c_str();