From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1726) id 016E33858408; Mon, 25 Mar 2024 17:41:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 016E33858408 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1711388474; bh=YBpsNjWdgC+UcZs4iC2WNewLUIeUwtIbs7bpeDHV9+g=; h=From:To:Subject:Date:From; b=Y8FHD+jEx9yrd2lP3P9vn69EAeLFT7JjsmyHcPwC2qTrCtZcwUN0UT/6vK7V38QVt l+uw23teXuZRCW1rtwg6eKjhEEbSG2pcoE7gCEBrBDCAzBIVDKlts3Xn1pTvZf2SSZ yltlQtMXSpf2RFpxah9fA0eDoFuatfHhPmJTQ8F8= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Andrew Burgess To: gdb-cvs@sourceware.org Subject: [binutils-gdb] gdb: rename unwindonsignal to unwind-on-signal X-Act-Checkin: binutils-gdb X-Git-Author: Andrew Burgess X-Git-Refname: refs/heads/master X-Git-Oldrev: fe67b24240d7a679904c5bef3a7e911a09ea7739 X-Git-Newrev: 7879fba359f185d674d4e981af4f23a066bfe644 Message-Id: <20240325174114.016E33858408@sourceware.org> Date: Mon, 25 Mar 2024 17:41:13 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D7879fba359f1= 85d674d4e981af4f23a066bfe644 commit 7879fba359f185d674d4e981af4f23a066bfe644 Author: Andrew Burgess Date: Wed Jan 18 12:09:05 2023 +0000 gdb: rename unwindonsignal to unwind-on-signal =20 We now have unwind-on-timeout and unwind-on-terminating-exception, and then the odd one out unwindonsignal. =20 I'm not a great fan of these squashed together command names, so in this commit I propose renaming this to unwind-on-signal. =20 Obviously I've added the hidden alias unwindonsignal so any existing GDB scripts will keep working. =20 There's one test that I've extended to test the alias works, but in most of the other test scripts I've changed over to use the new name. =20 The docs are updated to reference the new name. =20 Reviewed-By: Eli Zaretskii Tested-By: Luis Machado Tested-By: Keith Seitz Diff: --- gdb/NEWS | 9 ++++++ gdb/doc/gdb.texinfo | 16 +++++++--- gdb/infcall.c | 21 ++++++++----- gdb/testsuite/gdb.base/callfuncs.exp | 4 +-- gdb/testsuite/gdb.base/infcall-failure.exp | 4 +-- gdb/testsuite/gdb.base/unwindonsignal.exp | 36 ++++++++++++++++--= ---- gdb/testsuite/gdb.compile/compile-cplus.exp | 6 ++-- gdb/testsuite/gdb.compile/compile.exp | 6 ++-- gdb/testsuite/gdb.cp/gdb2495.exp | 16 +++++----- gdb/testsuite/gdb.fortran/function-calls.exp | 2 +- gdb/testsuite/gdb.mi/mi-condbreak-fail.exp | 6 ++-- gdb/testsuite/gdb.mi/mi-condbreak-throw.exp | 2 +- gdb/testsuite/gdb.mi/mi-syn-frame.exp | 2 +- .../gdb.threads/infcall-from-bp-cond-simple.exp | 2 +- .../gdb.threads/thread-unwindonsignal.exp | 8 ++--- 15 files changed, 89 insertions(+), 51 deletions(-) diff --git a/gdb/NEWS b/gdb/NEWS index 72ec9798479..feb3a37393a 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -32,6 +32,10 @@ maintenance info line-table if the line is considered the start of the epilgoue, and thus a point at which the frame can be considered destroyed. =20 +set unwindonsignal on|off +show unwindonsignal + These commands are now aliases for the new set/show unwind-on-signal. + * New commands =20 info missing-debug-handler @@ -81,6 +85,11 @@ show unwind-on-timeout dummy frame that was added for the inferior call, and restoring the inferior state to how it was before the inferior call started. =20 +set unwind-on-signal on|off +show unwind-on-signal + These new commands replaces the existing set/show unwindonsignal. The + old command is maintained as an alias. + * New features in the GDB remote stub, GDBserver =20 ** The --remote-debug and --event-loop-debug command line options diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index f87c2c7f391..727f9275bfb 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -20903,7 +20903,7 @@ value history. It is possible for the function you call via the @code{print} or @code{call} command to generate a signal (e.g., if there's a bug in the function, or if you passed it incorrect arguments). What happens -in that case is controlled by the @code{set unwindonsignal} command. +in that case is controlled by the @code{set unwind-on-signal} command. =20 Similarly, with a C@t{++} program it is possible for the function you call via the @code{print} or @code{call} command to generate an @@ -20917,7 +20917,8 @@ in that case is controlled by the =20 @anchor{stack unwind settings} @table @code -@item set unwindonsignal +@item set unwind-on-signal +@kindex set unwind-on-signal @kindex set unwindonsignal @cindex unwind stack in called functions @cindex call dummy stack unwinding @@ -20928,11 +20929,18 @@ the context to what it was before the call. If s= et to off (the default), @value{GDBN} stops in the frame where the signal was received. =20 -@item show unwindonsignal +The command @code{set unwindonsignal} is an alias for this command, +and is maintained for backward compatibility. + +@item show unwind-on-signal +@kindex show unwind-on-signal @kindex show unwindonsignal Show the current setting of stack unwinding in the functions called by @value{GDBN}. =20 +The command @code{show unwindonsignal} is an alias for this command, +and is maintained for backward compatibility. + @item set unwind-on-terminating-exception @kindex set unwind-on-terminating-exception @cindex unwind stack in called functions with unhandled exceptions @@ -20997,7 +21005,7 @@ call by typing the interrupt character (often @kbd{= Ctrl-c}). If a called function is interrupted for any reason, including hitting a breakpoint, or triggering a watchpoint, and the stack is not unwound due to @code{set unwind-on-terminating-exception on}, @code{set -unwind-on-timeout on}, or @code{set unwindonsignal on} (@pxref{stack +unwind-on-timeout on}, or @code{set unwind-on-signal on} (@pxref{stack unwind settings}), then the dummy-frame, created by @value{GDBN} to facilitate the call to the program function, will be visible in the backtrace, for example frame @code{#3} in the following backtrace: diff --git a/gdb/infcall.c b/gdb/infcall.c index bbe906420d1..c9267e7a129 100644 --- a/gdb/infcall.c +++ b/gdb/infcall.c @@ -1752,7 +1752,7 @@ When the function is done executing, GDB will silentl= y stop."), The program being debugged received signal %s, %s\n\ while in a function called from GDB. GDB has restored the context\n\ to what it was before the call. To change this behavior use\n\ -\"set unwindonsignal off\". Evaluation of the expression containing\n\ +\"set unwind-on-signal off\". Evaluation of the expression containing\n\ the function (%s) will be abandoned."), gdb_signal_to_name (stop_signal), gdb_signal_to_string (stop_signal), @@ -1771,7 +1771,7 @@ the function (%s) will be abandoned."), error (_("\ The program being debugged was signaled while in a function called from GD= B.\n\ GDB remains in the frame where the signal was received.\n\ -To change this behavior use \"set unwindonsignal on\".\n\ +To change this behavior use \"set unwind-on-signal on\".\n\ Evaluation of the expression containing the function\n\ (%s) will be abandoned.\n\ When the function is done executing, GDB will silently stop."), @@ -1903,17 +1903,22 @@ The default is to perform the conversion."), show_coerce_float_to_double_p, &setlist, &showlist); =20 - add_setshow_boolean_cmd ("unwindonsignal", no_class, - &unwind_on_signal_p, _("\ + set_show_commands setshow_unwind_on_signal_cmds + =3D add_setshow_boolean_cmd ("unwind-on-signal", no_class, + &unwind_on_signal_p, _("\ Set unwinding of stack if a signal is received while in a call dummy."), _= ("\ Show unwinding of stack if a signal is received while in a call dummy."), = _("\ -The unwindonsignal lets the user determine what gdb should do if a signal\= n\ +The unwind-on-signal lets the user determine what gdb should do if a signa= l\n\ is received while in a function called from gdb (call dummy). If set, gdb= \n\ unwinds the stack and restore the context to what as it was before the cal= l.\n\ The default is to stop in the frame where the signal was received."), - NULL, - show_unwind_on_signal_p, - &setlist, &showlist); + NULL, + show_unwind_on_signal_p, + &setlist, &showlist); + add_alias_cmd ("unwindonsignal", setshow_unwind_on_signal_cmds.set, + no_class, 1, &setlist); + add_alias_cmd ("unwindonsignal", setshow_unwind_on_signal_cmds.show, + no_class, 1, &showlist); =20 add_setshow_boolean_cmd ("unwind-on-terminating-exception", no_class, &unwind_on_terminating_exception_p, _("\ diff --git a/gdb/testsuite/gdb.base/callfuncs.exp b/gdb/testsuite/gdb.base/= callfuncs.exp index 603bbfe0aa8..494b6dfa96f 100644 --- a/gdb/testsuite/gdb.base/callfuncs.exp +++ b/gdb/testsuite/gdb.base/callfuncs.exp @@ -46,7 +46,7 @@ proc do_function_calls {prototypes} { =20 # If any of these calls segv we don't want to affect subsequent tests. # E.g., we want to ensure register values are restored. - gdb_test_no_output "set unwindonsignal on" + gdb_test_no_output "set unwind-on-signal on" =20 gdb_test "p t_char_values(0,0)" " =3D 0" gdb_test "p t_char_values('a','b')" " =3D 1" @@ -237,7 +237,7 @@ proc do_function_calls {prototypes} { "call inferior func with struct - returns char *" =20 # Restore default value. - gdb_test_no_output "set unwindonsignal off" + gdb_test_no_output "set unwind-on-signal off" } =20 # Procedure to get current content of all registers. diff --git a/gdb/testsuite/gdb.base/infcall-failure.exp b/gdb/testsuite/gdb= .base/infcall-failure.exp index 89ddfb81546..8d08555682a 100644 --- a/gdb/testsuite/gdb.base/infcall-failure.exp +++ b/gdb/testsuite/gdb.base/infcall-failure.exp @@ -137,7 +137,7 @@ proc_with_prefix run_cond_hits_segfault_test { async_p = non_stop_p } { "Error in testing condition for breakpoint ${bp_1_num}:" \ "The program being debugged was signaled while in a function called = from GDB\\." \ "GDB remains in the frame where the signal was received\\." \ - "To change this behavior use \"set unwindonsignal on\"\\." \ + "To change this behavior use \"set unwind-on-signal on\"\\." \ "Evaluation of the expression containing the function" \ "\\(func_segfault\\) will be abandoned\\." \ "When the function is done executing, GDB will silently stop\\."] @@ -166,7 +166,7 @@ proc_with_prefix run_call_hits_segfault_test { async_p = non_stop_p } { "${::decimal}\\s+\[^\r\n\]+Segfault here\[^\r\n\]+" \ "The program being debugged was signaled while in a function called = from GDB\\." \ "GDB remains in the frame where the signal was received\\." \ - "To change this behavior use \"set unwindonsignal on\"\\." \ + "To change this behavior use \"set unwind-on-signal on\"\\." \ "Evaluation of the expression containing the function" \ "\\(func_segfault\\) will be abandoned\\." \ "When the function is done executing, GDB will silently stop\\."] diff --git a/gdb/testsuite/gdb.base/unwindonsignal.exp b/gdb/testsuite/gdb.= base/unwindonsignal.exp index 7e8de6bee77..31793556c2c 100644 --- a/gdb/testsuite/gdb.base/unwindonsignal.exp +++ b/gdb/testsuite/gdb.base/unwindonsignal.exp @@ -34,13 +34,29 @@ gdb_test "break stop_here" "Breakpoint \[0-9\]* at .*" gdb_test "continue" "Continuing.*Breakpoint \[0-9\]*, stop_here.*" \ "continue to breakpoint at stop_here" =20 -# Turn on unwindonsignal. -gdb_test_no_output "set unwindonsignal on" \ - "setting unwindonsignal" +# Turn on unwind-on-signal. +gdb_test_no_output "set unwind-on-signal on" \ + "setting unwind-on-signal" =20 -gdb_test "show unwindonsignal" \ +gdb_test "show unwind-on-signal" \ "Unwinding of stack .* is on." \ - "showing unwindonsignal" + "showing unwind-on-signal" + +# For backward compatibility we maintain a 'unwindonsignal' alias for +# 'unwind-on-signal', check it now. +gdb_test "show unwindonsignal" \ + "Unwinding of stack .* is on\\." \ + "showing unwindonsignal alias" + +gdb_test_no_output "set unwindonsignal off" \ + "setting unwindonsignal alias to off" + +gdb_test "show unwind-on-signal" \ + "Unwinding of stack .* is off\\." \ + "showing unwind-on-signal after setting via alias" + +gdb_test_no_output "set unwindonsignal on" \ + "setting unwindonsignal alias to on" =20 # Call function (causing the program to get a signal), and see if gdb hand= les # it properly. @@ -49,7 +65,7 @@ if {[gdb_test "call gen_signal ()" \ "The program being debugged received signal SIGABRT, Aborted" \ "while in a function called from GDB\\. GDB has restored the conte= xt" \ "to what it was before the call\\. To change this behavior use" \ - "\"set unwindonsignal off\"\\. Evaluation of the expression contai= ning" \ + "\"set unwind-on-signal off\"\\. Evaluation of the expression cont= aining" \ "the function \\(gen_signal\\) will be abandoned\\."] \ "unwindonsignal, inferior function call signaled"] !=3D 0} { return 0 @@ -58,15 +74,15 @@ if {[gdb_test "call gen_signal ()" \ # Verify the stack got unwound. gdb_test "bt" \ "#0 *\[x0-9a-f in\]*stop_here \\(.*\\) at .*#1 *\[x0-9a-f in\]*main \\= (.*\\) at .*" \ - "unwindonsignal, stack unwound" + "stack unwound" =20 # Verify the dummy frame got removed from dummy_frame_stack. gdb_test_multiple "maint print dummy-frames" \ - "unwindonsignal, dummy frame removed" { + "unwind-on-signal, dummy frame removed" { -re "\[\r\n\]*.*stack=3D.*code=3D.*\[\r\n\]+$gdb_prompt $" { - fail "unwindonsignal, dummy frame removed" + fail $gdb_test_name } -re "\[\r\n\]+$gdb_prompt $" { - pass "unwindonsignal, dummy frame removed" + pass $gdb_test_name } } diff --git a/gdb/testsuite/gdb.compile/compile-cplus.exp b/gdb/testsuite/gd= b.compile/compile-cplus.exp index 40191a08b1a..711f299574d 100644 --- a/gdb/testsuite/gdb.compile/compile-cplus.exp +++ b/gdb/testsuite/gdb.compile/compile-cplus.exp @@ -131,13 +131,13 @@ gdb_test "return" "\r\n#0 main .*" "return" \ "Make _gdb_expr\\(__gdb_regs\\*\\) return now\\? \\(y or n\\) " "y" gdb_test "info sym $infcall_pc" "\r\nNo symbol matches .*" "info sym not f= ound" =20 -gdb_test_no_output "set unwindonsignal on" +gdb_test_no_output "set unwind-on-signal on" gdb_test "compile code *(volatile int *) 0 =3D 0;" \ [multi_line \ "The program being debugged received signal SIGSEGV, Segmentation fault"= \ "while in a function called from GDB\\. GDB has restored the context" \ "to what it was before the call\\. To change this behavior use" \ - "\"set unwindonsignal off\"\\. Evaluation of the expression containing"= \ + "\"set unwind-on-signal off\"\\. Evaluation of the expression containin= g" \ "the function \\(_gdb_expr\\(__gdb_regs\\*\\)\\) will be abandoned\\."] \ "compile code segfault second" =20 @@ -313,7 +313,7 @@ gdb_test "compile code static const int readonly =3D 1;= *(int *) &readonly =3D 2;" \ "The program being debugged received signal SIGSEGV, Segmentation fault"= \ "while in a function called from GDB\\. GDB has restored the context" \ "to what it was before the call\\. To change this behavior use" \ - "\"set unwindonsignal off\"\\. Evaluation of the expression containing"= \ + "\"set unwind-on-signal off\"\\. Evaluation of the expression containin= g" \ "the function \\(_gdb_expr\\(__gdb_regs\\*\\)\\) will be abandoned\\."] gdb_test_no_output "set debug compile off" =20 diff --git a/gdb/testsuite/gdb.compile/compile.exp b/gdb/testsuite/gdb.comp= ile/compile.exp index f522a84d5dd..cd596335859 100644 --- a/gdb/testsuite/gdb.compile/compile.exp +++ b/gdb/testsuite/gdb.compile/compile.exp @@ -157,13 +157,13 @@ gdb_test "return" "\r\n#0 main .*" "return" \ "Make _gdb_expr return now\\? \\(y or n\\) " "y" gdb_test "info sym $infcall_pc" "\r\nNo symbol matches .*" "info sym not f= ound" =20 -gdb_test_no_output "set unwindonsignal on" +gdb_test_no_output "set unwind-on-signal on" gdb_test "compile code *(volatile int *) 0 =3D 0;" \ [multi_line \ "The program being debugged received signal SIGSEGV, Segmentation fault"= \ "while in a function called from GDB\\. GDB has restored the context" \ "to what it was before the call\\. To change this behavior use" \ - "\"set unwindonsignal off\"\\. Evaluation of the expression containing"= \ + "\"set unwind-on-signal off\"\\. Evaluation of the expression containin= g" \ "the function \\(_gdb_expr\\) will be abandoned\\."] \ "compile code segfault second" =20 @@ -321,7 +321,7 @@ gdb_test "compile code static const int readonly =3D 1;= *(int *) &readonly =3D 2;" \ "The program being debugged received signal SIGSEGV, Segmentation fault"= \ "while in a function called from GDB\\. GDB has restored the context" \ "to what it was before the call\\. To change this behavior use" \ - "\"set unwindonsignal off\"\\. Evaluation of the expression containing"= \ + "\"set unwind-on-signal off\"\\. Evaluation of the expression containin= g" \ "the function \\(_gdb_expr\\) will be abandoned\\."] gdb_test_no_output "set debug compile off" =20 diff --git a/gdb/testsuite/gdb.cp/gdb2495.exp b/gdb/testsuite/gdb.cp/gdb249= 5.exp index 1b3168ee963..7fbadb2c4f1 100644 --- a/gdb/testsuite/gdb.cp/gdb2495.exp +++ b/gdb/testsuite/gdb.cp/gdb2495.exp @@ -98,10 +98,10 @@ if {![runto_main]} { # behaviour; it should not. Test both on and off states. =20 # Turn on unwind on signal behaviour. -gdb_test_no_output "set unwindonsignal on" +gdb_test_no_output "set unwind-on-signal on" =20 # Check that it is turned on. -gdb_test "show unwindonsignal" \ +gdb_test "show unwind-on-signal" \ "signal is received while in a call dummy is on.*" \ "turn on unwind on signal" =20 @@ -112,20 +112,20 @@ gdb_test "p exceptions.raise_signal(1)" \ "The program being debugged received signal SIGABRT, Aborted" \ "while in a function called from GDB\\. GDB has restored the context" \ "to what it was before the call\\. To change this behavior use" \ - "\"set unwindonsignal off\"\\. Evaluation of the expression containing"= \ + "\"set unwind-on-signal off\"\\. Evaluation of the expression containin= g" \ "the function \\(SimpleException::raise_signal\\(int\\)\\) will be aband= oned\\."]\ - "check for unwindonsignal off message" + "check for unwind-on-signal off message" =20 # And reverse - turn off again. -gdb_test_no_output "set unwindonsignal off" +gdb_test_no_output "set unwind-on-signal off" =20 # Check that it is actually turned off. -gdb_test "show unwindonsignal" \ +gdb_test "show unwind-on-signal" \ "signal is received while in a call dummy is off.*" \ "turn off unwind on signal" =20 # Check to see if new behaviour interferes with # normal signal handling in inferior function calls. gdb_test "p exceptions.raise_signal(1)" \ - "To change this behavior use \"set unwindonsignal on\".*" \ - "check for unwindonsignal on message" + "To change this behavior use \"set unwind-on-signal on\".*" \ + "check for unwind-on-signal on message" diff --git a/gdb/testsuite/gdb.fortran/function-calls.exp b/gdb/testsuite/g= db.fortran/function-calls.exp index 3e698a55e9e..e0b35d697ad 100644 --- a/gdb/testsuite/gdb.fortran/function-calls.exp +++ b/gdb/testsuite/gdb.fortran/function-calls.exp @@ -44,7 +44,7 @@ if {![runto [gdb_get_line_number "post_init"]]} { } =20 # Use inspired by gdb.base/callfuncs.exp. -gdb_test_no_output "set unwindonsignal on" +gdb_test_no_output "set unwind-on-signal on" =20 # Baseline: function and subroutine call with no arguments. gdb_test "p no_arg()" " =3D .TRUE." diff --git a/gdb/testsuite/gdb.mi/mi-condbreak-fail.exp b/gdb/testsuite/gdb= .mi/mi-condbreak-fail.exp index f84f874593d..fdcfa9bb40c 100644 --- a/gdb/testsuite/gdb.mi/mi-condbreak-fail.exp +++ b/gdb/testsuite/gdb.mi/mi-condbreak-fail.exp @@ -43,7 +43,7 @@ proc run_test { unwind_on_signal } { return } =20 - mi_gdb_test "-gdb-set unwindonsignal ${unwind_on_signal}" {\^done} \ + mi_gdb_test "-gdb-set unwind-on-signal ${unwind_on_signal}" {\^done} \ "set unwind-on-signal" =20 # Create the conditional breakpoint. @@ -70,7 +70,7 @@ proc run_test { unwind_on_signal } { "&\"The program being debugged received signal SIGSEGV, Segmentation fa= ult\\\\n\"" \ "&\"while in a function called from GDB\\. GDB has restored the contex= t\\\\n\"" \ "&\"to what it was before the call\\. To change this behavior use\\\\n= \"" \ - "&\"\\\\\"set unwindonsignal off\\\\\"\\. Evaluation of the expression= containing\\\\n\"" \ + "&\"\\\\\"set unwind-on-signal off\\\\\"\\. Evaluation of the expressi= on containing\\\\n\"" \ "&\"the function \\(cond_fail\\) will be abandoned\\.\\\\n\"" \ "=3Dbreakpoint-modified,bkpt=3D{number=3D\"$bpnum\",type=3D\"breakpoint= \",\[^\r\n\]+times=3D\"1\",\[^\r\n\]+}" \ "~\"\\\\n\"" \ @@ -92,7 +92,7 @@ proc run_test { unwind_on_signal } { "&\"Error in testing condition for breakpoint $bpnum:\\\\n\"" \ "&\"The program being debugged was signaled while in a function called = from GDB\\.\\\\n\"" \ "&\"GDB remains in the frame where the signal was received\\.\\\\n\"" \ - "&\"To change this behavior use \\\\\"set unwindonsignal on\\\\\"\\.\\\= \n\"" \ + "&\"To change this behavior use \\\\\"set unwind-on-signal on\\\\\"\\.\= \\\n\"" \ "&\"Evaluation of the expression containing the function\\\\n\"" \ "&\"\\(cond_fail\\) will be abandoned\\.\\\\n\"" \ "&\"When the function is done executing, GDB will silently stop\\.\\\\n= \"" \ diff --git a/gdb/testsuite/gdb.mi/mi-condbreak-throw.exp b/gdb/testsuite/gd= b.mi/mi-condbreak-throw.exp index 4f4e3c1f37b..e35ad8f9999 100644 --- a/gdb/testsuite/gdb.mi/mi-condbreak-throw.exp +++ b/gdb/testsuite/gdb.mi/mi-condbreak-throw.exp @@ -103,7 +103,7 @@ proc run_test { unwind_on_exception } { "&\"Error in testing condition for breakpoint $bpnum:\\\\n\"" \ "&\"The program being debugged was signaled while in a function called = from GDB\\.\\\\n\"" \ "&\"GDB remains in the frame where the signal was received\\.\\\\n\"" \ - "&\"To change this behavior use \\\\\"set unwindonsignal on\\\\\"\\.\\\= \n\"" \ + "&\"To change this behavior use \\\\\"set unwind-on-signal on\\\\\"\\.\= \\\n\"" \ "&\"Evaluation of the expression containing the function\\\\n\"" \ "&\"\\(cond_throw\\(\\)\\) will be abandoned\\.\\\\n\"" \ "&\"When the function is done executing, GDB will silently stop\\.\\\\n= \"" \ diff --git a/gdb/testsuite/gdb.mi/mi-syn-frame.exp b/gdb/testsuite/gdb.mi/m= i-syn-frame.exp index 4e4a72225a8..b059d126968 100644 --- a/gdb/testsuite/gdb.mi/mi-syn-frame.exp +++ b/gdb/testsuite/gdb.mi/mi-syn-frame.exp @@ -94,7 +94,7 @@ mi_gdb_test "409-stack-list-frames 0 0" \ #=20 =20 mi_gdb_test "410-data-evaluate-expression bar()" \ - ".*410\\^error,msg=3D\"The program being debugged was signaled while in = a function called from GDB.\\\\nGDB remains in the frame where the signal w= as received.\\\\nTo change this behavior use \\\\\"set unwindonsignal on\\\= \\".\\\\nEvaluation of the expression containing the function\\\\n\\(bar\\)= will be abandoned.\\\\nWhen the function is done executing, GDB will silen= tly stop.\"" \ + ".*410\\^error,msg=3D\"The program being debugged was signaled while in = a function called from GDB.\\\\nGDB remains in the frame where the signal w= as received.\\\\nTo change this behavior use \\\\\"set unwind-on-signal on\= \\\\".\\\\nEvaluation of the expression containing the function\\\\n\\(bar\= \) will be abandoned.\\\\nWhen the function is done executing, GDB will sil= ently stop.\"" \ "call inferior function which raises exception" =20 mi_gdb_test "411-stack-list-frames" "411\\^done,stack=3D\\\[frame=3D\{leve= l=3D\"0\",addr=3D\"$hex\",func=3D\"bar\",file=3D\".*mi-syn-frame.c\",fullna= me=3D\"${fullname_syntax}${srcfile}\",line=3D\"$decimal\",arch=3D\"$any\"},= frame=3D\{level=3D\"1\",addr=3D\"$hex\",func=3D\"= \"\},frame=3D\{level=3D\"2\",addr=3D\"$hex\",func=3D\"main\",file=3D\".*mi-= syn-frame.c\",fullname=3D\"${fullname_syntax}${srcfile}\",line=3D\"$decimal= \",arch=3D\"$any\"}.*\\\]" "backtrace from inferior function at exception" diff --git a/gdb/testsuite/gdb.threads/infcall-from-bp-cond-simple.exp b/gd= b/testsuite/gdb.threads/infcall-from-bp-cond-simple.exp index d6069ebaa58..c9508c9d67e 100644 --- a/gdb/testsuite/gdb.threads/infcall-from-bp-cond-simple.exp +++ b/gdb/testsuite/gdb.threads/infcall-from-bp-cond-simple.exp @@ -173,7 +173,7 @@ proc_with_prefix run_bp_cond_segfaults { target_async t= arget_non_stop } { "Error in testing condition for breakpoint ${bp_1_num}:" \ "The program being debugged was signaled while in a function called = from GDB\\." \ "GDB remains in the frame where the signal was received\\." \ - "To change this behavior use \"set unwindonsignal on\"\\." \ + "To change this behavior use \"set unwind-on-signal on\"\\." \ "Evaluation of the expression containing the function" \ "\\(function_that_segfaults\\) will be abandoned\\." \ "When the function is done executing, GDB will silently stop\\."] diff --git a/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp b/gdb/test= suite/gdb.threads/thread-unwindonsignal.exp index 4beefd8c9c8..11d9fb2d6d4 100644 --- a/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp +++ b/gdb/testsuite/gdb.threads/thread-unwindonsignal.exp @@ -13,7 +13,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . =20 -# Test use of unwindonsignal when a hand function call that gets interrupt= ed +# Test use of unwind-on-signal when a hand function call that gets interru= pted # by a signal in another thread. =20 set NR_THREADS 4 @@ -49,12 +49,12 @@ gdb_test "continue" \ # We want the main thread (hand_call_with_signal) and # thread 1 (sigabrt_handler) to both run. =20 -# Do turn on unwindonsignal. +# Do turn on unwind-on-signal. # We want to test gdb handling of the current thread changing when # unwindonsignal is in effect. -gdb_test_no_output "set unwindonsignal on" \ +gdb_test_no_output "set unwind-on-signal on" \ "setting unwindonsignal" -gdb_test "show unwindonsignal" \ +gdb_test "show unwind-on-signal" \ "Unwinding of stack .* is on." \ "showing unwindonsignal"