提交 06d08e1e 编写于 作者: C Changbin Du 提交者: Yang Yingliang

perf: Make perf able to build with latest libbfd

mainline inclusion
from mainline-5.6
commit 0ada120c883d4f1f6aafd01cf0fbb10d8bbba015
category: bugfix
bugzilla: 34555
CVE: NA

-------------------------------------------------

libbfd has changed the bfd_section_* macros to inline functions
bfd_section_<field> since 2019-09-18. See below two commits:
  o http://www.sourceware.org/ml/gdb-cvs/2019-09/msg00064.html
  o https://www.sourceware.org/ml/gdb-cvs/2019-09/msg00072.html

This fix make perf able to build with both old and new libbfd.
Signed-off-by: NChangbin Du <changbin.du@gmail.com>
Acked-by: NJiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lore.kernel.org/lkml/20200128152938.31413-1-changbin.du@gmail.comSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: NXie XiuQi <xiexiuqi@huawei.com>
Reviewed-by: NXiongfeng Wang <wangxiongfeng2@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 bbc435ef
...@@ -191,16 +191,30 @@ static void find_address_in_section(bfd *abfd, asection *section, void *data) ...@@ -191,16 +191,30 @@ static void find_address_in_section(bfd *abfd, asection *section, void *data)
bfd_vma pc, vma; bfd_vma pc, vma;
bfd_size_type size; bfd_size_type size;
struct a2l_data *a2l = data; struct a2l_data *a2l = data;
flagword flags;
if (a2l->found) if (a2l->found)
return; return;
if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0) #ifdef bfd_get_section_flags
flags = bfd_get_section_flags(abfd, section);
#else
flags = bfd_section_flags(section);
#endif
if ((flags & SEC_ALLOC) == 0)
return; return;
pc = a2l->addr; pc = a2l->addr;
#ifdef bfd_get_section_vma
vma = bfd_get_section_vma(abfd, section); vma = bfd_get_section_vma(abfd, section);
#else
vma = bfd_section_vma(section);
#endif
#ifdef bfd_get_section_size
size = bfd_get_section_size(section); size = bfd_get_section_size(section);
#else
size = bfd_section_size(section);
#endif
if (pc < vma || pc >= vma + size) if (pc < vma || pc >= vma + size)
return; return;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册