From patchwork Fri Sep 18 12:26:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Olsa X-Patchwork-Id: 260634 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=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 EE8ECC43463 for ; Fri, 18 Sep 2020 12:27:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B9AED20874 for ; Fri, 18 Sep 2020 12:27:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600432032; bh=9oSM4kBM3+puGwJs1EPDd+LiPUww8uNs0nnEDOganJ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iZJTs4kFfKNXMSTkFsfewY3RRNduiIxbPZCTWHAxzvQmPOPGvlZImaDE6C3s4tpRt 789tyo/diDtPh1A67GAYCaSCgYZad1Iw6AguAH9rqmjls0lnxFfXE2Zghrc2FuGFqz 8elRIsqmkiu0fbLESXu9Z/UBgbAUv/YdUb4Jy4/M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726549AbgIRM1M convert rfc822-to-8bit (ORCPT ); Fri, 18 Sep 2020 08:27:12 -0400 Received: from us-smtp-delivery-44.mimecast.com ([207.211.30.44]:46143 "EHLO us-smtp-delivery-44.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726481AbgIRM1J (ORCPT ); Fri, 18 Sep 2020 08:27:09 -0400 X-Greylist: delayed 3798 seconds by postgrey-1.27 at vger.kernel.org; Fri, 18 Sep 2020 08:27:08 EDT Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-479-9T0saRMuOhyZ2BBJjm3irA-1; Fri, 18 Sep 2020 08:27:04 -0400 X-MC-Unique: 9T0saRMuOhyZ2BBJjm3irA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 65C981091072; Fri, 18 Sep 2020 12:27:02 +0000 (UTC) Received: from krava.redhat.com (ovpn-114-24.ams2.redhat.com [10.36.114.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 84C2110013C1; Fri, 18 Sep 2020 12:26:59 +0000 (UTC) From: Jiri Olsa To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: Seth Forshee , netdev@vger.kernel.org, bpf@vger.kernel.org, Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh Subject: [PATCH bpf-next 2/2] tools resolve_btfids: Always force HOSTARCH Date: Fri, 18 Sep 2020 14:26:54 +0200 Message-Id: <20200918122654.2625699-2-jolsa@kernel.org> In-Reply-To: <20200918122654.2625699-1-jolsa@kernel.org> References: <20200918122654.2625699-1-jolsa@kernel.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jolsa@kernel.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Seth reported problem with cross builds, that fail on resolve_btfids build, because we are trying to build it on cross build arch. Fixing this by always forcing the host arch. Fixes: fbbb68de80a4 ("bpf: Add resolve_btfids tool to resolve BTF IDs in ELF object") Reported-by: Seth Forshee Signed-off-by: Jiri Olsa --- tools/bpf/resolve_btfids/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/bpf/resolve_btfids/Makefile b/tools/bpf/resolve_btfids/Makefile index a88cd4426398..d3c818b8d8d3 100644 --- a/tools/bpf/resolve_btfids/Makefile +++ b/tools/bpf/resolve_btfids/Makefile @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only include ../../scripts/Makefile.include +include ../../scripts/Makefile.arch ifeq ($(srctree),) srctree := $(patsubst %/,%,$(dir $(CURDIR))) @@ -29,6 +30,7 @@ endif AR = $(HOSTAR) CC = $(HOSTCC) LD = $(HOSTLD) +ARCH = $(HOSTARCH) OUTPUT ?= $(srctree)/tools/bpf/resolve_btfids/