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 7EB93A04A3 for ; Tue, 16 Jun 2020 15:33:22 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6BAA91BF76; Tue, 16 Jun 2020 15:33:22 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id 0506D1BF76 for ; Tue, 16 Jun 2020 15:33:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592314400; 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=YB80bFnCD0pjD4oxYOaDZbQGVn5zMH4CiUL/kREfBbI=; b=ajCo0eGnEjHls5HFekyuQIendRKQNxQ+8NnO+OsErIXqIJrP/Lyd1TOszPtwvAKcrkyQ9V hc7B7feeaX/LsBzdC63jmnzhHJduvUgCqvXURXdSA8ciRr0G7F3y2cqC6SOd8/PamiNknX yO2OgTCTnm3O5A2BGwr7w33Glu6Lqvo= 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-83-h-3MGZt_PfCFF-8TMm1dMw-1; Tue, 16 Jun 2020 09:33:17 -0400 X-MC-Unique: h-3MGZt_PfCFF-8TMm1dMw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1F27B87342B; Tue, 16 Jun 2020 13:33:15 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.205]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3D3F95D9D7; Tue, 16 Jun 2020 13:33:14 +0000 (UTC) From: Kevin Traynor To: Kevin Traynor Cc: Akhil Goyal , dpdk stable Date: Tue, 16 Jun 2020 14:33:04 +0100 Message-Id: <20200616133304.6812-4-ktraynor@redhat.com> In-Reply-To: <20200616133304.6812-1-ktraynor@redhat.com> References: <20200616133304.6812-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 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 'drivers/crypto: disable gcc 10 fno-common errors' has been queued to LTS release 18.11.9 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" Hi, FYI, your patch has been queued to LTS release 18.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/19/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/500e41cae5ce1e7c456101aa5848c769450e6d09 Thanks. Kevin. --- >From 500e41cae5ce1e7c456101aa5848c769450e6d09 Mon Sep 17 00:00:00 2001 From: Kevin Traynor Date: Fri, 8 May 2020 17:27:55 +0100 Subject: [PATCH] drivers/crypto: disable gcc 10 fno-common errors [ upstream commit 50b03f3b8eaf725c9e9b35f614c4a33f9623e29a ] gcc 10 defaults to -fno-common and as a result when linking with crypto drivers: drivers/librte_pmd_dpaa_sec.a(crypto_dpaa_sec_dpaa_sec.c.o): (.bss+0x4): multiple definition of `rta_sec_era'; drivers/librte_pmd_caam_jr.a(crypto_caam_jr_caam_jr.c.o): (.bss+0x0): first defined here drivers/librte_pmd_dpaa2_sec.a(crypto_dpaa2_sec_dpaa2_sec_dpseci.c.o): (.data+0x0): multiple definition of `rta_sec_era'; drivers/librte_pmd_caam_jr.a(crypto_caam_jr_caam_jr.c.o): (.bss+0x0): first defined here This is a blunt fix for the issue by enabling fcommon for dpaa_sec/dpaa2_sec/caam_jr. Bugzilla ID: 469 Signed-off-by: Kevin Traynor Acked-by: Akhil Goyal --- drivers/crypto/caam_jr/Makefile | 7 +++++++ drivers/crypto/caam_jr/meson.build | 5 +++++ drivers/crypto/dpaa2_sec/Makefile | 7 +++++++ drivers/crypto/dpaa2_sec/meson.build | 5 +++++ drivers/crypto/dpaa_sec/Makefile | 7 +++++++ drivers/crypto/dpaa_sec/meson.build | 5 +++++ 6 files changed, 36 insertions(+) diff --git a/drivers/crypto/caam_jr/Makefile b/drivers/crypto/caam_jr/Makefile index 88cdf74108..c78901f5bb 100644 --- a/drivers/crypto/caam_jr/Makefile +++ b/drivers/crypto/caam_jr/Makefile @@ -17,4 +17,11 @@ CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +# FIXME: temporary solution for Bugzilla 469 +ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) +ifeq ($(shell test $(GCC_VERSION) -ge 100 && echo 1), 1) +CFLAGS += -fcommon +endif +endif + CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include CFLAGS += -I$(RTE_SDK)/drivers/crypto/caam_jr diff --git a/drivers/crypto/caam_jr/meson.build b/drivers/crypto/caam_jr/meson.build index 99b71aef15..ead7f42ff3 100644 --- a/drivers/crypto/caam_jr/meson.build +++ b/drivers/crypto/caam_jr/meson.build @@ -12,4 +12,9 @@ sources = files('caam_jr_capabilities.c', 'caam_jr.c') +# FIXME: temporary solution for Bugzilla 469 +if (toolchain == 'gcc' and cc.version().version_compare('>=10.0.0')) + cflags += '-fcommon' +endif + allow_experimental_apis = true diff --git a/drivers/crypto/dpaa2_sec/Makefile b/drivers/crypto/dpaa2_sec/Makefile index f537f76a6f..0da83bfc16 100644 --- a/drivers/crypto/dpaa2_sec/Makefile +++ b/drivers/crypto/dpaa2_sec/Makefile @@ -21,4 +21,11 @@ endif endif +# FIXME: temporary solution for Bugzilla 469 +ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) +ifeq ($(shell test $(GCC_VERSION) -ge 100 && echo 1), 1) +CFLAGS += -fcommon +endif +endif + CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec/ CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec/mc diff --git a/drivers/crypto/dpaa2_sec/meson.build b/drivers/crypto/dpaa2_sec/meson.build index 8fa4827edb..b999bbe433 100644 --- a/drivers/crypto/dpaa2_sec/meson.build +++ b/drivers/crypto/dpaa2_sec/meson.build @@ -12,4 +12,9 @@ sources = files('dpaa2_sec_dpseci.c', 'mc/dpseci.c') +# FIXME: temporary solution for Bugzilla 469 +if (toolchain == 'gcc' and cc.version().version_compare('>=10.0.0')) + cflags += '-fcommon' +endif + allow_experimental_apis = true diff --git a/drivers/crypto/dpaa_sec/Makefile b/drivers/crypto/dpaa_sec/Makefile index 5ce95c23fd..ed47f92b2b 100644 --- a/drivers/crypto/dpaa_sec/Makefile +++ b/drivers/crypto/dpaa_sec/Makefile @@ -15,4 +15,11 @@ CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) +# FIXME: temporary solution for Bugzilla 469 +ifeq ($(CONFIG_RTE_TOOLCHAIN_GCC),y) +ifeq ($(shell test $(GCC_VERSION) -ge 100 && echo 1), 1) +CFLAGS += -fcommon +endif +endif + CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include diff --git a/drivers/crypto/dpaa_sec/meson.build b/drivers/crypto/dpaa_sec/meson.build index 8a5709846e..e3daddbfd7 100644 --- a/drivers/crypto/dpaa_sec/meson.build +++ b/drivers/crypto/dpaa_sec/meson.build @@ -9,4 +9,9 @@ deps += ['bus_dpaa', 'security'] sources = files('dpaa_sec.c') +# FIXME: temporary solution for Bugzilla 469 +if (toolchain == 'gcc' and cc.version().version_compare('>=10.0.0')) + cflags += '-fcommon' +endif + allow_experimental_apis = true -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-06-16 14:31:16.124961836 +0100 +++ 0004-drivers-crypto-disable-gcc-10-fno-common-errors.patch 2020-06-16 14:31:15.916226607 +0100 @@ -1 +1 @@ -From 50b03f3b8eaf725c9e9b35f614c4a33f9623e29a Mon Sep 17 00:00:00 2001 +From 500e41cae5ce1e7c456101aa5848c769450e6d09 Mon Sep 17 00:00:00 2001 @@ -4 +4,3 @@ -Subject: [PATCH] drivers/crypto: disable gcc 10 no-common errors +Subject: [PATCH] drivers/crypto: disable gcc 10 fno-common errors + +[ upstream commit 50b03f3b8eaf725c9e9b35f614c4a33f9623e29a ] @@ -23 +24,0 @@ -Cc: stable@dpdk.org @@ -37 +38 @@ -index 89d3238172..10848884cb 100644 +index 88cdf74108..c78901f5bb 100644 @@ -40 +41 @@ -@@ -15,4 +15,11 @@ CFLAGS += -O3 +@@ -17,4 +17,11 @@ CFLAGS += -O3 @@ -51 +52 @@ - CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax + CFLAGS += -I$(RTE_SDK)/drivers/crypto/caam_jr @@ -53 +54 @@ -index f8b5250a93..551b136322 100644 +index 99b71aef15..ead7f42ff3 100644 @@ -56 +57 @@ -@@ -13,4 +13,9 @@ sources = files('caam_jr_capabilities.c', +@@ -12,4 +12,9 @@ sources = files('caam_jr_capabilities.c', @@ -64,2 +65,2 @@ - includes += include_directories('../../bus/dpaa/include/') - includes += include_directories('../../common/dpaax/') + allow_experimental_apis = true + @@ -67 +68 @@ -index a0a2795575..8ce637db60 100644 +index f537f76a6f..0da83bfc16 100644 @@ -70 +71 @@ -@@ -20,4 +20,11 @@ endif +@@ -21,4 +21,11 @@ endif @@ -80,2 +81,2 @@ - CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax - CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib + CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec/ + CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec/mc @@ -83 +84 @@ -index cb1c2d0492..505ad94146 100644 +index 8fa4827edb..b999bbe433 100644 @@ -86 +87 @@ -@@ -11,3 +11,8 @@ sources = files('dpaa2_sec_dpseci.c', +@@ -12,4 +12,9 @@ sources = files('dpaa2_sec_dpseci.c', @@ -94 +95,2 @@ - includes += include_directories('mc', '../../common/dpaax', '../../common/dpaax/caamflib') + allow_experimental_apis = true + @@ -96 +98 @@ -index ea266962a3..6cf392cb37 100644 +index 5ce95c23fd..ed47f92b2b 100644 @@ -99 +101 @@ -@@ -14,4 +14,11 @@ CFLAGS += -O3 +@@ -15,4 +15,11 @@ CFLAGS += -O3 @@ -112 +114 @@ -index 7d422d8d55..f5e6604575 100644 +index 8a5709846e..e3daddbfd7 100644 @@ -115 +117 @@ -@@ -10,4 +10,9 @@ deps += ['bus_dpaa', 'mempool_dpaa', 'security'] +@@ -9,4 +9,9 @@ deps += ['bus_dpaa', 'security'] @@ -123,2 +125,2 @@ - includes += include_directories('../../bus/dpaa/include') - includes += include_directories('../../common/dpaax') + allow_experimental_apis = true +