This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: set sysroot command on AIX has no effect.
Hi Ulrich,
> > This is looking mostly good. The one thing I don't like is all the
extra
> > xfree calls. I think a better way would to not actually xstrdup the
found
> > pathname early after all, but instead just get it from the BFD. So
instead
> > of the original:
> >
> > xfree (bfd_get_filename (object_bfd));
> > object_bfd->filename = xstrdup (pathname);
> >
> > you'd do something like:
> >
> > object_bfd->filename = xrealloc (object_bfd->filename, ...);
> > strcat (object_bfd->filename, sep);
>
> Sorry, I mixed up the two BFDs here, we need to get the pathname from
> the archive_bfd, of coutse. So this would be something like:
>
> xfree (bfd_get_filename (object_bfd));
> object_bfd->filename = xstrprintf ("%s%s", bfd_get_filename
> (archive_bfd), sep);
>
Thanks again. Here is the updated patch and looks much better than the
previous one.
--- ./gdb/solib-aix.c_orig 2016-10-04 03:22:01.000000000 -0500
+++ ./gdb/solib-aix.c 2016-10-13 03:09:26.000000000 -0500
@@ -648,6 +648,8 @@
char *member_name;
bfd *archive_bfd, *object_bfd;
struct cleanup *cleanup;
+ int found_file;
+ char *found_pathname;
if (pathname[path_len - 1] != ')')
return solib_bfd_open (pathname);
@@ -669,7 +671,13 @@
member_name = xstrprintf ("%.*s", path_len - filename_len - 2, sep +
1);
make_cleanup (xfree, member_name);
- archive_bfd = gdb_bfd_open (filename, gnutarget, -1);
+ /* Calling solib_find makes certain that sysroot path is set properly
+ if program has a dependency on .a archive and sysroot is set via
+ set sysroot command. */
+ found_pathname = solib_find (filename, &found_file);
+ if (found_pathname == NULL)
+ perror_with_name (pathname);
+ archive_bfd = solib_bfd_fopen (found_pathname, found_file);
if (archive_bfd == NULL)
{
warning (_("Could not open `%s' as an executable file: %s"),
@@ -724,12 +732,14 @@
return NULL;
}
- /* Override the returned bfd's name with our synthetic name in order
- to allow commands listing all shared libraries to display that
- synthetic name. Otherwise, we would only be displaying the name
- of the archive member object. */
+ /* Override the returned bfd's name with the name returned from
solib_find
+ along with appended parenthesized member name in order to allow
commands
+ listing all shared libraries to display.
+ Otherwise, we would only be displaying the name of the archive
member
+ object. */
xfree (bfd_get_filename (object_bfd));
- object_bfd->filename = xstrdup (pathname);
+ object_bfd->filename = xstrprintf ("%s%s",
+ bfd_get_filename (archive_bfd),
sep);
gdb_bfd_unref (archive_bfd);
do_cleanups (cleanup);
I ran gdb.base regression test too and no new failures are seen.
Here is the summary.
# of expected passes 9860
# of unexpected failures 1594
# of expected failures 14
# of unresolved testcases 1
# of untested testcases 60
# of unsupported tests 30