From 7a153ebb099925b8b3c47fd8671571ab708a10b5 Mon Sep 17 00:00:00 2001
From: Stephen Kyle <stephen.kyle@arm.com>
Date: Wed, 17 Oct 2018 16:29:32 +0100
Subject: [PATCH] make/build: ensure NEON is enabled and tested (#718)

Make sure the travis CI aarch32 bot tests NEON, and also that running
CROSS_COMPILE=arm-linux-gnueabihf make enables the use of NEON to
accelerate the back-reference copying.
---
 .travis.yml | 2 +-
 Makefile    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f300519dd..5cfeafc85 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -79,7 +79,7 @@ matrix:
     ## testing arm via qemu on Linux
     ###
     - os: linux
-      env: BUILD_SYSTEM=cmake C_COMPILER=arm-linux-gnueabihf-gcc CXX_COMPILER=arm-linux-gnueabihf-g++
+      env: BUILD_SYSTEM=cmake C_COMPILER=arm-linux-gnueabihf-gcc CXX_COMPILER=arm-linux-gnueabihf-g++ CFLAGS="-march=armv7-a -mfloat-abi=hard -mfpu=neon"
       addons:
         apt:
           sources:
diff --git a/Makefile b/Makefile
index 58e563a88..489094090 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ endif
 # The arm-linux-gnueabi compiler defaults to Armv5. Since we only support Armv7
 # and beyond, we need to select Armv7 explicitly with march.
 ifeq ($(ARCH), arm)
-	CFLAGS += -march=armv7-a
+	CFLAGS += -march=armv7-a -mfloat-abi=hard -mfpu=neon
 endif
 
 all: test