2008-06-02 Daniel Franke <franke.daniel@gmail.com>

        PR fortran/36375
        PR fortran/36377
        * cpp.c (gfc_cpp_init): Do not initialize builtins if
        processing already preprocessed input.
        (gfc_cpp_preprocess): Finalize output with newline.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@136283 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index a928c25..06fc54c 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-02  Daniel Franke  <franke.daniel@gmail.com>
+
+       PR fortran/36375
+       PR fortran/36377
+       * cpp.c (gfc_cpp_init): Do not initialize builtins if
+       processing already preprocessed input.
+       (gfc_cpp_preprocess): Finalize output with newline.
+
 2008-05-31  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
 
        * intrinsic.texi: Revert wrong commit.

diff --git a/gcc/fortran/cpp.c b/gcc/fortran/cpp.c
index 865e2ef..170f6cd 100644 (file)
--- a/gcc/fortran/cpp.c
+++ b/gcc/fortran/cpp.c
@@ -524,6 +524,9 @@ gfc_cpp_init (void)
 {
   int i;
 
+  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);
@@ -574,6 +577,8 @@ gfc_cpp_preprocess (const char *source_file)
       cpp_forall_identifiers (cpp_in, dump_macro, NULL);
     }
 
+  putc ('\n', print.outf);
+
   if (!gfc_cpp_preprocess_only ()
       || (gfc_cpp_preprocess_only () && gfc_cpp_option.output_filename))
     fclose (print.outf);