From 5b96c03ecbed27c8c08594c68bdbf7e6c37bfc48 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Fri, 24 Jun 2016 18:43:48 -0400
Subject: [PATCH] Improve ARM feature reporting. Add S/390 identification

---
 cryptest.sh | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/cryptest.sh b/cryptest.sh
index f938dce5..02d1a20d 100755
--- a/cryptest.sh
+++ b/cryptest.sh
@@ -77,8 +77,9 @@ IS_SOLARIS=$(uname -s | "$GREP" -i -c sunos)
 IS_X86=$(uname -m | "$EGREP" -i -c "(i386|i586|i686|amd64|x86_64)")
 IS_X64=$(uname -m | "$EGREP" -i -c "(amd64|x86_64)")
 IS_PPC=$(uname -m | "$EGREP" -i -c "(Power|PPC)")
-IS_ARM32=$(uname -m | "$EGREP" -i -c "arm|aarch32")
+IS_ARM32=$(uname -m | "$GREP" -v "arm64" | "$EGREP" -i -c "arm|aarch32")
 IS_ARM64=$(uname -m | "$EGREP" -i -c "arm64|aarch64")
+IS_S390=$(uname -m | "$EGREP" -i -c "s390")
 IS_X32=0
 
 # Fixup
@@ -427,6 +428,12 @@ fi
 if [[ "$HAVE_ARM_NEON" -ne "0" ]]; then
 	echo "HAVE_ARM_NEON: $HAVE_ARM_NEON" | tee -a "$TEST_RESULTS"
 fi
+if [[ "$HAVE_ARM_CRC" -ne "0" ]]; then
+	echo "HAVE_ARM_CRC: $HAVE_ARM_CRC" | tee -a "$TEST_RESULTS"
+fi
+if [[ "$HAVE_ARM_CRYPTO" -ne "0" ]]; then
+	echo "HAVE_ARM_CRYPTO: $HAVE_ARM_CRYPTO" | tee -a "$TEST_RESULTS"
+fi
 
 if [[ "$IS_X32" -ne "0" ]]; then
     echo "IS_X32: $IS_X32" | tee -a "$TEST_RESULTS"
@@ -436,6 +443,10 @@ elif [[ "$IS_X86" -ne "0" ]]; then
 	echo "IS_X86: $IS_X86" | tee -a "$TEST_RESULTS"
 fi
 
+if [[ "$IS_S390" -ne "0" ]]; then
+    echo "IS_S390: $IS_S390" | tee -a "$TEST_RESULTS"
+fi
+
 # C++03, C++11, C++14 and C++17
 echo | tee -a "$TEST_RESULTS"
 echo "HAVE_CXX03: $HAVE_CXX03" | tee -a "$TEST_RESULTS"