From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC207C433E0 for ; Tue, 30 Jun 2020 14:46:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B922820663 for ; Tue, 30 Jun 2020 14:46:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593528371; bh=oEPMOrl5gOT0FsyHfygw3so6SkLEhFqkRhcwfdwKeS4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=nx6eCFzjz/qb0KObhcdJr8FHNp3g3hTkoICP3pA2suUjewdn1GA3aNOhdl2jdY14K QO4tEp9lr5sCvPJr0PcHLAhlbpJ94uRGF4do76H5d75L96cYheJ2TmUZhjDtOpz/A7 PNw3J98uvHPjrq+7jselOjoozP39lHsJL2DsSEtY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730766AbgF3OqL (ORCPT ); Tue, 30 Jun 2020 10:46:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:36538 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726087AbgF3OqL (ORCPT ); Tue, 30 Jun 2020 10:46:11 -0400 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1D72C2072D; Tue, 30 Jun 2020 14:46:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593528370; bh=oEPMOrl5gOT0FsyHfygw3so6SkLEhFqkRhcwfdwKeS4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pDJ6EL+kMa7Y0QxqLAzfEAzh2PriEUzbHtTLl6jh34+U3l+JC61RFLSVnid4oblLz qXD1xcNETjtD39zRTvUmAKXXAfsG5nQ4uFyI69ikB7gwJ27/uZnxdrnRgYkHyasefH RANY1JuxpHgjETWqUTDlbT20sRJkX06eHwACADss= From: Masami Hiramatsu To: stable@vger.kernel.org Cc: Changbin Du , Jiri Olsa , Arnaldo Carvalho de Melo , mhiramat@kernel.org Subject: [PATCH for 4.9 4/4] perf: Make perf able to build with latest libbfd Date: Tue, 30 Jun 2020 23:46:07 +0900 Message-Id: <159352836699.45385.3033296707456805894.stgit@devnote2> X-Mailer: git-send-email 2.25.1 In-Reply-To: <159352833055.45385.11124685086393181445.stgit@devnote2> References: <159352833055.45385.11124685086393181445.stgit@devnote2> User-Agent: StGit/0.19 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Changbin Du commit 0ada120c883d4f1f6aafd01cf0fbb10d8bbba015 upstream. libbfd has changed the bfd_section_* macros to inline functions bfd_section_ 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: Changbin Du Acked-by: Jiri Olsa Cc: Peter Zijlstra Link: http://lore.kernel.org/lkml/20200128152938.31413-1-changbin.du@gmail.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/srcline.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c index b4db3f48e3b0..2853d4728ab9 100644 --- a/tools/perf/util/srcline.c +++ b/tools/perf/util/srcline.c @@ -86,16 +86,30 @@ static void find_address_in_section(bfd *abfd, asection *section, void *data) bfd_vma pc, vma; bfd_size_type size; struct a2l_data *a2l = data; + flagword flags; if (a2l->found) 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; pc = a2l->addr; +#ifdef bfd_get_section_vma 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); +#else + size = bfd_section_size(section); +#endif if (pc < vma || pc >= vma + size) return;