|
@@ -266,14 +266,17 @@ static int read_unwind_spec_eh_frame(struct dso *dso, struct machine *machine,
|
|
|
u64 *fde_count)
|
|
|
{
|
|
|
int ret = -EINVAL, fd;
|
|
|
- u64 offset;
|
|
|
+ u64 offset = dso->data.frame_offset;
|
|
|
|
|
|
- fd = dso__data_fd(dso, machine);
|
|
|
- if (fd < 0)
|
|
|
- return -EINVAL;
|
|
|
+ if (offset == 0) {
|
|
|
+ fd = dso__data_fd(dso, machine);
|
|
|
+ if (fd < 0)
|
|
|
+ return -EINVAL;
|
|
|
|
|
|
- /* Check the .eh_frame section for unwinding info */
|
|
|
- offset = elf_section_offset(fd, ".eh_frame_hdr");
|
|
|
+ /* Check the .eh_frame section for unwinding info */
|
|
|
+ offset = elf_section_offset(fd, ".eh_frame_hdr");
|
|
|
+ dso->data.frame_offset = offset;
|
|
|
+ }
|
|
|
|
|
|
if (offset)
|
|
|
ret = unwind_spec_ehframe(dso, machine, offset,
|
|
@@ -287,14 +290,20 @@ static int read_unwind_spec_eh_frame(struct dso *dso, struct machine *machine,
|
|
|
static int read_unwind_spec_debug_frame(struct dso *dso,
|
|
|
struct machine *machine, u64 *offset)
|
|
|
{
|
|
|
- int fd = dso__data_fd(dso, machine);
|
|
|
+ int fd;
|
|
|
+ u64 ofs = dso->data.frame_offset;
|
|
|
|
|
|
- if (fd < 0)
|
|
|
- return -EINVAL;
|
|
|
+ if (ofs == 0) {
|
|
|
+ fd = dso__data_fd(dso, machine);
|
|
|
+ if (fd < 0)
|
|
|
+ return -EINVAL;
|
|
|
|
|
|
- /* Check the .debug_frame section for unwinding info */
|
|
|
- *offset = elf_section_offset(fd, ".debug_frame");
|
|
|
+ /* Check the .debug_frame section for unwinding info */
|
|
|
+ ofs = elf_section_offset(fd, ".debug_frame");
|
|
|
+ dso->data.frame_offset = ofs;
|
|
|
+ }
|
|
|
|
|
|
+ *offset = ofs;
|
|
|
if (*offset)
|
|
|
return 0;
|
|
|
|