[dpdk-stable] patch 'drivers/crypto: disable gcc 10 no-common errors' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

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 <ktraynor at redhat.com>
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 <ktraynor at redhat.com>
Acked-by: Akhil Goyal <akhil.goyal at nxp.com>
---
 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 <ktraynor at redhat.com>
 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 at dpdk.org
 
 Signed-off-by: Kevin Traynor <ktraynor at redhat.com>
 Acked-by: Akhil Goyal <akhil.goyal at nxp.com>
@@ -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'))