Index: src/driver/cc1.cc
===================================================================
--- src/driver/cc1.cc	(revision 7b9375750bf2f89700a27d7fd3cef79bbc71ef92)
+++ src/driver/cc1.cc	(revision 03e5d14fed7fb921c0dfadb3761247f19a7f91e8)
@@ -10,6 +10,6 @@
 // Created On       : Fri Aug 26 14:23:51 2005
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May  4 23:29:19 2016
-// Update Count     : 74
+// Last Modified On : Thu May  5 16:04:30 2016
+// Update Count     : 77
 //
 
@@ -323,17 +323,8 @@
 		cargs[0] = ( *new string( bprefix + "/cfa-cpp" ) ).c_str();
 
-		// Source file-name without suffix used to generate routine names containing external initializations for TU.
-		string filename( cpp_in );
-		string::size_type posn = filename.find_last_of( "/" );
-		if ( posn != string::npos ) {
-			filename = filename.substr( posn + 1 );
-		} // if
-		posn = filename.find_last_of( "." );
-		if ( posn != string::npos ) {
-			filename = filename.substr( 0, posn );
-		} // if
+		// Source file-name used to generate routine names containing global initializations for TU.
 		cargs[ncargs] = ( *new string( "-F" ) ).c_str();
 		ncargs += 1;
-		cargs[ncargs] = ( *new string( filename ) ).c_str();
+		cargs[ncargs] = ( *new string( string( cpp_in ) ) ).c_str();
 		ncargs += 1;