From fd4287e4336718472598ea7bb42ee5fd82bec010 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Wed, 20 Jul 2016 03:03:01 -0400
Subject: [PATCH 1/7] Add LLVM bitcode to temporaies cleaned by 'make
 distclean' rule

---
 GNUmakefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/GNUmakefile b/GNUmakefile
index d7855da8..c45dc8ad 100755
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -521,7 +521,7 @@ endif
 distclean: clean
 	-$(RM) adhoc.cpp adhoc.cpp.copied GNUmakefile.deps benchmarks.html cryptest.txt cryptest-*.txt
 	-$(RM) CMakeCache.txt Makefile CTestTestfile.cmake cmake_install.cmake cryptopp-config-version.cmake
-	-$(RM) cryptopp.tgz *.o *.ii *.s *~
+	-$(RM) cryptopp.tgz *.o *.bc *.ii *.s *~
 ifneq ($(wildcard CMakeFiles/),)
 	-$(RM) -r CMakeFiles/
 endif
@@ -746,6 +746,9 @@ endif
 %.export.o : %.cpp
 	$(CXX) $(CXXFLAGS) -DCRYPTOPP_EXPORTS -c $< -o $@
 
+%.bc : %.cpp
+	$(CXX) $(CXXFLAGS) -c $<
+
 %.o : %.cpp
 	$(CXX) $(CXXFLAGS) -c $<
 

From 9cdeb3ce8e3a5a2d6fcc1825bea0b3b34fa7dea5 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Wed, 20 Jul 2016 05:30:39 -0400
Subject: [PATCH 2/7] Added VFPU options for ARM. Remove AES intrinsics from
 SunCC 12.3 due to failures in CTR, CCM and GCM modes. Other modes are OK

---
 cryptest.sh | 40 +++++++++++++++++++++++++++++++---------
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/cryptest.sh b/cryptest.sh
index 0d7d02f9..f36e7c86 100755
--- a/cryptest.sh
+++ b/cryptest.sh
@@ -510,6 +510,14 @@ if [[ ("$IS_ARM32" -ne "0" || "$IS_ARM64" -ne "0") ]]; then
 		HAVE_ARMV7A=$(echo "$ARM_FEATURES" | "$GREP" -i -c 'neon')
 	fi
 
+	if [[ (-z "$HAVE_ARM_VFPV3") ]]; then
+		HAVE_ARM_VFPV3=$(echo "$ARM_FEATURES" | "$GREP" -i -c 'vfpv3')
+	fi
+
+	if [[ (-z "$HAVE_ARM_VFPV4") ]]; then
+		HAVE_ARM_VFPV4=$(echo "$ARM_FEATURES" | "$GREP" -i -c 'vfpv4')
+	fi
+
 	if [[ (-z "$HAVE_ARM_NEON") ]]; then
 		HAVE_ARM_NEON=$(echo "$ARM_FEATURES" | "$GREP" -i -c 'neon')
 	fi
@@ -609,6 +617,12 @@ fi
 if [[ "$HAVE_ARM_NEON" -ne "0" ]]; then
 	echo "HAVE_ARM_NEON: $HAVE_ARM_NEON" | tee -a "$TEST_RESULTS"
 fi
+if [[ "$HAVE_ARM_VFPV3" -ne "0" ]]; then
+	echo "HAVE_ARM_VFPV3: $HAVE_ARM_VFPV3" | tee -a "$TEST_RESULTS"
+fi
+if [[ "$HAVE_ARM_VFPV4" -ne "0" ]]; then
+	echo "HAVE_ARM_VFPV4: $HAVE_ARM_VFPV4" | tee -a "$TEST_RESULTS"
+fi
 if [[ "$HAVE_ARM_CRC" -ne "0" ]]; then
 	echo "HAVE_ARM_CRC: $HAVE_ARM_CRC" | tee -a "$TEST_RESULTS"
 fi
@@ -811,18 +825,26 @@ if [[ "$?" -eq "0" ]]; then
 	DEPRECATED_CXXFLAGS+=("-Wno-deprecated-declarations")
 fi
 
-# Add to exercise ARMv7a and NEON more thoroughly
+# Add to exercise ARMv7, ARMv7-a, VFPU and NEON more thoroughly
 if [[ ("$IS_ARM32" -ne "0") ]]; then
 	if [[ ("$HAVE_ARMV7A" -ne "0") ]]; then
 		PLATFORM_CXXFLAGS+=("-march=armv7-a ")
