aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog4
-rw-r--r--gdb/doc/ChangeLog4
-rw-r--r--gdb/doc/gdb.texinfo2
-rw-r--r--gdb/exec.c8
4 files changed, 16 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index aafefd7..8fb5878 100644
--- 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 0538115..3626adc 100644
--- 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 1514ff1..776c1ce 100644
--- 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 de473fb..2ff5846 100644
--- 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);