- so->addr_low = segment_bases[0];
- so->addr_high = (data->segment_bases[i - 1]
- + data->segment_sizes[i - 1]
- + orig_delta);
- gdb_assert (so->addr_low <= so->addr_high);
-
- free_symfile_segment_data (data);
+ data = get_symfile_segment_data (so->abfd);
+ if (data == NULL)
+ warning (_("\
+Could not relocate shared library \"%s\": no segments"), so->so_name);
+ else
+ {
+ ULONGEST orig_delta;
+ int i;
+
+ if (!symfile_map_offsets_to_segments (so->abfd, data, li->offsets,
+ li->segment_bases.size (),
+ li->segment_bases.data ()))
+ warning (_("\
+Could not relocate shared library \"%s\": bad offsets"), so->so_name);
+
+ /* Find the range of addresses to report for this library in
+ "info sharedlibrary". Report any consecutive segments
+ which were relocated as a single unit. */
+ gdb_assert (li->segment_bases.size () > 0);
+ orig_delta = li->segment_bases[0] - data->segment_bases[0];
+
+ for (i = 1; i < data->num_segments; i++)
+ {
+ /* If we have run out of offsets, assume all
+ remaining segments have the same offset. */
+ if (i >= li->segment_bases.size ())
+ continue;
+
+ /* If this segment does not have the same offset, do
+ not include it in the library's range. */
+ if (li->segment_bases[i] - data->segment_bases[i]
+ != orig_delta)
+ break;
+ }
+
+ so->addr_low = li->segment_bases[0];
+ so->addr_high = (data->segment_bases[i - 1]
+ + data->segment_sizes[i - 1]
+ + orig_delta);
+ gdb_assert (so->addr_low <= so->addr_high);
+
+ free_symfile_segment_data (data);
+ }