+	else
+		PLATFORM_CXXFLAGS+=("-march=armv7 ")
 	fi
 
 	if [[ ("$HAVE_ARM_NEON" -ne "0") ]]; then
 		PLATFORM_CXXFLAGS+=("-mfpu=neon ")
+	elif [[ ("$HAVE_ARM_VFPV4" -ne "0") ]]; then
+		PLATFORM_CXXFLAGS+=("-mfpu=vfpv4-d16 ")
+	elif [[ ("$HAVE_ARM_VFPV3" -ne "0") ]]; then
+		PLATFORM_CXXFLAGS+=("-mfpu=vfpv3-d16 ")
+	else
+		PLATFORM_CXXFLAGS+=("-mfpu=vfpv2 ")
 	fi
 fi
 
-# Add to exercise ARMv8 more thoroughly. NEON is baked in under CPU flag asimd.
+# Add to exercise ARMv8 more thoroughly. NEON is baked into the CPU asimd flag.
 if [[ ("$IS_ARM64" -ne "0") ]]; then
 	if [[ ("$HAVE_ARM_CRC" -ne "0" && "$HAVE_ARM_CRYPTO" -ne "0") ]]; then
 		PLATFORM_CXXFLAGS+=("-march=armv8-a+crc+crypto ")
@@ -2671,13 +2693,13 @@ if [[ "$IS_SOLARIS" -ne "0" ]]; then
 		SUNCC_CXXFLAGS="${PLATFORM_CXXFLAGS[@]}"
 	fi
 
+	# Sun Studio 12.3 and below workaround, http://github.com/weidai11/cryptopp/issues/228
+	SUNCC_SSE_CXXFLAGS=$(echo "$SUNCC_CXXFLAGS" | "$AWK" '/SSE/' ORS=' ' RS=' ')
+
 	############################################
 	# Sun Studio 12.2
 	if [[ (-e "/opt/solstudio12.2/bin/CC") ]]; then
 
-		# Sun Studio 12.2 and below workaround, http://github.com/weidai11/cryptopp/issues/228
-		SUNCC_122_CXXFLAGS=$(echo "$SUNCC_CXXFLAGS" | "$AWK" '/SSE/' ORS=' ' RS=' ')
-
 		############################################
 		# Debug build
 		echo
@@ -2688,7 +2710,7 @@ if [[ "$IS_SOLARIS" -ne "0" ]]; then
 		"$MAKE" clean > /dev/null 2>&1
 		rm -f adhoc.cpp > /dev/null 2>&1
 
-		CXXFLAGS="-DDEBUG -g -xO0 $SUNCC_122_CXXFLAGS"
+		CXXFLAGS="-DDEBUG -g -xO0 $SUNCC_SSE_CXXFLAGS"
 		CXX=/opt/solstudio12.2/bin/CC CXXFLAGS="$CXXFLAGS" "$MAKE" "${MAKEARGS[@]}" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS"
 
 		if [[ ("${PIPESTATUS[0]}" -ne "0") ]]; then
@@ -2714,7 +2736,7 @@ if [[ "$IS_SOLARIS" -ne "0" ]]; then
 		"$MAKE" clean > /dev/null 2>&1
 		rm -f adhoc.cpp > /dev/null 2>&1
 
-		CXXFLAGS="-DNDEBUG -g0 -xO2 $SUNCC_122_CXXFLAGS"
+		CXXFLAGS="-DNDEBUG -g0 -xO2 $SUNCC_SSE_CXXFLAGS"
 		CXX=/opt/solstudio12.2/bin/CC CXXFLAGS="$CXXFLAGS" "$MAKE" "${MAKEARGS[@]}" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS"
 
 		if [[ ("${PIPESTATUS[0]}" -ne "0") ]]; then
@@ -2745,7 +2767,7 @@ if [[ "$IS_SOLARIS" -ne "0" ]]; then
 		"$MAKE" clean > /dev/null 2>&1
 		rm -f adhoc.cpp > /dev/null 2>&1
 
