Merge GDB 7.5.1

gdb/testsuite/gdb.linespec/ls-dollar.exp

-# Copyright (C) 2010-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 moribund-step
+# Tests for dollar signs in linespecs
 
-if { ![support_displaced_stepping] } {
-    unsupported "displaced stepping"
+standard_testfile .cc
+set exefile $testfile
+
+if {[skip_cplus_tests]} {
+    unsupported "skipping C++ tests"
+    return
+}
+
+if {[prepare_for_testing $testfile $exefile $srcfile \
+         {debug nowarnings c++}]} {
     return -1
 }
 
-if { [prepare_for_testing ${testfile}.exp ${testfile} start.c] } {
-    return -1
-}
+gdb_test_no_output "set listsize 1"
 
-gdb_test_no_output "set non-stop on"
-
-if ![runto_main] {
-    return
-}
-
-# GDB could crash on printing breakpoint hit on a moribund bp_location.
-gdb_test "step"
+gdb_test "list \$dollar_var" \
+    ".*static int [string_to_regexp {$dollar_var}] = 0;"
+gdb_test "break \$dollar_func" \
+    "Breakpoint $decimal at $hex: file .*$srcfile, line [gdb_get_line_number {dollar_func}]\\\."