meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/files/9999-perf-libbft-upstream.patch

   1 From mboxrd@z Thu Jan  1 00:00:00 1970
   2 Return-Path: <SRS0=OrIQ=3R=vger.kernel.org=linux-kernel-owner@kernel.org>
   3 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on
   4         aws-us-west-2-korg-lkml-1.web.codeaurora.org
   5 X-Spam-Level:
   6 X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID,
   7         DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,
   8         HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,
   9         SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no
  10         version=3.4.0
  11 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
  12         by smtp.lore.kernel.org (Postfix) with ESMTP id 15B3FC33CB2
  13         for <linux-kernel@archiver.kernel.org>; Tue, 28 Jan 2020 15:29:57 +0000 (UTC)
  14 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
  15         by mail.kernel.org (Postfix) with ESMTP id DC2FA207FD
  16         for <linux-kernel@archiver.kernel.org>; Tue, 28 Jan 2020 15:29:56 +0000 (UTC)
  17 Authentication-Results: mail.kernel.org;
  18         dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="oudfIJtO"
  19 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
  20         id S1726687AbgA1P34 (ORCPT
  21         <rfc822;linux-kernel@archiver.kernel.org>);
  22         Tue, 28 Jan 2020 10:29:56 -0500
  23 Received: from mail-pj1-f68.google.com ([209.85.216.68]:52776 "EHLO
  24         mail-pj1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
  25         with ESMTP id S1725881AbgA1P3z (ORCPT
  26         <rfc822;linux-kernel@vger.kernel.org>);
  27         Tue, 28 Jan 2020 10:29:55 -0500
  28 Received: by mail-pj1-f68.google.com with SMTP id a6so1139461pjh.2
  29         for <linux-kernel@vger.kernel.org>; Tue, 28 Jan 2020 07:29:54 -0800 (PST)
  30 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
  31         d=gmail.com; s=20161025;
  32         h=from:to:cc:subject:date:message-id:mime-version
  33          :content-transfer-encoding;
  34         bh=gYDQt040okirqe50Lrh3CEKmMOXPeZIYhDIO12JRm+M=;
  35         b=oudfIJtO2XN4XvD+DQ8Ec3GIHqxMMk6ogkt8jzO33dudjAqdner4DPznSzh1Y7XrBd
  36          ezD2ltpelFCHW3JRZgyfZqHAfW3s8KrKPaSSHQbDDQ7OXq3O+jtATKp0lwiThA4nB0uC
  37          BigxCmlYdVAHdBtxBc59/KBRJsff1bIIF2ifAGCQEx7s/wndc9NORpanY5iLzy/VqDpT
  38          Ja69ofWRIG1rsaAVpLA39lPLIkPyHjgG2/lirDlSXtlepON3OBYI/vPcMNV1OVcd5Maf
  39          8hFcwuDd5SEU+oue9keSK6X4vxGhivjKuT3Hz03+l8HEs3uZw+qK8Vd992Nm4wuWg47y
  40          MbWQ==
  41 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
  42         d=1e100.net; s=20161025;
  43         h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version
  44          :content-transfer-encoding;
  45         bh=gYDQt040okirqe50Lrh3CEKmMOXPeZIYhDIO12JRm+M=;
  46         b=A+s6wicuBVjcyP6oBJZcS0KkG8ps96rhnWKHa1DiKP6idYSTKnhlUlbHwRDnS45vY3
  47          EylYoM/iamGhD0lwUkgXn9y092J/xDRX81UC0xAivoh2XSrJ5QMoS26yAlLo+F6U7e97
  48          uYE2j5To+D+SwSdy78AwCLhcUALkraL7+IKkuLepgQ9CRqslm2ucLbMlsfen4ur6HzGv
  49          hnGYhhI5Vr3RzUX/UYsfwMiT+klZsgtaKiXLiG/N+uKRPVbkfRYAA9jyv5EY9vtZHcMX
  50          erWdta535FrzMEzbh1DSLezGLCbppqrpyRa48xixZSCwty4lZyD/lQ5GiGc2Eb6OBpH5
  51          yXJA==
  52 X-Gm-Message-State: APjAAAWM554O6B18uKkyZR8xnKm0z5Pkt4u46QfadBN1BW++FYYtNsS/
  53         If4S1DoJJuqU2CuBGLwTQNk=
  54 X-Google-Smtp-Source: APXvYqwBUq02rMUM31o3VOkfKkq08ooJejdl8gGvivEbHXaXtorSAN7XrAd3mphmADoU5Yi8R+kxTw==
  55 X-Received: by 2002:a17:902:aa0b:: with SMTP id be11mr22410567plb.181.1580225394577;
  56         Tue, 28 Jan 2020 07:29:54 -0800 (PST)
  57 Received: from localhost.localdomain ([149.248.6.217])
  58         by smtp.gmail.com with ESMTPSA id y6sm20632148pgc.10.2020.01.28.07.29.51
  59         (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
  60         Tue, 28 Jan 2020 07:29:54 -0800 (PST)
  61 From:   Changbin Du <changbin.du@gmail.com>
  62 To:     Peter Zijlstra <peterz@infradead.org>,
  63         Ingo Molnar <mingo@redhat.com>,
  64         Arnaldo Carvalho de Melo <acme@kernel.org>,
  65         Jiri Olsa <jolsa@redhat.com>
  66 Cc:     linux-kernel@vger.kernel.org, Changbin Du <changbin.du@gmail.com>
  67 Subject: [PATCH] perf: Make perf able to build with latest libbfd
  68 Date:   Tue, 28 Jan 2020 23:29:38 +0800
  69 Message-Id: <20200128152938.31413-1-changbin.du@gmail.com>
  70 X-Mailer: git-send-email 2.24.0
  71 MIME-Version: 1.0
  72 Content-Transfer-Encoding: 8bit
  73 Sender: linux-kernel-owner@vger.kernel.org
  74 Precedence: bulk
  75 List-ID: <linux-kernel.vger.kernel.org>
  76 X-Mailing-List: linux-kernel@vger.kernel.org
  77 Archived-At: <https://lore.kernel.org/lkml/20200128152938.31413-1-changbin.du@gmail.com/>
  78 List-Archive: <https://lore.kernel.org/lkml/>
  79 List-Post: <mailto:linux-kernel@vger.kernel.org>
  80
  81 libbfd has changed the bfd_section_* macros to inline functions
  82 bfd_section_<field> since 2019-09-18. See below two commits:
  83   o http://www.sourceware.org/ml/gdb-cvs/2019-09/msg00064.html
  84   o https://www.sourceware.org/ml/gdb-cvs/2019-09/msg00072.html
  85
  86 This fix make perf able to build with both old and new libbfd.
  87
  88 Signed-off-by: Changbin Du <changbin.du@gmail.com>
  89 ---
  90  tools/perf/util/srcline.c | 16 +++++++++++++++-
  91  1 file changed, 15 insertions(+), 1 deletion(-)
  92
  93 diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c
  94 index 6ccf6f6d09df..5b7d6c16d33f 100644
  95 --- a/tools/perf/util/srcline.c
  96 +++ b/tools/perf/util/srcline.c
  97 @@ -193,16 +193,30 @@ static void find_address_in_section(bfd *abfd, asection *section, void *data)
  98         bfd_vma pc, vma;
  99         bfd_size_type size;
 100         struct a2l_data *a2l = data;
 101 +       flagword flags;
 102
 103         if (a2l->found)
 104                 return;
 105
 106 -       if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0)
 107 +#ifdef bfd_get_section_flags
 108 +       flags = bfd_get_section_flags(abfd, section);
 109 +#else
 110 +       flags = bfd_section_flags(section);
 111 +#endif
 112 +       if ((flags & SEC_ALLOC) == 0)
 113                 return;
 114
 115         pc = a2l->addr;
 116 +#ifdef bfd_get_section_vma
 117         vma = bfd_get_section_vma(abfd, section);
 118 +#else
 119 +       vma = bfd_section_vma(section);
 120 +#endif
 121 +#ifdef bfd_get_section_size
 122         size = bfd_get_section_size(section);
 123 +#else
 124 +       size = bfd_section_size(section);
 125 +#endif
 126
 127         if (pc < vma || pc >= vma + size)
 128                 return;
 129 --
 130 2.24.0
 131
 132