-		CXXFLAGS="-DDEBUG -g3 -xO0 $SUNCC_CXXFLAGS"
+		CXXFLAGS="-DDEBUG -g3 -xO0 $SUNCC_SSE_CXXFLAGS"
 		CXX=/opt/solarisstudio12.3/bin/CC CXXFLAGS="$CXXFLAGS" "$MAKE" "${MAKEARGS[@]}" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS"
 
 		if [[ ("${PIPESTATUS[0]}" -ne "0") ]]; then
@@ -2771,7 +2793,7 @@ if [[ "$IS_SOLARIS" -ne "0" ]]; then
 		"$MAKE" clean > /dev/null 2>&1
 		rm -f adhoc.cpp > /dev/null 2>&1
 
-		CXXFLAGS="-DNDEBUG -g3 -xO2 $SUNCC_CXXFLAGS"
+		CXXFLAGS="-DNDEBUG -g3 -xO2 $SUNCC_SSE_CXXFLAGS"
 		CXX=/opt/solarisstudio12.3/bin/CC CXXFLAGS="$CXXFLAGS" "$MAKE" "${MAKEARGS[@]}" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS"
 
 		if [[ ("${PIPESTATUS[0]}" -ne "0") ]]; then

From e7e61e8f9ec5e36de60c051183d9b582b7759e7d Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Wed, 20 Jul 2016 09:49:06 -0400
Subject: [PATCH 3/7] Add ARM floating point ABI detection

---
 cryptest.sh | 79 ++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 54 insertions(+), 25 deletions(-)

diff --git a/cryptest.sh b/cryptest.sh
index f36e7c86..086fff4f 100755
--- a/cryptest.sh
+++ b/cryptest.sh
@@ -522,6 +522,10 @@ if [[ ("$IS_ARM32" -ne "0" || "$IS_ARM64" -ne "0") ]]; then
 		HAVE_ARM_NEON=$(echo "$ARM_FEATURES" | "$GREP" -i -c 'neon')
 	fi
 
+	if [[ (-z "$HAVE_ARM_ASIMD") ]]; then
+		HAVE_ARM_ASIMD=$(echo "$ARM_FEATURES" | "$GREP" -i -c 'asimd')
+	fi
+
 	if [[ (-z "$HAVE_ARM_CRYPTO") ]]; then
 		HAVE_ARM_CRYPTO=$(echo "$ARM_FEATURES" | "$EGREP" -i -c '(aes|pmull|sha1|sha2)')
 	fi
@@ -609,7 +613,9 @@ if [[ "$IS_ARM64" -ne "0" ]]; then
 elif [[ "$IS_ARM32" -ne "0" ]]; then
 	echo "IS_ARM32: $IS_ARM32" | tee -a "$TEST_RESULTS"
 fi
-if [[ "$HAVE_ARMV7A" -ne "0" ]]; then
+if [[ "$HAVE_ARMV7" -ne "0" ]]; then
+	echo "HAVE_ARMV7: $HAVE_ARMV7" | tee -a "$TEST_RESULTS"
+elif [[ "$HAVE_ARMV7A" -ne "0" ]]; then
 	echo "HAVE_ARMV7A: $HAVE_ARMV7A" | tee -a "$TEST_RESULTS"
 elif [[ "$HAVE_ARMV8A" -ne "0" ]]; then
 	echo "HAVE_ARMV8A: $HAVE_ARMV8A" | tee -a "$TEST_RESULTS"
@@ -623,6 +629,9 @@ fi
 if [[ "$HAVE_ARM_VFPV4" -ne "0" ]]; then
 	echo "HAVE_ARM_VFPV4: $HAVE_ARM_VFPV4" | tee -a "$TEST_RESULTS"
 fi
+if [[ ("$HAVE_ARM_ASIMD" -ne "0") ]]; then
+	echo "HAVE_ARM_ASIMD: $HAVE_ARM_ASIMD" | tee -a "$TEST_RESULTS"
+fi
 if [[ "$HAVE_ARM_CRC" -ne "0" ]]; then
 	echo "HAVE_ARM_CRC: $HAVE_ARM_CRC" | tee -a "$TEST_RESULTS"
 fi
@@ -825,33 +834,53 @@ if [[ "$?" -eq "0" ]]; then
 	DEPRECATED_CXXFLAGS+=("-Wno-deprecated-declarations")
 fi
 
