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 598C9A0093 for ; Tue, 19 May 2020 15:15:15 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4CA3A1D93D; Tue, 19 May 2020 15:15:15 +0200 (CEST) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 345981D702 for ; Tue, 19 May 2020 15:15:14 +0200 (CEST) Received: by mail-wm1-f68.google.com with SMTP id h4so3008220wmb.4 for ; Tue, 19 May 2020 06:15:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=R63adiQcUut6NI3FYM/E+V0/9P2iZyABZHzVoLM1/do=; b=Hax1aSxHKc9JUk2l3WN/aZkMVvRC4nTJ+zewOAXSiRJMkzaNHa8ARuvBCGCYqCSMV3 rh8roj4GP7p4RQ5slnUSzajsxw8H3Do8q8N62ZKG/rmMZB6bivkdzUd7C8H98RSQyEIj 4g0DaXKbGe1hCMAyiZo6iGBc6LJv8VWiKo2FYLs9MFHpBRwrNyrkcM1CIT0OoWl71fWj NxMsjy5J37hdj8Z0e3n6ZXcgcmIwTWPK9eV+cNcU0sTKivMfqCeMMZGxOPimTj6Tyxke AzO3Bodw/YDXbJNLd8wbKjTU73gQQpPLihcUpW0bXLDDcUUYEvR0AWAlhRZgmC69f4xP P/wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=R63adiQcUut6NI3FYM/E+V0/9P2iZyABZHzVoLM1/do=; b=ZQfSVF/eXAvH6ozB1P8GhOssUNCP1gNlu9w3PYEEjFi5FVEd+6mIYcGqBZyWmRvJM5 h6J1Db8mWKG4bhEwj3quVht/IWMiDmM4mVBe7Zl8Nd2UHhOB5wr7c5k5SAYiFtcSWDy8 RJMjtch3UipmlfO/Banv573lhla62oX35/DpryMoTUkz3j08lg1jreVNdhrD729w/k8b dETiCcG4er2X7iUJoK11sF6XCx3jrcKOicTd0ZyX9h10UJ1ZIIEx1jCkZSP9gZv82lfR VaMlqMMPYLiICUdOr/tgjRmz+zCjwShCZRem7FkJHGUexzqrt7YWTnhfnaizhbRyhXBo ohog== X-Gm-Message-State: AOAM533A7gtEaqjlri6KgvGm6ayGYGr0MLwfxcFTwfqj3EOPLj0dy9MN +/T9s9CgYvbvIlNlTB4NnzE= X-Google-Smtp-Source: ABdhPJwImeW8pcxC48U88PMaaLZvPPlQoqpw4DnavF+goFSfFPh/MQ3H+w7TmKzqHCBLXwLeE4AO+A== X-Received: by 2002:a1c:9a09:: with SMTP id c9mr5259275wme.159.1589894113907; Tue, 19 May 2020 06:15:13 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id v205sm3952576wmg.11.2020.05.19.06.15.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:15:13 -0700 (PDT) From: luca.boccassi@gmail.com To: Kevin Traynor Cc: Akhil Goyal , dpdk stable Date: Tue, 19 May 2020 14:05:14 +0100 Message-Id: <20200519130549.112823-179-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'drivers/crypto: disable gcc 10 no-common errors' has been queued to stable release 19.11.3 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 stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/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. Thanks. Luca Boccassi --- >From 7b842acdfa21c91164c3fc2be296d7003b73d818 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 no-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 1b1f25a2a2..5b27b84c09 100644 --- a/drivers/crypto/caam_jr/Makefile +++ b/drivers/crypto/caam_jr/Makefile @@ -16,6 +16,13 @@ CFLAGS += -D _GNU_SOURCE 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/common/dpaax CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib/ diff --git a/drivers/crypto/caam_jr/meson.build b/drivers/crypto/caam_jr/meson.build index 50132aebef..0dbfa2ee9c 100644 --- a/drivers/crypto/caam_jr/meson.build +++ b/drivers/crypto/caam_jr/meson.build @@ -14,6 +14,11 @@ sources = files('caam_jr_capabilities.c', allow_experimental_apis = true +# FIXME: temporary solution for Bugzilla 469 +if (toolchain == 'gcc' and cc.version().version_compare('>=10.0.0')) + cflags += '-fcommon' +endif + includes += include_directories('../../bus/dpaa/include/') includes += include_directories('../../common/dpaax/') includes += include_directories('../../common/dpaax/caamflib/') diff --git a/drivers/crypto/dpaa2_sec/Makefile b/drivers/crypto/dpaa2_sec/Makefile index 96b9c78435..183e9412ae 100644 --- a/drivers/crypto/dpaa2_sec/Makefile +++ b/drivers/crypto/dpaa2_sec/Makefile @@ -20,6 +20,13 @@ CFLAGS += -Wno-implicit-fallthrough 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/common/dpaax CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec/ diff --git a/drivers/crypto/dpaa2_sec/meson.build b/drivers/crypto/dpaa2_sec/meson.build index ab9c8c8bf9..3f1dfd67da 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', allow_experimental_apis = true +# FIXME: temporary solution for Bugzilla 469 +if (toolchain == 'gcc' and cc.version().version_compare('>=10.0.0')) + cflags += '-fcommon' +endif + includes += include_directories('mc', '../../common/dpaax', '../../common/dpaax/caamflib') diff --git a/drivers/crypto/dpaa_sec/Makefile b/drivers/crypto/dpaa_sec/Makefile index fbfd775855..b5a97b9f6e 100644 --- a/drivers/crypto/dpaa_sec/Makefile +++ b/drivers/crypto/dpaa_sec/Makefile @@ -14,6 +14,13 @@ CFLAGS += -DALLOW_EXPERIMENTAL_API 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 CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/base/qbman diff --git a/drivers/crypto/dpaa_sec/meson.build b/drivers/crypto/dpaa_sec/meson.build index 71de819407..e819f9cf1b 100644 --- a/drivers/crypto/dpaa_sec/meson.build +++ b/drivers/crypto/dpaa_sec/meson.build @@ -11,6 +11,11 @@ sources = files('dpaa_sec.c') allow_experimental_apis = true +# FIXME: temporary solution for Bugzilla 469 +if (toolchain == 'gcc' and cc.version().version_compare('>=10.0.0')) + cflags += '-fcommon' +endif + includes += include_directories('../../bus/dpaa/include') includes += include_directories('../../common/dpaax') includes += include_directories('../../common/dpaax/caamflib/') -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:51.829677547 +0100 +++ 0179-drivers-crypto-disable-gcc-10-no-common-errors.patch 2020-05-19 14:04:44.520653884 +0100 @@ -1,8 +1,10 @@ -From 50b03f3b8eaf725c9e9b35f614c4a33f9623e29a Mon Sep 17 00:00:00 2001 +From 7b842acdfa21c91164c3fc2be296d7003b73d818 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 no-common errors +[ upstream commit 50b03f3b8eaf725c9e9b35f614c4a33f9623e29a ] + gcc 10 defaults to -fno-common and as a result when linking with crypto drivers: @@ -20,7 +22,6 @@ dpaa_sec/dpaa2_sec/caam_jr. Bugzilla ID: 469 -Cc: stable@dpdk.org Signed-off-by: Kevin Traynor Acked-by: Akhil Goyal @@ -34,10 +35,10 @@ 6 files changed, 36 insertions(+) diff --git a/drivers/crypto/caam_jr/Makefile b/drivers/crypto/caam_jr/Makefile -index 89d3238172..10848884cb 100644 +index 1b1f25a2a2..5b27b84c09 100644 --- a/drivers/crypto/caam_jr/Makefile +++ b/drivers/crypto/caam_jr/Makefile -@@ -14,6 +14,13 @@ CFLAGS += -D _GNU_SOURCE +@@ -16,6 +16,13 @@ CFLAGS += -D _GNU_SOURCE CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) @@ -52,12 +53,12 @@ CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib/ diff --git a/drivers/crypto/caam_jr/meson.build b/drivers/crypto/caam_jr/meson.build -index f8b5250a93..551b136322 100644 +index 50132aebef..0dbfa2ee9c 100644 --- a/drivers/crypto/caam_jr/meson.build +++ b/drivers/crypto/caam_jr/meson.build -@@ -12,6 +12,11 @@ sources = files('caam_jr_capabilities.c', - 'caam_jr_uio.c', - 'caam_jr.c') +@@ -14,6 +14,11 @@ sources = files('caam_jr_capabilities.c', + + allow_experimental_apis = true +# FIXME: temporary solution for Bugzilla 469 +if (toolchain == 'gcc' and cc.version().version_compare('>=10.0.0')) @@ -68,10 +69,10 @@ includes += include_directories('../../common/dpaax/') includes += include_directories('../../common/dpaax/caamflib/') diff --git a/drivers/crypto/dpaa2_sec/Makefile b/drivers/crypto/dpaa2_sec/Makefile -index a0a2795575..8ce637db60 100644 +index 96b9c78435..183e9412ae 100644 --- a/drivers/crypto/dpaa2_sec/Makefile +++ b/drivers/crypto/dpaa2_sec/Makefile -@@ -19,6 +19,13 @@ CFLAGS += -Wno-implicit-fallthrough +@@ -20,6 +20,13 @@ CFLAGS += -Wno-implicit-fallthrough endif endif @@ -86,12 +87,12 @@ CFLAGS += -I$(RTE_SDK)/drivers/common/dpaax/caamflib CFLAGS += -I$(RTE_SDK)/drivers/crypto/dpaa2_sec/ diff --git a/drivers/crypto/dpaa2_sec/meson.build b/drivers/crypto/dpaa2_sec/meson.build -index cb1c2d0492..505ad94146 100644 +index ab9c8c8bf9..3f1dfd67da 100644 --- a/drivers/crypto/dpaa2_sec/meson.build +++ b/drivers/crypto/dpaa2_sec/meson.build -@@ -10,4 +10,9 @@ deps += ['security', 'mempool_dpaa2'] - sources = files('dpaa2_sec_dpseci.c', - 'mc/dpseci.c') +@@ -12,4 +12,9 @@ sources = files('dpaa2_sec_dpseci.c', + + allow_experimental_apis = true +# FIXME: temporary solution for Bugzilla 469 +if (toolchain == 'gcc' and cc.version().version_compare('>=10.0.0')) @@ -100,10 +101,10 @@ + includes += include_directories('mc', '../../common/dpaax', '../../common/dpaax/caamflib') diff --git a/drivers/crypto/dpaa_sec/Makefile b/drivers/crypto/dpaa_sec/Makefile -index ea266962a3..6cf392cb37 100644 +index fbfd775855..b5a97b9f6e 100644 --- a/drivers/crypto/dpaa_sec/Makefile +++ b/drivers/crypto/dpaa_sec/Makefile -@@ -13,6 +13,13 @@ LIB = librte_pmd_dpaa_sec.a +@@ -14,6 +14,13 @@ CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) @@ -118,12 +119,12 @@ CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/include CFLAGS += -I$(RTE_SDK)/drivers/bus/dpaa/base/qbman diff --git a/drivers/crypto/dpaa_sec/meson.build b/drivers/crypto/dpaa_sec/meson.build -index 7d422d8d55..f5e6604575 100644 +index 71de819407..e819f9cf1b 100644 --- a/drivers/crypto/dpaa_sec/meson.build +++ b/drivers/crypto/dpaa_sec/meson.build -@@ -9,6 +9,11 @@ endif - deps += ['bus_dpaa', 'mempool_dpaa', 'security'] - sources = files('dpaa_sec.c') +@@ -11,6 +11,11 @@ sources = files('dpaa_sec.c') + + allow_experimental_apis = true +# FIXME: temporary solution for Bugzilla 469 +if (toolchain == 'gcc' and cc.version().version_compare('>=10.0.0'))