dwarf2.h (enum dwarf_source_language): Add DW_LANG_Fortran03 and DW_LANG_Fortran08.

include/
	* dwarf2.h (enum dwarf_source_language): Add DW_LANG_Fortran03
	and DW_LANG_Fortran08.
gcc/
	* dwarf2out.c (is_fortran): Also return true for DW_LANG_Fortran03
	or DW_LANG_Fortran08.
	(lower_bound_default): Return 1 for DW_LANG_Fortran03 or
	DW_LANG_Fortran08.
	(gen_compile_unit_die): Handle "GNU Fortran2003" and
	"GNU Fortran2008" language strings.
	* dbxout.c (get_lang_number): Use lang_GNU_Fortran.
	* langhooks.h (lang_GNU_Fortran): New prototype.
	* langhooks.c (lang_GNU_Fortran): New function.
	* config/rs6000/rs6000.c (rs6000_output_function_epilogue): Use
	lang_GNU_Fortran.
gcc/fortran/
	* options.c: Include langhooks.h.
	(gfc_post_options): Change lang_hooks.name based on
	selected -std= mode.

From-SVN: r220422

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9554bcd0a6b1a04b4dc8f06875697cd5fdd580c6..b90fc402d447e692f0c1d202d28a501465e7ca1f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,17 @@
+2015-02-04  Jakub Jelinek  <jakub@redhat.com>
+
+       * dwarf2out.c (is_fortran): Also return true for DW_LANG_Fortran03
+       or DW_LANG_Fortran08.
+       (lower_bound_default): Return 1 for DW_LANG_Fortran03 or
+       DW_LANG_Fortran08.
+       (gen_compile_unit_die): Handle "GNU Fortran2003" and
+       "GNU Fortran2008" language strings.
+       * dbxout.c (get_lang_number): Use lang_GNU_Fortran.
+       * langhooks.h (lang_GNU_Fortran): New prototype.
+       * langhooks.c (lang_GNU_Fortran): New function.
+       * config/rs6000/rs6000.c (rs6000_output_function_epilogue): Use
+       lang_GNU_Fortran.
+
 2015-02-04  Eric Botcazou  <ebotcazou@adacore.com>
 
        * config/sparc/sparc.c (RTX_OK_FOR_OFFSET_P): Fix off-by-one error.

diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 3c853dc046de5d4eea55332de2498e57a8ff1029..356955ab8bbdb8c9225dd2773d94570425f882ef 100644 (file)
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -25537,7 +25537,7 @@ rs6000_output_function_epilogue (FILE *file,
          || ! strcmp (language_string, "libgccjit"))
        i = 0;
       else if (! strcmp (language_string, "GNU F77")
-              || ! strcmp (language_string, "GNU Fortran"))
+              || lang_GNU_Fortran ())
        i = 1;
       else if (! strcmp (language_string, "GNU Pascal"))
        i = 2;

diff --git a/gcc/dbxout.c b/gcc/dbxout.c
index c756f2e3dbb63f722cd18bbc14019844d23ea92f..758c1c439fabc5d4affc69723001d1a440a8a15e 100644 (file)
--- a/gcc/dbxout.c
+++ b/gcc/dbxout.c
@@ -967,7 +967,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 Fortran") == 0)
+  else if (lang_GNU_Fortran ())
     return N_SO_FORTRAN90; /* CHECKME */
   else if (strcmp (language_string, "GNU Pascal") == 0)
     return N_SO_PASCAL;

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index d9b8c421898d63d7fd5be0fd84341e2cf4394be7..db82710ecfb368534db8969a1293fe060c602e1f 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -4736,7 +4736,9 @@ is_fortran (void)
 
   return (lang == DW_LANG_Fortran77
          || lang == DW_LANG_Fortran90
-         || lang == DW_LANG_Fortran95);
+         || lang == DW_LANG_Fortran95
+         || lang == DW_LANG_Fortran03
+         || lang == DW_LANG_Fortran08);
 }
 
 /* Return TRUE if the language is Ada.  */
@@ -16725,6 +16727,8 @@ lower_bound_default (void)
     case DW_LANG_Fortran77:
     case DW_LANG_Fortran90:
     case DW_LANG_Fortran95:
+    case DW_LANG_Fortran03:
+    case DW_LANG_Fortran08:
       return 1;
     case DW_LANG_UPC:
     case DW_LANG_D:
@@ -19786,8 +19790,17 @@ gen_compile_unit_die (const char *filename)
     {
       if (strcmp (language_string, "GNU Ada") == 0)
        language = DW_LANG_Ada95;
-      else if (strcmp (language_string, "GNU Fortran") == 0)
-       language = DW_LANG_Fortran95;
+      else if (strncmp (language_string, "GNU Fortran", 11) == 0)
+       {
+         language = DW_LANG_Fortran95;
+         if (dwarf_version >= 5 /* || !dwarf_strict */)
+           {
+             if (strcmp (language_string, "GNU Fortran2003") == 0)
+               language = DW_LANG_Fortran03;
+             else if (strcmp (language_string, "GNU Fortran2008") == 0)
+               language = DW_LANG_Fortran08;
+           }
+       }
       else if (strcmp (language_string, "GNU Java") == 0)
        language = DW_LANG_Java;
       else if (strcmp (language_string, "GNU Objective-C") == 0)
@@ -19801,7 +19814,7 @@ gen_compile_unit_die (const char *filename)
        }
     }
   /* Use a degraded Fortran setting in strict DWARF2 so is_fortran works.  */
