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 A388BA04F0 for ; Tue, 10 Dec 2019 16:01:53 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 96B0E1BE3D; Tue, 10 Dec 2019 16:01:53 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 25BD51B13C for ; Tue, 10 Dec 2019 16:01:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575990111; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vgDzjUCdAapdZD/Is6QbKWAEj+10HCqWJfOWxVk33a4=; b=f7OzxdvBmjhXh9oSdOibzMKIe0E5upJj64Mei6pejp1F8/jn1VBnW9aDZUbISOWyCeYeyR CzYZ//f+D6bgx9pwYucX2FWblRUiiboES6zYbGRa+4JTWmIcJswwSeEv5+ImDhxefAiuwF b7Zmy06ijthKswHnbqywBSXY/R2SUx8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-304-DgdGiw-0Opmu15IsfZ96ow-1; Tue, 10 Dec 2019 10:01:48 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7424D800D4E; Tue, 10 Dec 2019 15:01:47 +0000 (UTC) Received: from rh.redhat.com (ovpn-116-64.ams2.redhat.com [10.36.116.64]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3D5325DA7D; Tue, 10 Dec 2019 15:01:46 +0000 (UTC) From: Kevin Traynor To: Ali Alnubani Cc: Thomas Monjalon , Jerin Jacob , dpdk stable Date: Tue, 10 Dec 2019 14:59:29 +0000 Message-Id: <20191210145937.32755-55-ktraynor@redhat.com> In-Reply-To: <20191210145937.32755-1-ktraynor@redhat.com> References: <20191210145937.32755-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: DgdGiw-0Opmu15IsfZ96ow-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'mk: fix build on arm64' has been queued to LTS release 18.11.6 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 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 rebasi= ng (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/d94852eaa4983e31d8= adc6e96327e17f27b6d06d Thanks. Kevin. --- >From d94852eaa4983e31d8adc6e96327e17f27b6d06d Mon Sep 17 00:00:00 2001 From: Ali Alnubani 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 arm6= 4") Signed-off-by: Ali Alnubani Acked-by: Thomas Monjalon Acked-by: Jerin Jacob --- 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/rt= e.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 =20 =09# Disable octeontx event PMD for gcc < 4.8.6 & ARCH=3Darm64 -=09ifeq ($(CONFIG_RTE_ARCH), arm64) +=09ifeq ($(RTE_ARCH), arm64) =09ifeq ($(shell test $(GCC_VERSION)$(GCC_PATCHLEVEL) -lt 486 && echo 1), = 1) =09=09CONFIG_RTE_LIBRTE_PMD_OCTEONTX_SSOVF=3Dd --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-10 14:49:42.711414896 +0000 +++ 0055-mk-fix-build-on-arm64.patch=092019-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@dpdk.org @@ -28 +29 @@ -index 69a53e5d0..35376da58 100644 +index ea40a11c0..00d6fd642 100644 @@ -31 +32 @@ -@@ -104,5 +104,5 @@ else +@@ -100,5 +100,5 @@ else