[1/2] mk: fix build on arm64

Message ID 20191028112535.692-1-alialnu@mellanox.com (mailing list archive)
State Superseded, archived
Delegated to: Thomas Monjalon
Headers
Series [1/2] mk: fix build on arm64 |

Checks

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

Commit Message

Ali Alnubani Oct. 28, 2019, 11:25 a.m. UTC
  OcteonTx was disabled for causing an internal compiler error on old gcc
versions.
See commit 4f760550a093 ("mk: disable OcteonTx for buggy compilers").

The condition that was added later to apply disabling OcteonTx
only on arm64 caused the condition to never be obeyed because it
compares ["arm64"] to [arm64].

This fixes the condition by using RTE_ARCH instead of CONFIG_RTE_ARCH,
because the former has the quotes removed, while the later doesn't.

Fixes: f3af3e44a444 ("mk: disable OcteonTx for buggy compilers only on arm64")
Cc: stable@dpdk.org

Signed-off-by: Ali Alnubani <alialnu@mellanox.com>
---
 mk/toolchain/gcc/rte.toolchain-compat.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Thomas Monjalon Oct. 28, 2019, 4:34 p.m. UTC | #1
28/10/2019 12:25, Ali Alnubani:
> OcteonTx was disabled for causing an internal compiler error on old gcc
> versions.
> See commit 4f760550a093 ("mk: disable OcteonTx for buggy compilers").
> 
> The condition that was added later to apply disabling OcteonTx
> only on arm64 caused the condition to never be obeyed because it
> compares ["arm64"] to [arm64].
> 
> This fixes the condition by using RTE_ARCH instead of CONFIG_RTE_ARCH,
> because the former has the quotes removed, while the later doesn't.
> 
> Fixes: f3af3e44a444 ("mk: disable OcteonTx for buggy compilers only on arm64")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Ali Alnubani <alialnu@mellanox.com>
> ---
> -	ifeq ($(CONFIG_RTE_ARCH), arm64)
> +	ifeq ($(RTE_ARCH), arm64)

Acked-by: Thomas Monjalon <thomas@monjalon.net>
  
Jerin Jacob Oct. 30, 2019, 11:42 a.m. UTC | #2
On Mon, Oct 28, 2019 at 4:56 PM Ali Alnubani <alialnu@mellanox.com> wrote:
>
> OcteonTx was disabled for causing an internal compiler error on old gcc
> versions.
> See commit 4f760550a093 ("mk: disable OcteonTx for buggy compilers").
>
> The condition that was added later to apply disabling OcteonTx
> only on arm64 caused the condition to never be obeyed because it
> compares ["arm64"] to [arm64].
>
> This fixes the condition by using RTE_ARCH instead of CONFIG_RTE_ARCH,
> because the former has the quotes removed, while the later doesn't.
>
> Fixes: f3af3e44a444 ("mk: disable OcteonTx for buggy compilers only on arm64")
> Cc: stable@dpdk.org
>
> Signed-off-by: Ali Alnubani <alialnu@mellanox.com>

Acked-by: Jerin Jacob <jerinj@marvell.com>

> ---
>  mk/toolchain/gcc/rte.toolchain-compat.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/mk/toolchain/gcc/rte.toolchain-compat.mk b/mk/toolchain/gcc/rte.toolchain-compat.mk
> index ea40a11c0..00d6fd642 100644
> --- a/mk/toolchain/gcc/rte.toolchain-compat.mk
> +++ b/mk/toolchain/gcc/rte.toolchain-compat.mk
> @@ -99,7 +99,7 @@ else
>         endif
>
>         # Disable octeontx event PMD for gcc < 4.8.6 & ARCH=arm64
> -       ifeq ($(CONFIG_RTE_ARCH), arm64)
> +       ifeq ($(RTE_ARCH), arm64)
>         ifeq ($(shell test $(GCC_VERSION)$(GCC_PATCHLEVEL) -lt 486 && echo 1), 1)
>                 CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF=d
>                 CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL=d
> --
> 2.23.0
>
  

Patch

diff --git a/mk/toolchain/gcc/rte.toolchain-compat.mk b/mk/toolchain/gcc/rte.toolchain-compat.mk
index ea40a11c0..00d6fd642 100644
--- a/mk/toolchain/gcc/rte.toolchain-compat.mk
+++ b/mk/toolchain/gcc/rte.toolchain-compat.mk
@@ -99,7 +99,7 @@  else
 	endif
 
 	# Disable octeontx event PMD for gcc < 4.8.6 & ARCH=arm64
-	ifeq ($(CONFIG_RTE_ARCH), arm64)
+	ifeq ($(RTE_ARCH), arm64)
 	ifeq ($(shell test $(GCC_VERSION)$(GCC_PATCHLEVEL) -lt 486 && echo 1), 1)
 		CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF=d
 		CONFIG_RTE_LIBRTE_OCTEONTX_MEMPOOL=d