-  else if (strcmp (language_string, "GNU Fortran") == 0)
+  else if (strncmp (language_string, "GNU Fortran", 11) == 0)
     language = DW_LANG_Fortran90;
 
   add_AT_unsigned (die, DW_AT_language, language);
@@ -19811,6 +19824,8 @@ gen_compile_unit_die (const char *filename)
     case DW_LANG_Fortran77:
     case DW_LANG_Fortran90:
     case DW_LANG_Fortran95:
+    case DW_LANG_Fortran03:
+    case DW_LANG_Fortran08:
       /* Fortran has case insensitive identifiers and the front-end
         lowercases everything.  */
       add_AT_unsigned (die, DW_AT_identifier_case, DW_ID_down_case);

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 8b4e6877c023c5489ff598a7147458b68c83e792..35504e3dd0ba8706b0a402ed3be565015d5bc5cd 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-04  Jakub Jelinek  <jakub@redhat.com>
+
+       * options.c: Include langhooks.h.
+       (gfc_post_options): Change lang_hooks.name based on
+       selected -std= mode.
+
 2015-02-03  Steven G. Kargl  <kargl@gcc.gnu.org>
 
        * intrinsic.texi (CO_ASSOCIATED): c_prt_1 should be c_ptr_1.

diff --git a/gcc/fortran/options.c b/gcc/fortran/options.c
index 60473dd2376110d077422eaffec68b1baff8eea3..1262ccc19aa019cde26ee4912dd0b1e719e830d0 100644 (file)
--- a/gcc/fortran/options.c
+++ b/gcc/fortran/options.c
@@ -43,6 +43,7 @@ along with GCC; see the file COPYING3.  If not see
 #include "cpp.h"
 #include "diagnostic.h"        /* For global_dc.  */
 #include "tm.h"
+#include "langhooks.h"
 
 gfc_option_t gfc_option;
 
@@ -398,6 +399,11 @@ gfc_post_options (const char **pfilename)
 
   gfc_cpp_post_options ();
 
+  if (gfc_option.allow_std & GFC_STD_F2008)
+    lang_hooks.name = "GNU Fortran2008";
+  else if (gfc_option.allow_std & GFC_STD_F2003)
+    lang_hooks.name = "GNU Fortran2003";
+
   return gfc_cpp_preprocess_only ();
 }
 

diff --git a/gcc/langhooks.c b/gcc/langhooks.c
index f68c81cf8c8672ab2b56bd47034ae71e101b01f7..74f83519c543da299330a4d276010f63c749dd1f 100644 (file)
--- a/gcc/langhooks.c
+++ b/gcc/langhooks.c
@@ -731,3 +731,11 @@ lang_GNU_CXX (void)
 {
   return strncmp (lang_hooks.name, "GNU C++", 7) == 0;
 }
+
+/* Returns true if the current lang_hooks represents the GNU Fortran frontend.  */
+
+bool
+lang_GNU_Fortran (void)
+{
+  return strncmp (lang_hooks.name, "GNU Fortran", 11) == 0;
+}

diff --git a/gcc/langhooks.h b/gcc/langhooks.h
index 17c903f88c65ae3807d738e6190202522cedb962..4039e8f737edf3d679411f2105d8fb6c3318d94d 100644 (file)
--- a/gcc/langhooks.h
+++ b/gcc/langhooks.h
@@ -509,5 +509,6 @@ extern tree add_builtin_type (const char *name, tree type);
 
 extern bool lang_GNU_C (void);
 extern bool lang_GNU_CXX (void);
+extern bool lang_GNU_Fortran (void);
  
 #endif /* GCC_LANG_HOOKS_H */

diff --git a/include/ChangeLog b/include/ChangeLog
index 0917d9443bc0fe51613aa360357d41d8535fdfe1..4f455c08f15447ba805bafd10927e7e131403727 100644 (file)
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-04  Jakub Jelinek  <jakub@redhat.com>
+
+       * dwarf2.h (enum dwarf_source_language): Add DW_LANG_Fortran03
+       and DW_LANG_Fortran08.
+
 2015-01-15  Thomas Schwinge  <thomas@codesourcery.com>
            Julian Brown  <julian@codesourcery.com>
            James Norris  <jnorris@codesourcery.com>

diff --git a/include/dwarf2.h b/include/dwarf2.h
index ca440dd42b535ad9665afdc73a57f8da7be4e690..e05955cad4695f944ff0326f753276279f9e04c8 100644 (file)
--- a/include/dwarf2.h
+++ b/include/dwarf2.h
@@ -312,6 +312,8 @@ enum dwarf_source_language
     DW_LANG_C_plus_plus_11 = 0x001a, /* dwarf5.20141029.pdf DRAFT */
     DW_LANG_C11 = 0x001d,
     DW_LANG_C_plus_plus_14 = 0x0021,
+    DW_LANG_Fortran03 = 0x0022,
+    DW_LANG_Fortran08 = 0x0023,
 
     DW_LANG_lo_user = 0x8000,  /* Implementation-defined range start.  */
     DW_LANG_hi_user = 0xffff,  /* Implementation-defined range start.  */