From patchwork Sun Dec 29 17:25:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 182565 Delivered-To: patch@linaro.org Received: by 2002:a92:815a:0:0:0:0:0 with SMTP id e87csp5464020ild; Sun, 29 Dec 2019 09:51:31 -0800 (PST) X-Google-Smtp-Source: APXvYqxl/7kNDEKMHd0PKgujRCp/lPyiKKy1I7eWvFlluy5s/IEK2eZHLCWvM/74O0NmQ0UVAyxa X-Received: by 2002:a05:6830:1608:: with SMTP id g8mr65945371otr.169.1577641891055; Sun, 29 Dec 2019 09:51:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577641891; cv=none; d=google.com; s=arc-20160816; b=dr+LoH6D2r/qAwgDeT0w271f5+v6KdKx59CTW78Wj4ZNWjqhyt31zkC6BppV27DDCZ FMIPMzoJo+gmk+RGkCt1X6RpewMlhkamouF0auWpWHG+HrVj49SkD0+yfrpRMA/bDymM g2oUI4N9TxIRDXdAz7TvY2SIOgmRFYCNtOq/tdXOLiWXK/fwxPSx1NB9H70J+yWn9mOj wo54kjVQOUXFMUNWlpwAQdsNb8FBGqZpus1DdKdojys7Va3ij47cJMZTAx8Rnuay6sHi /8Awt+nc54MmuV0IrnR7T4SeKyNhaUD8pPnef5wZVAE9XaBzcjkCr82/9F6xofkBjirq 4pgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=7nrUu4QdJLZTowqdlnc9YF2HI86DTj5hgisc7li7r0M=; b=O0+kXc7smd9zPsYqwkHmsQni7WzYYj+jCr93xF+0g1AY0KssyF6GYy2XaUci2Ga90P jN0g4mma6nYSt3He7023NAwUkRDI6fq1E2W+yK4YFacticos+aAGCbZ6q9kOsFhAbMXC zGGdXbubFrbJJXiTg4semUY6LeIOClLbnohUHPjJA4rtD0kdiHlLmziRQwBYVuXM7QoK nIKcfnNw9JE9OghqZSDl4FGjFSNdzlNeLJI4hOd9tSy1e0VCzunoFd70MBY9HCvGq97j 7qBxXv1+wq3jbl2s/C5s1tEbtGEaOf1gyCUYx15gMDYV873dUP1zryQeyO1HSM8Xs6A7 Mrzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=1tAF5pXJ; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a15si18287756otq.83.2019.12.29.09.51.30; Sun, 29 Dec 2019 09:51:31 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=1tAF5pXJ; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732090AbfL2Rva (ORCPT + 14 others); Sun, 29 Dec 2019 12:51:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:36810 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731771AbfL2Rv2 (ORCPT ); Sun, 29 Dec 2019 12:51:28 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6C21820718; Sun, 29 Dec 2019 17:51:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577641887; bh=xlc7THDxqHOy7omFyY3ozdfR6uXdFyOw7hRsO3wCTyQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1tAF5pXJqwcjxBkfp6g0F4nneIQcSRUirygO0C+BqikVjkQytsOy61Mi8LRf1bxp7 Bd9KNRztvlOnHcabRnPzEVn0DctZmn6D5XPyp4rMRFgzn53bPferUhcRP3aWHn0ztu rjdTpq+z/+9hBjh5UzZXETsDEosJzNRLK0HgYU00= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, John Garry , Alexander Shishkin , Jiri Olsa , Mark Rutland , Namhyung Kim , Peter Zijlstra , Will Deacon , linux-arm-kernel@lists.infradead.org, Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 5.4 253/434] perf tools: Fix cross compile for ARM64 Date: Sun, 29 Dec 2019 18:25:06 +0100 Message-Id: <20191229172718.726560429@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229172702.393141737@linuxfoundation.org> References: <20191229172702.393141737@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: John Garry [ Upstream commit 71f699078b154fcb1c9162fd0208ada9ce532ffc ] Currently when cross compiling perf tool for ARM64 on my x86 machine I get this error: arch/arm64/util/sym-handling.c:9:10: fatal error: gelf.h: No such file or directory #include For the build, libelf is reported off: Auto-detecting system features: ... ... libelf: [ OFF ] Indeed, test-libelf is not built successfully: more ./build/feature/test-libelf.make.output test-libelf.c:2:10: fatal error: libelf.h: No such file or directory #include ^~~~~~~~~~ compilation terminated. I have no such problems natively compiling on ARM64, and I did not previously have this issue for cross compiling. Fix by relocating the gelf.h include. Signed-off-by: John Garry Cc: Alexander Shishkin Cc: Jiri Olsa Cc: Mark Rutland Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Will Deacon Cc: linux-arm-kernel@lists.infradead.org Link: http://lore.kernel.org/lkml/1573045254-39833-1-git-send-email-john.garry@huawei.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/arch/arm64/util/sym-handling.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.20.1 diff --git a/tools/perf/arch/arm64/util/sym-handling.c b/tools/perf/arch/arm64/util/sym-handling.c index 5df788985130..8dfa3e5229f1 100644 --- a/tools/perf/arch/arm64/util/sym-handling.c +++ b/tools/perf/arch/arm64/util/sym-handling.c @@ -6,9 +6,10 @@ #include "symbol.h" // for the elf__needs_adjust_symbols() prototype #include -#include #ifdef HAVE_LIBELF_SUPPORT +#include + bool elf__needs_adjust_symbols(GElf_Ehdr ehdr) { return ehdr.e_type == ET_EXEC ||