[dpdk-stable] patch 'mk: fix build on arm64' has been queued to LTS release 18.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/16/19. 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/d94852eaa4983e31d8adc6e96327e17f27b6d06d

Thanks.

Kevin.

---
>From d94852eaa4983e31d8adc6e96327e17f27b6d06d Mon Sep 17 00:00:00 2001
From: Ali Alnubani <alialnu at mellanox.com>
Date: Mon, 4 Nov 2019 15:30:08 +0200
Subject: [PATCH] mk: fix build on arm64

[ upstream commit 27d6c3248d305a0515667475f404c62ecc63be06 ]

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")

Signed-off-by: Ali Alnubani <alialnu at mellanox.com>
Acked-by: Thomas Monjalon <thomas at monjalon.net>
Acked-by: Jerin Jacob <jerinj at 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
@@ -100,5 +100,5 @@ else
 
 	# 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
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-10 14:49:42.711414896 +0000
+++ 0055-mk-fix-build-on-arm64.patch	2019-12-10 14:49:39.093457003 +0000
@@ -1 +1 @@
-From 27d6c3248d305a0515667475f404c62ecc63be06 Mon Sep 17 00:00:00 2001
+From d94852eaa4983e31d8adc6e96327e17f27b6d06d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 27d6c3248d305a0515667475f404c62ecc63be06 ]
+
@@ -18 +19,0 @@
-Cc: stable at dpdk.org
@@ -28 +29 @@
-index 69a53e5d0..35376da58 100644
+index ea40a11c0..00d6fd642 100644
@@ -31 +32 @@
-@@ -104,5 +104,5 @@ else
+@@ -100,5 +100,5 @@ else