diff options
| -rw-r--r-- | gdb/ChangeLog | 11 | ||||
| -rw-r--r-- | gdb/remote.c | 4 | ||||
| -rw-r--r-- | gdb/remote.h | 7 | ||||
| -rw-r--r-- | gdb/solib.c | 21 |
4 files changed, 40 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 555dc3f..b777d5f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,16 @@ 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. + +2013-09-27 Pedro Alves <palves@redhat.com> + * remote.c (struct stop_reply) <solibs_changed, replay_event>: Delete fields. (remote_parse_stop_reply): Adjust, setting event->ws.kind diff --git a/gdb/remote.c b/gdb/remote.c index 0fa1e2b..a9ef297 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -10036,7 +10036,9 @@ remote_bfd_iovec_stat (struct bfd *abfd, void *stream, struct stat *sb) int remote_filename_p (const char *filename) { - return strncmp (filename, "remote:", 7) == 0; + return strncmp (filename, + REMOTE_SYSROOT_PREFIX, + sizeof (REMOTE_SYSROOT_PREFIX) - 1) == 0; } bfd * 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, diff --git a/gdb/solib.c b/gdb/solib.c index 2b3d456..8ed492a 100644 --- a/gdb/solib.c +++ b/gdb/solib.c @@ -230,8 +230,25 @@ solib_find (char *in_pathname, int *fd) { int need_dir_separator; - need_dir_separator = (!IS_DIR_SEPARATOR (in_pathname[0]) - && !HAS_TARGET_DRIVE_SPEC (fskind, in_pathname)); + /* Concatenate the sysroot and the target reported filename. We + may need to glue them with a directory separator. Cases to + consider: + + | sysroot | separator | in_pathname | + |-----------------+-----------+----------------| + | /some/dir | / | c:/foo/bar.dll | + | /some/dir | | /foo/bar.dll | + | remote: | | c:/foo/bar.dll | + | remote: | | /foo/bar.dll | + | remote:some/dir | / | c:/foo/bar.dll | + | remote:some/dir | | /foo/bar.dll | + + IOW, we don't need to add a separator if IN_PATHNAME already + has one, or when the the sysroot is exactly "remote:". + There's no need to check for drive spec explicitly, as we only + get here if IN_PATHNAME is considered an absolute path. */ + need_dir_separator = !(IS_DIR_SEPARATOR (in_pathname[0]) + || strcmp (REMOTE_SYSROOT_PREFIX, sysroot) == 0); /* Cat the prefixed pathname together. */ temp_pathname = concat (sysroot, |