Merge GDB 7.5.1

gdb/testsuite/gdb.cp/dispcxx.exp

-# Copyright 2008, 2011-2012 Free Software Foundation, Inc.
+# Copyright 2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-set testfile pr12028
-set srcfile ${testfile}.cc
-if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} {debug c++}] } {
+if { [skip_cplus_tests] } { continue }
+
+standard_testfile .cc
+
+if [get_compiler_info "c++"] {
+    untested dispcxx.exp
     return -1
 }
 
-############################################
+if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
+    return -1
+}
 
 if ![runto_main] then {
-    perror "couldn't run to breakpoint main"
+    perror "couldn't run to main"
     continue
-}
+} 
 
-gdb_test "p D::foo(b)" "Cannot resolve function foo to any overloaded instance"
+gdb_breakpoint [gdb_get_line_number "Break here"]
+gdb_continue_to_breakpoint here
+
+# Regression test for
+# http://sourceware.org/bugzilla/show_bug.cgi?id=9307.
+gdb_test "display k" "1: k = 23"