Index: driver/cfa.cc
===================================================================
--- driver/cfa.cc	(revision 98399b21521e8b3fd8c56157bd9de5a558723f59)
+++ driver/cfa.cc	(revision 4f5a8a2441acf4d1cea809cdd5b210abd06f4f3f)
@@ -10,6 +10,6 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Aug  9 18:51:44 2019
-// Update Count     : 309
+// Last Modified On : Sat Aug 10 08:44:15 2019
+// Update Count     : 311
 //
 
@@ -96,5 +96,5 @@
 	string compiler_name;								// name of C compiler
 
-	bool suffixp = false;								// -x flag
+	bool x_flag = false;								// -x flag
 	bool nonoptarg = false;								// indicates non-option argument specified
 	bool link = true;									// linking as well as compiling
@@ -191,13 +191,4 @@
 				args[nargs] = argv[i];					// pass the argument along
 				nargs += 1;
-			} else if ( prefix( arg, "-std=" ) || prefix( arg, "--std=" ) ) {
-				std_flag = true;						// -std=XX provided
-				args[nargs] = argv[i];					// pass the argument along
-				nargs += 1;
-			} else if ( arg == "-w" ) {
-				args[nargs] = argv[i];					// pass the argument along
-				nargs += 1;
-				args[nargs] = ( *new string( string("-D__CFA_FLAG__=") + arg ) ).c_str(); // add the argument for cfa-cpp
-				nargs += 1;
 			} else if ( prefix( arg, "-x" ) ) {			// file suffix ?
 				string lang;
@@ -213,5 +204,14 @@
 					lang = arg.substr( 2 );
 				} // if
-				suffixp = lang != "none";
+				x_flag = lang != "none";
+			} else if ( prefix( arg, "-std=" ) || prefix( arg, "--std=" ) ) {
+				std_flag = true;						// -std=XX provided
+				args[nargs] = argv[i];					// pass the argument along
+				nargs += 1;
+			} else if ( arg == "-w" ) {
+				args[nargs] = argv[i];					// pass the argument along
+				nargs += 1;
+				args[nargs] = ( *new string( string("-D__CFA_FLAG__=") + arg ) ).c_str(); // add the argument for cfa-cpp
+				nargs += 1;
 			} else if ( prefix( arg, "-W" ) ) {			// check before next tests
 				if ( arg == "-Werror" || arg == "-Wall" ) {
@@ -291,5 +291,5 @@
 		} else {
 			bool cfa = suffix( arg );					// check suffix
-			if ( ! suffixp && cfa ) {					// no explicit suffix and cfa suffix ?
+			if ( ! x_flag && cfa ) {					// no explicit suffix and cfa suffix ?
 				args[nargs] = "-x";
 				nargs += 1;
@@ -299,5 +299,5 @@
 			args[nargs] = argv[i];						// concatenate file
 			nargs += 1;
-			if ( ! suffixp && cfa ) {					// no explicit suffix and cfa suffix ?
+			if ( ! x_flag && cfa ) {					// no explicit suffix and cfa suffix ?
 				args[nargs] = "-x";
 				nargs += 1;