2013-02-01 Jan Kratochvil <jan.kratochvil@redhat.com>

	    Tom Tromey  <tromey@redhat.com>

	* gdb.dwarf2/method-ptr.exp: Link with c++.
	* lib/dwarf.exp (Dwarf::assemble): Declare _cu_count.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 99236cb..2711bb7 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2013-02-01  Jan Kratochvil  <jan.kratochvil@redhat.com>
+           Tom Tromey  <tromey@redhat.com>
+
+       * gdb.dwarf2/method-ptr.exp: Link with c++.
+       * lib/dwarf.exp (Dwarf::assemble): Declare _cu_count.
+
 2013-01-31  Tom Tromey  <tromey@redhat.com>
 
        * gdb.base/jit.exp (compile_jit_test): New proc.

diff --git a/gdb/testsuite/gdb.dwarf2/method-ptr.exp b/gdb/testsuite/gdb.dwarf2/method-ptr.exp
index fcd1d69..5b930c6 100644 (file)
--- a/gdb/testsuite/gdb.dwarf2/method-ptr.exp
+++ b/gdb/testsuite/gdb.dwarf2/method-ptr.exp
@@ -87,7 +87,7 @@ if  {[gdb_compile $asm_file ${binfile}2.o object {nodebug}] != ""} {
 }
 
 if  {[gdb_compile [list ${binfile}1.o ${binfile}2.o] \
-         "${binfile}" executable {}] != ""} {
+         "${binfile}" executable {c++}] != ""} {
     return -1
 }
 

diff --git a/gdb/testsuite/lib/dwarf.exp b/gdb/testsuite/lib/dwarf.exp
index 28e8e26..bb58997 100644 (file)
--- a/gdb/testsuite/lib/dwarf.exp
+++ b/gdb/testsuite/lib/dwarf.exp
@@ -732,6 +732,7 @@ namespace eval Dwarf {
        variable _defer
        variable _label_num
        variable _strings
+       variable _cu_count
 
        if {!$_initialized} {
            _read_constants