-# Add to exercise ARMv7, ARMv7-a, VFPU and NEON more thoroughly
-if [[ ("$IS_ARM32" -ne "0") ]]; then
-	if [[ ("$HAVE_ARMV7A" -ne "0") ]]; then
-		PLATFORM_CXXFLAGS+=("-march=armv7-a ")
-	else
-		PLATFORM_CXXFLAGS+=("-march=armv7 ")
+# Please, someone put an end to the madness of determining Features, ABI, hard floats and soft floats...
+if [[ ("$IS_ARM32" -ne "0" || "$IS_ARM64" -ne "0") ]]; then
+
+	# Add to exercise ARMv7, ARMv7-a, VFPU and NEON more thoroughly
+	if [[ ("$IS_ARM32" -ne "0") ]]; then
+		if [[ ("$HAVE_ARMV7A" -ne "0") ]]; then
+			PLATFORM_CXXFLAGS+=("-march=armv7-a ")
+		else
+			PLATFORM_CXXFLAGS+=("-march=armv7 ")
+		fi
+
+		# http://community.arm.com/groups/tools/blog/2013/04/15/arm-cortex-a-processors-and-gcc-command-lines
+		#  These may need more tuning. If it was easy to get the CPU brand name, like Cortex-A9, then we could
+		#  be fairly certain of the FPU and ABI flags. But we can't easily get a CPU name, so we suffer through it.
+		if [[ ("$HAVE_ARM_NEON" -ne "0" && "$HAVE_ARM_VFPV4" -ne "0") ]]; then
+			PLATFORM_CXXFLAGS+=("-mfpu=neon-vfpv4 ")
+		elif [[ ("$HAVE_ARM_NEON" -ne "0" && "$HAVE_ARM_VFPV3" -ne "0") ]]; then
+			PLATFORM_CXXFLAGS+=("-mfpu=neon-fp16 ")
+		elif [[ ("$HAVE_ARM_NEON" -ne "0") ]]; then
+			PLATFORM_CXXFLAGS+=("-mfpu=neon ")
+		elif [[ ("$HAVE_ARM_VFPV4" -ne "0") ]]; then
+			PLATFORM_CXXFLAGS+=("-mfpu=vfpv4-d16 ")
+		elif [[ ("$HAVE_ARM_VFPV3" -ne "0") ]]; then
+			PLATFORM_CXXFLAGS+=("-mfpu=vfpv3-d16 ")
+		fi
 	fi
 
-	if [[ ("$HAVE_ARM_NEON" -ne "0") ]]; then
-		PLATFORM_CXXFLAGS+=("-mfpu=neon ")
-	elif [[ ("$HAVE_ARM_VFPV4" -ne "0") ]]; then
-		PLATFORM_CXXFLAGS+=("-mfpu=vfpv4-d16 ")
-	elif [[ ("$HAVE_ARM_VFPV3" -ne "0") ]]; then
-		PLATFORM_CXXFLAGS+=("-mfpu=vfpv3-d16 ")
-	else
-		PLATFORM_CXXFLAGS+=("-mfpu=vfpv2 ")
-	fi
-fi
+	# Add to exercise ARMv8 more thoroughly. NEON is baked into the CPU asimd flag.
+	if [[ ("$IS_ARM64" -ne "0") ]]; then
+		if [[ ("$HAVE_ARM_CRC" -ne "0" && "$HAVE_ARM_CRYPTO" -ne "0") ]]; then
+			PLATFORM_CXXFLAGS+=("-march=armv8-a+crc+crypto ")
+		elif [[ ("$HAVE_ARM_CRC" -ne "0") ]]; then
+			PLATFORM_CXXFLAGS+=("-march=armv8-a+crc ")
+		elif [[ ("$HAVE_ARM_CRYPTO" -ne "0") ]]; then
+			PLATFORM_CXXFLAGS+=("-march=armv8-a+crypto ")
+		fi
 
