[dpdk-stable] patch 'build: enable ARM NEON flag when __aarch64__ defined' has been queued to stable release 18.08.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 18.08.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/23/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Kevin Traynor

---
>From c968864af7328c22849e40c2b7bac93359077804 Mon Sep 17 00:00:00 2001
From: Honnappa Nagarahalli <honnappa.nagarahalli at arm.com>
Date: Sun, 2 Sep 2018 13:35:28 -0500
Subject: [PATCH] build: enable ARM NEON flag when __aarch64__ defined

[ upstream commit 68acaa86ae639e3cdd94e419f546045a1b0ce6ca ]

GCC version 4.8.5 does not pre-define __ARM_NEON. NEON is not
optional for ArmV8. Hence NEON related code can be enabled
when __aarch64__ is defined.

Bugzilla ID: 82

Reported-by: Raslan Darawsheh <rasland at mellanox.com>
Reported-by: Thomas F Herbert <therbert at redhat.com>
Signed-off-by: Honnappa Nagarahalli <honnappa.nagarahalli at arm.com>
Reviewed-by: Phil Yang <phil.yang at arm.com>
Reviewed-by: Gavin Hu <gavin.hu at arm.com>
Acked-by: Jerin Jacob <jerin.jacob at caviumnetworks.com>
---
 config/arm/meson.build | 3 ++-
 mk/rte.cpuflags.mk     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/arm/meson.build b/config/arm/meson.build
index 40dbc87f7..94cca490e 100644
--- a/config/arm/meson.build
+++ b/config/arm/meson.build
@@ -158,5 +158,6 @@ endif
 message(machine_args)
 
-if cc.get_define('__ARM_NEON', args: machine_args) != ''
+if (cc.get_define('__ARM_NEON', args: machine_args) != '' or
+    cc.get_define('__aarch64__', args: machine_args) != '')
 	dpdk_conf.set('RTE_MACHINE_CPUFLAG_NEON', 1)
 	compile_time_cpuflags += ['RTE_CPUFLAG_NEON']
diff --git a/mk/rte.cpuflags.mk b/mk/rte.cpuflags.mk
index 60713137d..43ed84155 100644
--- a/mk/rte.cpuflags.mk
+++ b/mk/rte.cpuflags.mk
@@ -90,5 +90,5 @@ endif
 
 # ARM flags
-ifneq ($(filter $(AUTO_CPUFLAGS),__ARM_NEON),)
+ifneq ($(filter __ARM_NEON __aarch64__,$(AUTO_CPUFLAGS)),)
 CPUFLAGS += NEON
 endif
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-20 17:53:07.551337834 +0000
+++ 0003-build-enable-ARM-NEON-flag-when-__aarch64__-defined.patch	2018-11-20 17:53:07.000000000 +0000
@@ -1,14 +1,15 @@
-From 68acaa86ae639e3cdd94e419f546045a1b0ce6ca Mon Sep 17 00:00:00 2001
+From c968864af7328c22849e40c2b7bac93359077804 Mon Sep 17 00:00:00 2001
 From: Honnappa Nagarahalli <honnappa.nagarahalli at arm.com>
 Date: Sun, 2 Sep 2018 13:35:28 -0500
 Subject: [PATCH] build: enable ARM NEON flag when __aarch64__ defined
 
+[ upstream commit 68acaa86ae639e3cdd94e419f546045a1b0ce6ca ]
+
 GCC version 4.8.5 does not pre-define __ARM_NEON. NEON is not
 optional for ArmV8. Hence NEON related code can be enabled
 when __aarch64__ is defined.
 
 Bugzilla ID: 82
-Cc: stable at dpdk.org
 
 Reported-by: Raslan Darawsheh <rasland at mellanox.com>
 Reported-by: Thomas F Herbert <therbert at redhat.com>