X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Ffortran%2Fcpp.c;h=9368d890973b6edac181735f5af536decb505fb2;hb=6ea2c7a39e48b9b78626cec92b83a0a6e9b05f9f;hp=a40442ee4d7be92df536b24902f7e0b2d00046ee;hpb=c3271fdb04f8f85e05e726ce72dc99c5dd82094c;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/gcc/fortran/cpp.c b/gcc/fortran/cpp.c
index a40442ee4d7..9368d890973 100644
--- a/gcc/fortran/cpp.c
+++ b/gcc/fortran/cpp.c
@@ -565,9 +565,17 @@ gfc_cpp_init (void)
   if (gfc_option.flag_preprocessed)
     return;
 
-  cpp_change_file (cpp_in, LC_RENAME, _("<built-in>"));
   if (!gfc_cpp_option.no_predefined)
-    cpp_define_builtins (cpp_in);
+    {
+      /* Make sure all of the builtins about to be declared have
+	BUILTINS_LOCATION has their source_location.  */
+      source_location builtins_loc = BUILTINS_LOCATION;
+      cpp_force_token_locations (cpp_in, &builtins_loc);
+
+      cpp_define_builtins (cpp_in);
+
+      cpp_stop_forcing_token_locations (cpp_in);
+    }
 
   /* Handle deferred options from command-line.  */
   cpp_change_file (cpp_in, LC_RENAME, _("<command-line>"));