gdb/

	* dwarf2read.c (die_needs_namespace) <DW_TAG_variable>: Add also
	DW_TAG_constant.

gdb/testsuite/
	* gdb.fortran/module.exp (fully qualified name of DW_TAG_constant):
	New test.
	* gdb.fortran/module.f90 (mod1) <var_const>: New constant.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0565ad462d578aa044ab3790b8f27e85a355f5f1..d19c709916c6fc69239bb53be9174b6e264f14e8 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-22  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       * dwarf2read.c (die_needs_namespace) <DW_TAG_variable>: Add also
+       DW_TAG_constant.
+
 2010-09-22  Joel Brobecker  <brobecker@adacore.com>
 
        * dwarf2read.c (scan_partial_symbols): Add handling of

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 082400e19db7bffe84eb153b3c8c1482acf6b0b8..8a87b7b02907b2c4005acd4a6399c4537306d5b6 100644 (file)
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -4614,6 +4614,7 @@ die_needs_namespace (struct die_info *die, struct dwarf2_cu *cu)
       return 1;
 
     case DW_TAG_variable:
+    case DW_TAG_constant:
       /* We only need to prefix "globally" visible variables.  These include
         any variable marked with DW_AT_external or any variable that
         lives in a namespace.  [Variables in anonymous namespaces

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 5d04cd95dc9a27d42c0d490317dd295ae9a8defd..40a89ffa7aad1f2ec42f0ecc0deba2cbaee5f473 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-22  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       * gdb.fortran/module.exp (fully qualified name of DW_TAG_constant):
+       New test.
+       * gdb.fortran/module.f90 (mod1) <var_const>: New constant.
+
 2010-09-22  Joel Brobecker  <brobecker@adacore.com>
 
        * gdb.dwarf2/dw2-const.S: Use .4byte to reference the target

diff --git a/gdb/testsuite/gdb.fortran/module.exp b/gdb/testsuite/gdb.fortran/module.exp
index fabf6604f131d2046f06a9429e1cef2a6849216a..f81d2dc057db941e8b933f0c091fb9436697fe49 100644 (file)
--- a/gdb/testsuite/gdb.fortran/module.exp
+++ b/gdb/testsuite/gdb.fortran/module.exp
@@ -26,6 +26,8 @@ if { [prepare_for_testing $testfile.exp $testfile $srcfile {debug f77}] } {
 # The current source language is "auto; currently fortran".
 gdb_test "p modmany::var_i" " = 14" "stopped language detection"
 
+gdb_test "print mod1::var_const" " = 20" "fully qualified name of DW_TAG_constant"
+
 if ![runto MAIN__] then {
     perror "couldn't run to breakpoint MAIN__"
     continue

diff --git a/gdb/testsuite/gdb.fortran/module.f90 b/gdb/testsuite/gdb.fortran/module.f90
index a8428cbc9fd492bd897c1b1e639d1bd4a0babf2a..4e014c9bd4522feb0a13e473915e6edadcfe1a98 100644 (file)
--- a/gdb/testsuite/gdb.fortran/module.f90
+++ b/gdb/testsuite/gdb.fortran/module.f90
@@ -15,6 +15,8 @@
 
 module mod1
         integer :: var_i = 1
+        integer :: var_const
+        parameter (var_const = 20)
 end module mod1
 
 module mod2