diff options
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/symfile.c | 2 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/persistent-lang.cc | 22 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/persistent-lang.exp | 39 |
5 files changed, 75 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index aa4b01b..fb4cc03 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2020-02-26 Tom de Vries <tdevries@suse.de> + + PR gdb/25603 + * symfile.c (set_initial_language): Exit-early if + language_mode == language_mode_manual. + 2020-02-25 Simon Marchi <simon.marchi@polymtl.ca> * dwarf2/loc.h (dwarf2_read_addr_index): Move... diff --git a/gdb/symfile.c b/gdb/symfile.c index f7bada7..f1edf2d 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -1681,6 +1681,8 @@ symbol_file_command (const char *args, int from_tty) void set_initial_language (void) { + if (language_mode == language_mode_manual) + return; enum language lang = main_language (); if (lang == language_unknown) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 720febb..a352c74 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2020-02-26 Tom de Vries <tdevries@suse.de> + + PR gdb/25603 + * gdb.base/persistent-lang.cc: New test. + * gdb.base/persistent-lang.exp: New file. + 2020-02-25 Andrew Burgess <andrew.burgess@embecosm.com> * gdb.fortran/derived-type-striding.exp: Add a new test. diff --git a/gdb/testsuite/gdb.base/persistent-lang.cc b/gdb/testsuite/gdb.base/persistent-lang.cc new file mode 100644 index 0000000..f4825c8 --- /dev/null +++ b/gdb/testsuite/gdb.base/persistent-lang.cc @@ -0,0 +1,22 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2020 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/>. */ + +int +main () +{ + return 0; +} diff --git a/gdb/testsuite/gdb.base/persistent-lang.exp b/gdb/testsuite/gdb.base/persistent-lang.exp new file mode 100644 index 0000000..bcc4ef7 --- /dev/null +++ b/gdb/testsuite/gdb.base/persistent-lang.exp @@ -0,0 +1,39 @@ +# Copyright 2020 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/>. + +standard_testfile .cc + +if {[build_executable "failed to prepare" $testfile $srcfile debug]} { + return -1 +} + +clean_restart + +set auto_c \ + "The current source language is \"auto; currently c\"\." +set manual_c \ + "The current source language is \"c\"\." + +gdb_test "show language" $auto_c \ + "initial language is auto/c" + +gdb_test_no_output "set language c" +gdb_test "show language" $manual_c \ + "language updated to manual/c after set" + +set binfile [standard_output_file ${testfile}] +gdb_load ${binfile} +gdb_test "show language" $manual_c \ + "language still manual/c after load" |