Fine tune exec-file-mismatch help and documentation.

It was deemed better to explicitly mention in help and doc that build IDs
are used for comparison, and that symbols are loaded when asking to
load the exec-file.

This is V2, fixing 2 typos and replacing 'If the user asks to load'
by 'If the user confirms loading', as suggested by Pedro.

gdb/ChangeLog
2020-07-11  Philippe Waroquiers  <philippe.waroquiers@skynet.be>

	* exec.c (_initialize_exec): Update exec-file-mismatch help.

gdb/doc/ChangeLog
2020-07-11  Philippe Waroquiers  <philippe.waroquiers@skynet.be>

	* gdb.texinfo (Attach): Update exec-file-mismatch doc.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index aafefd7a9252f3c1d14a46a04a7f2439ac3a32dc..8fb5878578f00466586b7b009f70f9178d262fc0 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2020-07-11  Philippe Waroquiers  <philippe.waroquiers@skynet.be>
+
+       * exec.c (_initialize_exec): Update exec-file-mismatch help.
+
 2020-07-10  Pedro Alves  <pedro@palves.net>
 
        * gdbthread.h (inferior_ref): Define.

diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 0538115b1bf5a9b81ddba4f0b3f987f9a0fbb3d7..3626adcd3f23a05482b924f98aad4526624dd852 100644 (file)
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,7 @@
+2020-07-11  Philippe Waroquiers  <philippe.waroquiers@skynet.be>
+
+       * gdb.texinfo (Attach): Update exec-file-mismatch doc.
+
 2020-07-08  Hannes Domani  <ssbssa@yahoo.de>
 
        * gdb.texinfo: Document Windows drive conversion of

diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 1514ff10e8d92f23548a6d9924086ca1f670ed6d..776c1ce031168bffcfb8f789226d0380fee0984b 100644 (file)
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -3016,6 +3016,8 @@ by @value{GDBN} and the executable file used to start the process.  If
 @samp{ask}, the default, display a warning and ask the user whether to
 load the process executable file; if @samp{warn}, just display a
 warning; if @samp{off}, don't attempt to detect a mismatch.
+If the user confirms loading the process executable file, then its symbols
+will be loaded as well.
 
 @cindex show exec-file-mismatch
 @item show exec-file-mismatch

diff --git a/gdb/exec.c b/gdb/exec.c
index de473fbcb2974d95fec69fccfedbede42e2bbcaa..2ff5846c0e7b43c8ffe5bb3094565732f26346d5 100644 (file)
--- a/gdb/exec.c
+++ b/gdb/exec.c
@@ -305,7 +305,7 @@ validate_exec_file (int from_tty)
        exec_file_target = TARGET_SYSROOT_PREFIX + exec_file_target;
 
       warning
-       (_("Mismatch between current exec-file %ps\n"
+       (_("Build ID mismatch between current exec-file %ps\n"
           "and automatically determined exec-file %ps\n"
           "exec-file-mismatch handling is currently \"%s\""),
         styled_string (file_name_style.style (), current_exec_file),
@@ -1269,7 +1269,11 @@ loaded by GDB and the exec-file automatically determined when attaching\n\
 to a process:\n\n\
  ask  - warn the user and ask whether to load the determined exec-file.\n\
  warn - warn the user, but do not change the exec-file.\n\
- off  - do not check for mismatch."),
+ off  - do not check for mismatch.\n\
+\n\
+GDB detects a mismatch by comparing the build IDs of the files.\n\
+If the user confirms loading the determined exec-file, then its symbols\n\
+will be loaded as well."),
                        set_exec_file_mismatch_command,
                        show_exec_file_mismatch_command,
                        &setlist, &showlist);