-# Add to exercise ARMv8 more thoroughly. NEON is baked into the CPU asimd flag.
-if [[ ("$IS_ARM64" -ne "0") ]]; then
-	if [[ ("$HAVE_ARM_CRC" -ne "0" && "$HAVE_ARM_CRYPTO" -ne "0") ]]; then
-		PLATFORM_CXXFLAGS+=("-march=armv8-a+crc+crypto ")
-	elif [[ ("$HAVE_ARM_CRC" -ne "0") ]]; then
-		PLATFORM_CXXFLAGS+=("-march=armv8-a+crc ")
-	elif [[ ("$HAVE_ARM_CRYPTO" -ne "0") ]]; then
-		PLATFORM_CXXFLAGS+=("-march=armv8-a+crypto ")
+		if [[ ("$HAVE_ARM_ASIMD" -ne "0") ]]; then
+			PLATFORM_CXXFLAGS+=("-mfpu=neon-fp-armv8 ")
+		fi
+	fi
+
+	ARM_HARD_FLOAT=$("$CXX" -v 2>&1 | "$GREP" 'Target' | "$EGREP" -i -c '(armhf|gnueabihf)')
+	if [[ ("$ARM_HARD_FLOAT" -ne "0") ]]; then
+		PLATFORM_CXXFLAGS+=("-mfloat-abi=hard ")
+	else
+		PLATFORM_CXXFLAGS+=("-mfloat-abi=softfp ")
 	fi
 fi
 

From 5bc1f5bfd1f92fe64b506ba019dd2eaef0efcf40 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Wed, 20 Jul 2016 09:54:03 -0400
Subject: [PATCH 4/7] Add -DCRYPTOPP_NO_UNALIGNED_DATA_ACCESS for -Ofast
 testing since it auto-vectorizes under GCC

---
 cryptest.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cryptest.sh b/cryptest.sh
index 086fff4f..9fa6cca6 100755
--- a/cryptest.sh
+++ b/cryptest.sh
@@ -2212,7 +2212,7 @@ if [[ "$HAVE_OFAST" -ne "0" ]]; then
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
-	CXXFLAGS="-DDEBUG $OPT_OFAST ${PLATFORM_CXXFLAGS[@]} ${RETAINED_CXXFLAGS[@]} ${DEPRECATED_CXXFLAGS[@]}"
+	CXXFLAGS="-DDEBUG $OPT_OFAST -DCRYPTOPP_NO_UNALIGNED_DATA_ACCESS ${PLATFORM_CXXFLAGS[@]} ${RETAINED_CXXFLAGS[@]} ${DEPRECATED_CXXFLAGS[@]}"
 	CXX="$CXX" CXXFLAGS="$CXXFLAGS" "$MAKE" "${MAKEARGS[@]}" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS"
 
 	if [[ ("${PIPESTATUS[0]}" -ne "0") ]]; then
@@ -2238,7 +2238,7 @@ if [[ "$HAVE_OFAST" -ne "0" ]]; then
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
 
-	CXXFLAGS="-DNDEBUG $OPT_OFAST ${PLATFORM_CXXFLAGS[@]} ${RETAINED_CXXFLAGS[@]} ${DEPRECATED_CXXFLAGS[@]}"
+	CXXFLAGS="-DNDEBUG $OPT_OFAST -DCRYPTOPP_NO_UNALIGNED_DATA_ACCESS ${PLATFORM_CXXFLAGS[@]} ${RETAINED_CXXFLAGS[@]} ${DEPRECATED_CXXFLAGS[@]}"
 	CXX="$CXX" CXXFLAGS="$CXXFLAGS" "$MAKE" "${MAKEARGS[@]}" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS"
 
 	if [[ ("${PIPESTATUS[0]}" -ne "0") ]]; then

From 9f9b050c7f8af7b30865ba5356b36ddd0ab3adb0 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Wed, 20 Jul 2016 10:31:00 -0400
Subject: [PATCH 5/7] Remove soft-float from ARMv8

---
 cryptest.sh | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/cryptest.sh b/cryptest.sh
index 9fa6cca6..4eeee9bf 100755
--- a/cryptest.sh
+++ b/cryptest.sh
@@ -859,6 +859,15 @@ if [[ ("$IS_ARM32" -ne "0" || "$IS_ARM64" -ne "0") ]]; then
 		elif [[ ("$HAVE_ARM_VFPV3" -ne "0") ]]; then
 			PLATFORM_CXXFLAGS+=("-mfpu=vfpv3-d16 ")
 		fi
+
+		# Soft/Hard floats only apply to 32-bit ARM
+		# http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.faqs/ka16242.html
+		ARM_HARD_FLOAT=$("$CXX" -v 2>&1 | "$GREP" 'Target' | "$EGREP" -i -c '(armhf|gnueabihf)')
+		if [[ ("$ARM_HARD_FLOAT" -ne "0") ]]; then
+			PLATFORM_CXXFLAGS+=("-mfloat-abi=hard ")
+		else
+			PLATFORM_CXXFLAGS+=("-mfloat-abi=softfp ")
+		fi
 	fi
 
 	# Add to exercise ARMv8 more thoroughly. NEON is baked into the CPU asimd flag.
