diff options
author | Pedro Alves <palves@redhat.com> | 2013-09-27 15:29:06 +0000 |
---|---|---|
committer | Pedro Alves <palves@redhat.com> | 2013-09-27 15:29:06 +0000 |
commit | 3736004f01ce839ed6f27fa97bdf8d5dea3e4653 (patch) | |
tree | 6602aec4cdc10e3f9ea36fee794dc06081400973 /gdb/remote.h | |
parent | 5b5596ff6b245d165956649a81ba5e6628579c39 (diff) | |
download | gdb-3736004f01ce839ed6f27fa97bdf8d5dea3e4653.zip gdb-3736004f01ce839ed6f27fa97bdf8d5dea3e4653.tar.gz gdb-3736004f01ce839ed6f27fa97bdf8d5dea3e4653.tar.bz2 |
Fix regular /path/to/directory sysroots and target reported dll paths with drive specs.
I tried debugging a remote Windows program on Linux host, and pointed the
sysroot to "/some/path/" rather than "remote:", and I found GDB couldn't
find the dlls in the sysroot. If the dll name is
"C:/Windows/system32/ntdll.dll", I end up with the sysroot+in_pathname
concatenated this way:
(top-gdb) p temp_pathname
$1 = 0x228b690 "/some/pathC:/Windows/system32/ntdll.dll"
^^
That is, a directory separator is missing. This is a regression.
The problem is that solib_find decides that since the target path has
a drive spec, a separator is not necessary, which is clearly wrong in
this case. That check was added in
<https://sourceware.org/ml/gdb-patches/2013-06/msg00028.html>, to
handle the case of sysroot being "remote:". This patch fixes that
original issue in a different way. Instead of checking whether the
path has a drive spec, check whether the sysroot is "remote:". The
patch adds a table that helps visualize the cases that need a
separator. I also confirmed the original issue is still handled as
expected. That is, that "set sysroot remote:" still does the right
thing.
remote_filename_p returns true if the filename is prefixed with
"remote:". In this case, we need to check whether the filename is
exactly "remote:". I thought of different ways or either changing
remote_filename_p or adding another convenience function to remote.c
to avoid exposing the "remote:" prefix out of remote.c. But all
attempts turned out adding lot of over needless complication. So the
patch just exposes the prefix behind a new macro, which allows using a
straighforward strcmp.
gdb/
2013-09-27 Pedro Alves <palves@redhat.com>
* remote.h (REMOTE_SYSROOT_PREFIX): New define.
(remote_filename_p): Add comment.
* remote.c (remote_filename_p): Adjust to use
REMOTE_SYSROOT_PREFIX.
* solib.c (solib_find): When deciding whether we need to add a
directory separator, check whether the sysroot is "remote:"
instead of checking whether the patch has a drive spec. Add
comments.
Diffstat (limited to 'gdb/remote.h')
-rw-r--r-- | gdb/remote.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/gdb/remote.h b/gdb/remote.h index c036db7..b6ea547 100644 --- a/gdb/remote.h +++ b/gdb/remote.h @@ -57,6 +57,13 @@ void remote_file_delete (const char *remote_file, int from_tty); bfd *remote_bfd_open (const char *remote_file, const char *target); +/* If a path starts with this sequence, GDB will retrieve the target + libraries from the remote system. */ + +#define REMOTE_SYSROOT_PREFIX "remote:" + +/* True if FILENAME starts with REMOTE_SYSROOT_PREFIX. */ + int remote_filename_p (const char *filename); extern int remote_register_number_and_offset (struct gdbarch *gdbarch, |