From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id CF0E3A04A3 for ; Tue, 16 Jun 2020 15:51:54 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BBFFE1BF89; Tue, 16 Jun 2020 15:51:54 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 34EC85B3A for ; Tue, 16 Jun 2020 15:51:54 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592315513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=k8wp7+/293GMRdcrStT40kbd687A60hmVPD3njD+kO4=; b=PwD4RVpATjOg25rrQlSO01k+MTJvQ1CC1DOgBpwqso804XoSUQhorIbfU+VeX6/x6IWr1r vpyUnD8Sqc/WLoCjrlk+ljwBDwCbuRVVOTsaplfzNFKAFUxVIHeDRobIG+s8DiuvYL11qP 7F0ZDXhih1yC6UUPxeCwaSOGp+g6cHg= 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-378-Oe6A_honNBeFyT8d3iF41w-1; Tue, 16 Jun 2020 09:51:50 -0400 X-MC-Unique: Oe6A_honNBeFyT8d3iF41w-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2A425803313; Tue, 16 Jun 2020 13:51:49 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.205]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1DDAB6ED96; Tue, 16 Jun 2020 13:51:47 +0000 (UTC) From: Kevin Traynor To: stable@dpdk.org Cc: bluca@debian.org, ferruh.yigit@intel.com, Kevin Traynor Date: Tue, 16 Jun 2020 14:51:36 +0100 Message-Id: <20200616135137.8563-4-ktraynor@redhat.com> In-Reply-To: <20200616135137.8563-1-ktraynor@redhat.com> References: <20200616135137.8563-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH 18.11 3/4] crypto/octeontx: fix gcc 10 -fno-common build errors X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" gcc 10 defaults to -fno-common, this means a linker error will now be reported if the same global variable is defined in more than one compilation unit. Fix this for cpt_logtype. Signed-off-by: Kevin Traynor --- drivers/common/cpt/cpt_pmd_logs.h | 2 +- drivers/crypto/octeontx/otx_cryptodev.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/common/cpt/cpt_pmd_logs.h b/drivers/common/cpt/cpt_pmd_logs.h index 4cbec4e36c..2681d12869 100644 --- a/drivers/common/cpt/cpt_pmd_logs.h +++ b/drivers/common/cpt/cpt_pmd_logs.h @@ -46,5 +46,5 @@ * by otx_* driver routines during PCI probe. */ -int cpt_logtype; +extern int cpt_logtype; #endif /* _CPT_PMD_LOGS_H_ */ diff --git a/drivers/crypto/octeontx/otx_cryptodev.c b/drivers/crypto/octeontx/otx_cryptodev.c index d48fd1971c..d334fbfdd5 100644 --- a/drivers/crypto/octeontx/otx_cryptodev.c +++ b/drivers/crypto/octeontx/otx_cryptodev.c @@ -20,4 +20,6 @@ static int otx_cryptodev_logtype; uint8_t otx_cryptodev_driver_id; +int cpt_logtype; + static struct rte_pci_id pci_id_cpt_table[] = { { -- 2.21.3