Changeset 94e0864d for src/driver

Timestamp:

Jun 24, 2015, 4:12:31 PM (9 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:

1869adf

Parents:

94b4364 (diff), de62360d (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 resolver

Conflicts:

src/CodeGen/CodeGenerator.cc
src/Parser/ExpressionNode.cc
src/ResolvExpr/Resolver.cc

File:

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

src/driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat May 30 10:15:00 2015
-// Update Count     : 116
+// Last Modified On : Tue Jun 23 17:47:03 2015
+// Update Count     : 119
 //
 
@@ -85 +85 @@
         bool CFA_flag = false;                                                          // -CFA flag
         bool cpp_flag = false;                                                          // -E or -M flag, preprocessor only
+        bool std_flag = false;                                                          // -std= flag
         bool debugging = false;                                                         // -g flag
 
@@ -152 +153 @@
                                 } // if
 
-                                // C++ specific arguments
+                                // C specific arguments
 
                         } else if ( arg == "-v" ) {
@@ -160 +161 @@
                         } else if ( arg == "-g" ) {
                                 debugging = true;                                               // symbolic debugging required
+                                args[nargs] = argv[i];                                  // pass the argument along
+                                nargs += 1;
+                        } else if ( prefix( arg, "-std=" ) ) {
+                                std_flag = true;                                                // std=XX provided
                                 args[nargs] = argv[i];                                  // pass the argument along
                                 nargs += 1;
@@ -296 +301 @@
                 args[nargs] = "-Wno-deprecated"; 
                 nargs += 1;
-                args[nargs] = "-std=c99";
-                nargs += 1;
+                if ( ! std_flag ) {                                                             // default c99, if none specified
+                        args[nargs] = "-std=c99";
+                        nargs += 1;
+                } // if
                 args[nargs] = ( *new string( string("-B") + Bprefix + "/" ) ).c_str();
                 nargs += 1;