@@ -875,13 +884,6 @@ if [[ ("$IS_ARM32" -ne "0" || "$IS_ARM64" -ne "0") ]]; then
 			PLATFORM_CXXFLAGS+=("-mfpu=neon-fp-armv8 ")
 		fi
 	fi
-
-	ARM_HARD_FLOAT=$("$CXX" -v 2>&1 | "$GREP" 'Target' | "$EGREP" -i -c '(armhf|gnueabihf)')
-	if [[ ("$ARM_HARD_FLOAT" -ne "0") ]]; then
-		PLATFORM_CXXFLAGS+=("-mfloat-abi=hard ")
-	else
-		PLATFORM_CXXFLAGS+=("-mfloat-abi=softfp ")
-	fi
 fi
 
 if [[ ("$IS_SOLARIS" -ne "0") && ("$SUNCC_121_OR_ABOVE" -ne "0") ]]; then

From e0ca095144adf49e3cc7b65d885b220279f32eca Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Wed, 20 Jul 2016 11:15:03 -0400
Subject: [PATCH 6/7] =?UTF-8?q?Fix=20"unrecognized=20command=20line=20opti?=
 =?UTF-8?q?on=20=E2=80=98-mfpu=3Dneon-fp-armv8"=20under=20GCC=204.8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cryptest.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cryptest.sh b/cryptest.sh
index 4eeee9bf..4fca4dd6 100755
--- a/cryptest.sh
+++ b/cryptest.sh
@@ -177,6 +177,7 @@ fi
 GCC_60_OR_ABOVE=$("$CXX" -v 2>&1 | "$EGREP" -i -c 'gcc version (6\.[0-9]|[7-9])')
 GCC_51_OR_ABOVE=$("$CXX" -v 2>&1 | "$EGREP" -i -c 'gcc version (5\.[1-9]|[6-9])')
 GCC_48_COMPILER=$("$CXX" -v 2>&1 | "$EGREP" -i -c 'gcc version 4\.8')
+GCC_49_OR_ABOVE=$("$CXX" -v 2>&1 | "$EGREP" -i -c 'gcc version (4\.9|[5-9]\.[0-9])')
 SUNCC_121_OR_ABOVE=$("$CXX" -V 2>&1 | "$EGREP" -c "CC: (Sun|Studio) .* (5\.1[0-9]|5\.[2-9]|[6-9]\.)")
 
 # Fixup
@@ -880,7 +881,7 @@ if [[ ("$IS_ARM32" -ne "0" || "$IS_ARM64" -ne "0") ]]; then
 			PLATFORM_CXXFLAGS+=("-march=armv8-a+crypto ")
 		fi
 
-		if [[ ("$HAVE_ARM_ASIMD" -ne "0") ]]; then
+		if [[ ("$GCC_49_OR_ABOVE" -ne "0" && "$HAVE_ARM_ASIMD" -ne "0") ]]; then
 			PLATFORM_CXXFLAGS+=("-mfpu=neon-fp-armv8 ")
 		fi
 	fi

From c606ea2573637cfd0ace73ab27c5d56341d66988 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Wed, 20 Jul 2016 20:08:00 -0400
Subject: [PATCH 7/7] Remove 32-bit ARMv8 FPU flags from Aarch64

---
 cryptest.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/cryptest.sh b/cryptest.sh
index 4fca4dd6..750ee890 100755
--- a/cryptest.sh
+++ b/cryptest.sh
@@ -880,10 +880,6 @@ if [[ ("$IS_ARM32" -ne "0" || "$IS_ARM64" -ne "0") ]]; then
 		elif [[ ("$HAVE_ARM_CRYPTO" -ne "0") ]]; then
 			PLATFORM_CXXFLAGS+=("-march=armv8-a+crypto ")
 		fi
-
-		if [[ ("$GCC_49_OR_ABOVE" -ne "0" && "$HAVE_ARM_ASIMD" -ne "0") ]]; then
-			PLATFORM_CXXFLAGS+=("-mfpu=neon-fp-armv8 ")
-		fi
 	fi
 fi