diff mbox series

[1/3] crypto/octeontx2: fix building with GCC 10

Message ID f028dcdd91e4452d9911942bc1fd53c59c3afe15.1580906522.git.tredaelli@redhat.com (mailing list archive)
State Accepted, archived
Delegated to: David Marchand
Headers
Series fix building with GCC 10 |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-nxp-Performance success Performance Testing PASS
ci/iol-testing fail Testing issues
ci/Intel-compilation success Compilation OK

Commit Message

Timothy Redaelli Feb. 5, 2020, 12:50 p.m. UTC 
  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.

Fixes: 2f8a1b963eb7 ("crypto/octeontx2: add PMD skeleton")
Cc: anoobj@marvell.com
Cc: stable@dpdk.org
Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>
---
 drivers/crypto/octeontx2/otx2_cryptodev.c     | 2 ++
 drivers/crypto/octeontx2/otx2_cryptodev.h     | 2 +-
 drivers/crypto/octeontx2/otx2_cryptodev_ops.h | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

Comments

Anoob Joseph Feb. 5, 2020, 12:59 p.m. UTC | #1 
> ----------------------------------------------------------------------
> 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.
> 
> Fixes: 2f8a1b963eb7 ("crypto/octeontx2: add PMD skeleton")
> Cc: anoobj@marvell.com
> Cc: stable@dpdk.org
> Signed-off-by: Timothy Redaelli <tredaelli@redhat.com>
> ---
>  drivers/crypto/octeontx2/otx2_cryptodev.c     | 2 ++
>  drivers/crypto/octeontx2/otx2_cryptodev.h     | 2 +-
>  drivers/crypto/octeontx2/otx2_cryptodev_ops.h | 2 +-
>  3 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/crypto/octeontx2/otx2_cryptodev.c
> b/drivers/crypto/octeontx2/otx2_cryptodev.c
> index 7fd216bb3..957bcd720 100644
> --- a/drivers/crypto/octeontx2/otx2_cryptodev.c
> +++ b/drivers/crypto/octeontx2/otx2_cryptodev.c
> @@ -24,6 +24,8 @@
> 
>  int otx2_cpt_logtype;
> 
> +uint8_t otx2_cryptodev_driver_id;
> +
>  static struct rte_pci_id pci_id_cpt_table[] = {
>  	{
>  		RTE_PCI_DEVICE(PCI_VENDOR_ID_CAVIUM,
> diff --git a/drivers/crypto/octeontx2/otx2_cryptodev.h
> b/drivers/crypto/octeontx2/otx2_cryptodev.h
> index 8e0ebc292..c0aa661b3 100644
> --- a/drivers/crypto/octeontx2/otx2_cryptodev.h
> +++ b/drivers/crypto/octeontx2/otx2_cryptodev.h
> @@ -38,6 +38,6 @@ extern int otx2_cpt_logtype;
>  /*
>   * Crypto device driver ID
>   */
> -uint8_t otx2_cryptodev_driver_id;
> +extern uint8_t otx2_cryptodev_driver_id;
> 
>  #endif /* _OTX2_CRYPTODEV_H_ */
> diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_ops.h
> b/drivers/crypto/octeontx2/otx2_cryptodev_ops.h
> index a2724f722..f83e36b48 100644
> --- a/drivers/crypto/octeontx2/otx2_cryptodev_ops.h
> +++ b/drivers/crypto/octeontx2/otx2_cryptodev_ops.h
> @@ -16,6 +16,6 @@ enum otx2_cpt_egrp {
>  	OTX2_CPT_EGRP_AE = 2
>  };
> 
> -struct rte_cryptodev_ops otx2_cpt_ops;
> +extern struct rte_cryptodev_ops otx2_cpt_ops;
> 
>  #endif /* _OTX2_CRYPTODEV_OPS_H_ */
> --
> 2.24.1

Acked-by: Anoob Joseph <anoobj@marvell.com>
diff mbox series

Patch

diff --git a/drivers/crypto/octeontx2/otx2_cryptodev.c b/drivers/crypto/octeontx2/otx2_cryptodev.c
index 7fd216bb3..957bcd720 100644
--- a/drivers/crypto/octeontx2/otx2_cryptodev.c
+++ b/drivers/crypto/octeontx2/otx2_cryptodev.c
@@ -24,6 +24,8 @@ 
 
 int otx2_cpt_logtype;
 
+uint8_t otx2_cryptodev_driver_id;
+
 static struct rte_pci_id pci_id_cpt_table[] = {
 	{
 		RTE_PCI_DEVICE(PCI_VENDOR_ID_CAVIUM,
diff --git a/drivers/crypto/octeontx2/otx2_cryptodev.h b/drivers/crypto/octeontx2/otx2_cryptodev.h
index 8e0ebc292..c0aa661b3 100644
--- a/drivers/crypto/octeontx2/otx2_cryptodev.h
+++ b/drivers/crypto/octeontx2/otx2_cryptodev.h
@@ -38,6 +38,6 @@  extern int otx2_cpt_logtype;
 /*
  * Crypto device driver ID
  */
-uint8_t otx2_cryptodev_driver_id;
+extern uint8_t otx2_cryptodev_driver_id;
 
 #endif /* _OTX2_CRYPTODEV_H_ */
diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_ops.h b/drivers/crypto/octeontx2/otx2_cryptodev_ops.h
index a2724f722..f83e36b48 100644
--- a/drivers/crypto/octeontx2/otx2_cryptodev_ops.h
+++ b/drivers/crypto/octeontx2/otx2_cryptodev_ops.h
@@ -16,6 +16,6 @@  enum otx2_cpt_egrp {
 	OTX2_CPT_EGRP_AE = 2
 };
 
-struct rte_cryptodev_ops otx2_cpt_ops;
+extern struct rte_cryptodev_ops otx2_cpt_ops;
 
 #endif /* _OTX2_CRYPTODEV_OPS_H_ */