From: Stan Shebs <shebs@codesourcery.com>
Date: Wed, 28 Jan 1998 23:02:03 +0000 (+0000)
Subject: 	Suggested by Chris Walter <walter@budoe.bu.edu>:
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7074cd4e8ae04c905903546ba95f76d2e7e229b9;p=binutils-gdb.git

	Suggested by Chris Walter <walter@budoe.bu.edu>:
	* dwarfread.c (set_cu_language): Recognize Fortran.
	* dwarf2read.c (set_cu_language): Ditto.
	(read_array_type): Fix language test.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 908d2b3835b..3c65ffc8adb 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jan 28 14:46:52 1998  Stan Shebs  <shebs@andros.cygnus.com>
+
+	Suggested by Chris Walter <walter@budoe.bu.edu>:
+	* dwarfread.c (set_cu_language): Recognize Fortran.
+	* dwarf2read.c (set_cu_language): Ditto.
+	(read_array_type): Fix language test.
+
 Wed Jan 28 12:51:08 1998  Michael Snyder  (msnyder@cleaver.cygnus.com)
  
         * blockframe.c (generic_frame_chain_valid): A frame pointer may
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 418aaad6396..b01c990405d 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -2496,8 +2496,7 @@ read_array_type (die, objfile)
 	  /* Default bounds to an array with unspecified length.  */
 	  low = 0;
 	  high = -1;
-	  if (cu_language == DW_LANG_Fortran77
-	      || cu_language == DW_LANG_Fortran90)
+	  if (cu_language == language_fortran)
 	    {
 	      /* FORTRAN implies a lower bound of 1, if not given.  */
 	      low = 1;
@@ -3689,22 +3688,21 @@ set_cu_language (lang)
     {
     case DW_LANG_C89:
     case DW_LANG_C:
-    case DW_LANG_Fortran77:
       cu_language = language_c;
       break;
     case DW_LANG_C_plus_plus:
       cu_language = language_cplus;
       break;
+    case DW_LANG_Fortran77:
+    case DW_LANG_Fortran90:
+      cu_language = language_fortran;
+      break;
     case DW_LANG_Mips_Assembler:
       cu_language = language_asm;
       break;
     case DW_LANG_Ada83:
     case DW_LANG_Cobol74:
     case DW_LANG_Cobol85:
-#if 0
-    case DW_LANG_Fortran77:	/* moved up top for now */
-#endif
-    case DW_LANG_Fortran90:
     case DW_LANG_Pascal83:
     case DW_LANG_Modula2:
     default:
diff --git a/gdb/dwarfread.c b/gdb/dwarfread.c
index 07358bda790..0ef59b7dc4f 100644
--- a/gdb/dwarfread.c
+++ b/gdb/dwarfread.c
@@ -674,11 +674,13 @@ set_cu_language (dip)
       case LANG_MODULA2:
 	cu_language = language_m2;
 	break;
+      case LANG_FORTRAN77:
+      case LANG_FORTRAN90:
+	cu_language = language_fortran;
+	break;
       case LANG_ADA83:
       case LANG_COBOL74:
       case LANG_COBOL85:
-      case LANG_FORTRAN77:
-      case LANG_FORTRAN90:
       case LANG_PASCAL83:
 	/* We don't know anything special about these yet. */
 	cu_language = language_unknown;