From 3135ce84cc325bdfb60e62d2d5845ec41b86b691 Mon Sep 17 00:00:00 2001 From: Francois-Xavier Coudert Date: Sun, 6 Apr 2008 12:36:58 +0000 Subject: [PATCH] gcc.c (default_compilers): Sync Fortran extensions list with that in fortran/lang-specs.h. gcc/ * gcc.c (default_compilers): Sync Fortran extensions list with that in fortran/lang-specs.h. * doc/invoke.texi: Likewise. * dbxout.c (get_lang_number): Use "GNU Fortran" in "GNU F95". * dwarf2out.c (gen_compile_unit_die): Likewise. gcc/fortran/ * f95-lang.c: Set LANG_HOOKS_NAME to "GNU Fortran". From-SVN: r133960 --- gcc/ChangeLog | 8 ++++++++ gcc/dbxout.c | 2 +- gcc/doc/invoke.texi | 8 +++++++- gcc/dwarf2out.c | 2 +- gcc/fortran/ChangeLog | 4 ++++ gcc/fortran/f95-lang.c | 2 +- gcc/gcc.c | 13 ++++++++----- 7 files changed, 30 insertions(+), 9 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 51f91afc017..86d391a4beb 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2008-04-06 Francois-Xavier Coudert + + * gcc.c (default_compilers): Sync Fortran extensions list with + that in fortran/lang-specs.h. + * doc/invoke.texi: Likewise. + * dbxout.c (get_lang_number): Use "GNU Fortran" in "GNU F95". + * dwarf2out.c (gen_compile_unit_die): Likewise. + 2008-04-06 Tom G. Christensen * gthr-posix95.h (__gthread_cond_wait_recursive): Add missing &. diff --git a/gcc/dbxout.c b/gcc/dbxout.c index acf20b2ab90..c94e6f925f9 100644 --- a/gcc/dbxout.c +++ b/gcc/dbxout.c @@ -963,7 +963,7 @@ get_lang_number (void) return N_SO_CC; else if (strcmp (language_string, "GNU F77") == 0) return N_SO_FORTRAN; - else if (strcmp (language_string, "GNU F95") == 0) + else if (strcmp (language_string, "GNU Fortran") == 0) return N_SO_FORTRAN90; /* CHECKME */ else if (strcmp (language_string, "GNU Pascal") == 0) return N_SO_PASCAL; diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi index 5152a153d32..d8ae286512a 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -932,21 +932,27 @@ C++ header file to be turned into a precompiled header. @item @var{file}.f @itemx @var{file}.for -@itemx @var{file}.FOR +@itemx @var{file}.ftn Fixed form Fortran source code which should not be preprocessed. @item @var{file}.F +@itemx @var{file}.FOR @itemx @var{file}.fpp @itemx @var{file}.FPP +@itemx @var{file}.FTN Fixed form Fortran source code which must be preprocessed (with the traditional preprocessor). @item @var{file}.f90 @itemx @var{file}.f95 +@itemx @var{file}.f03 +@itemx @var{file}.f08 Free form Fortran source code which should not be preprocessed. @item @var{file}.F90 @itemx @var{file}.F95 +@itemx @var{file}.F03 +@itemx @var{file}.F08 Free form Fortran source code which must be preprocessed (with the traditional preprocessor). diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index 1d99699286b..f54f34a11aa 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -13221,7 +13221,7 @@ gen_compile_unit_die (const char *filename) language = DW_LANG_Ada95; else if (strcmp (language_string, "GNU F77") == 0) language = DW_LANG_Fortran77; - else if (strcmp (language_string, "GNU F95") == 0) + else if (strcmp (language_string, "GNU Fortran") == 0) language = DW_LANG_Fortran95; else if (strcmp (language_string, "GNU Pascal") == 0) language = DW_LANG_Pascal83; diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 64e5193a790..d7cfedb47c0 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,7 @@ +2008-04-06 Francois-Xavier Coudert + + * f95-lang.c: Set LANG_HOOKS_NAME to "GNU Fortran". + 2008-04-06 Francois-Xavier Coudert * dump-parse-tree.c: Use fprintf, fputs and fputc instead of diff --git a/gcc/fortran/f95-lang.c b/gcc/fortran/f95-lang.c index 4639d6c27b6..eacaff82ab0 100644 --- a/gcc/fortran/f95-lang.c +++ b/gcc/fortran/f95-lang.c @@ -121,7 +121,7 @@ static alias_set_type gfc_get_alias_set (tree); #undef LANG_HOOKS_GET_ARRAY_DESCR_INFO /* Define lang hooks. */ -#define LANG_HOOKS_NAME "GNU F95" +#define LANG_HOOKS_NAME "GNU Fortran" #define LANG_HOOKS_INIT gfc_init #define LANG_HOOKS_FINISH gfc_finish #define LANG_HOOKS_INIT_OPTIONS gfc_init_options diff --git a/gcc/gcc.c b/gcc/gcc.c index 087fdfe0af3..0636579644f 100644 --- a/gcc/gcc.c +++ b/gcc/gcc.c @@ -966,11 +966,14 @@ static const struct compiler default_compilers[] = {".c++", "#C++", 0, 0, 0}, {".C", "#C++", 0, 0, 0}, {".CPP", "#C++", 0, 0, 0}, {".ii", "#C++", 0, 0, 0}, {".ads", "#Ada", 0, 0, 0}, {".adb", "#Ada", 0, 0, 0}, - {".f", "#Fortran", 0, 0, 0}, {".for", "#Fortran", 0, 0, 0}, - {".fpp", "#Fortran", 0, 0, 0}, {".F", "#Fortran", 0, 0, 0}, - {".FOR", "#Fortran", 0, 0, 0}, {".FPP", "#Fortran", 0, 0, 0}, - {".f90", "#Fortran", 0, 0, 0}, {".f95", "#Fortran", 0, 0, 0}, - {".F90", "#Fortran", 0, 0, 0}, {".F95", "#Fortran", 0, 0, 0}, + {".f", "#Fortran", 0, 0, 0}, {".F", "#Fortran", 0, 0, 0}, + {".for", "#Fortran", 0, 0, 0}, {".FOR", "#Fortran", 0, 0, 0}, + {".ftn", "#Fortran", 0, 0, 0}, {".FTN", "#Fortran", 0, 0, 0}, + {".fpp", "#Fortran", 0, 0, 0}, {".FPP", "#Fortran", 0, 0, 0}, + {".f90", "#Fortran", 0, 0, 0}, {".F90", "#Fortran", 0, 0, 0}, + {".f95", "#Fortran", 0, 0, 0}, {".F95", "#Fortran", 0, 0, 0}, + {".f03", "#Fortran", 0, 0, 0}, {".F03", "#Fortran", 0, 0, 0}, + {".f08", "#Fortran", 0, 0, 0}, {".F08", "#Fortran", 0, 0, 0}, {".r", "#Ratfor", 0, 0, 0}, {".p", "#Pascal", 0, 0, 0}, {".pas", "#Pascal", 0, 0, 0}, {".java", "#Java", 0, 0, 0}, {".class", "#Java", 0, 0, 0}, -- 2.30.2