Merge GDB 7.5.1

gdb/testsuite/gdb.cp/nextoverthrow.exp

 # Copyright 2008-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/>.
 
 
-if $tracelevel then {
-    strace $tracelevel
-}
-
 if { [skip_cplus_tests] } { continue }
 
-set testfile "nextoverthrow"
-set srcfile ${testfile}.cc
-set binfile $objdir/$subdir/$testfile
+standard_testfile .cc
 
 # Create and source the file that provides information about the compiler
 # used to compile the test case.
-if [get_compiler_info ${binfile} "c++"] {
+if [get_compiler_info "c++"] {
     untested nextoverthrow.exp
     return -1
 }
 
 if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
     return -1
 }
 
 if ![runto_main] then {
     perror "couldn't run to main"
@@ skipping 11 matching lines @@
     -re "= .*_Unwind_DebugHook.*\r\n$gdb_prompt $" {
         pass "check for unwinder hook"
     }
     -re "No symbol .* in current context.\r\n$gdb_prompt $" {
         # Pass the test so we don't get bogus fails in the results.
         pass "check for unwinder hook"
         set ok 0
     }
 }
 if {!$ok} {
+    gdb_test_multiple "info probe" "check for stap probe in unwinder" {
+        -re ".*libgcc.*unwind.*\r\n$gdb_prompt $" {
+            pass "check for stap probe in unwinder"
+            set ok 1
+        }
+        -re "\r\n$gdb_prompt $" {
+        }
+    }
+}
+
+if {!$ok} {
     unsupported "nextoverthrow.exp could not find _Unwind_DebugHook"
     return -1
 }
 
 # Set a temporary breakpoint and then continue to it.
 # The breakpoint is set according to a marker in the file.
 proc tbreak_and_cont {text} {
     global testfile
 
     set line [gdb_get_line_number $text $testfile.cc]
@@ skipping 87 matching lines @@
 gdb_test "tbreak _Unwind_RaiseException"
 gdb_test "continue" "Temporary breakpoint.*" "continuing to _Unwind_RaiseException"
 gdb_test "finish" "Run till exit .*"
 gdb_test {set $retpc=$pc}
 gdb_test {break *$retpc if dummy ()}
 tbreak_and_cont "Second: resumebpt"
 gdb_test "next"
 
 tbreak_and_cont "done"
 verify_testval "post-check - advance" 10