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=unavailable 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 98774C33CB3 for ; Thu, 16 Jan 2020 16:54:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 65C1820730 for ; Thu, 16 Jan 2020 16:54:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579193654; bh=VsiVaUIh0pNlZPFYJ+bvDcyc+g43VIn3QVMdYDIDnf0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=uAQ8ay24ESMQMBQgucmBjH9pPEcxxbE7cZHAd6jUXCIx6RScSwx+8RenqusCydb1D zmaeSLpHXpQN+WGfWssGUABPVFWOSJx7oABTTU9/lQ2cFxKyx6vefnDcY6wFPwFoBC QJAuI2qwG2RROLVyjThgtp1/lLhqgZO+ynRTo7YM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729575AbgAPQyN (ORCPT ); Thu, 16 Jan 2020 11:54:13 -0500 Received: from mail.kernel.org ([198.145.29.99]:38548 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731591AbgAPQyL (ORCPT ); Thu, 16 Jan 2020 11:54:11 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (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 B19F02467A; Thu, 16 Jan 2020 16:54:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579193650; bh=VsiVaUIh0pNlZPFYJ+bvDcyc+g43VIn3QVMdYDIDnf0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TAo9uKnbUHVHuohLJ8KAgndzD94DgenMvHX4XC1PvWKvimZL20adSDOOqMwT4Fdqr QAH8uXdHgU3ZlaKHYR9/AfgKaFo6to1RUDbbQvtbph/GCRn6kEZo59jyCEIbWxvzi+ x8z19pfmP8lWClPlfb2NPxWLQfmeXNCLI3LS62DA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andrii Nakryiko , Daniel Borkmann , Yonghong Song , Sasha Levin , netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 180/205] libbpf: Fix Makefile' libbpf symbol mismatch diagnostic Date: Thu, 16 Jan 2020 11:42:35 -0500 Message-Id: <20200116164300.6705-180-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116164300.6705-1-sashal@kernel.org> References: <20200116164300.6705-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Andrii Nakryiko [ Upstream commit b568405856906ee4d9ba6284fd36f2928653a623 ] Fix Makefile's diagnostic diff output when there is LIBBPF_API-versioned symbols mismatch. Fixes: 1bd63524593b ("libbpf: handle symbol versioning properly for libbpf.a") Signed-off-by: Andrii Nakryiko Signed-off-by: Daniel Borkmann Acked-by: Yonghong Song Link: https://lore.kernel.org/bpf/20191127200134.1360660-1-andriin@fb.com Signed-off-by: Sasha Levin --- tools/lib/bpf/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile index 56ce6292071b..33e2638ef7f0 100644 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile @@ -215,7 +215,7 @@ check_abi: $(OUTPUT)libbpf.so "versioned symbols in $^ ($(VERSIONED_SYM_COUNT))." \ "Please make sure all LIBBPF_API symbols are" \ "versioned in $(VERSION_SCRIPT)." >&2; \ - readelf -s --wide $(OUTPUT)libbpf-in.o | \ + readelf -s --wide $(BPF_IN_SHARED) | \ cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \ awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$8}'| \ sort -u > $(OUTPUT)libbpf_global_syms.tmp; \ -- 2.20.1