+crypto for ARMv8 now tests and modifies ${ARCH$

CMakeLists.txt

@@ -63,7 +63,7 @@ if (NOT ARCH OR ARCH STREQUAL "" OR ARCH STREQUAL "native" OR ARCH STREQUAL "def
 else()
   set(ARCH_ID "${ARCH}")
 endif()
-#string(TOLOWER ${ARCH_ID} ARM_ID)
+string(TOLOWER ${ARCH_ID} ARM_ID) #is this used anywhere?
 string(SUBSTRING ${ARCH_ID} 0 3 ARM_TEST)
 if (ARM_TEST STREQUAL "arm")
   set(ARM 1)
@@ -372,14 +372,6 @@ else()
     message(STATUS "AES support enabled")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes")
-<<<<<<< Updated upstream
-  elseif(ARM6 OR ARM7)
-    message(STATUS "AES support disabled (not available on ARMv6 or ARMv7)")
-  elseif(ARM8)
-    message(STATUS "AES support enabled for ARMv8-A")
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv8-a+crypto")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv8-a+crypto")
-=======
   elseif(ARM6)
     message(STATUS "AES support not available on ARMv6")
   elseif(ARM7)
@@ -387,12 +379,11 @@ else()
   elseif(ARM8)
     CHECK_CXX_ACCEPTS_FLAG("-march=${ARCH}+crypto" ARCH_PLUS_CRYPTO)
     if(ARCH_PLUS_CRYPTO)
-      message(STATUS "Cryptograpy extensions enabled for ARMv8")
+      message(STATUS "Crypto extensions enabled for ARMv8")
       set(ARCH_FLAG "-march=${ARCH}+crypto")
     else()
-      message(STATUS "Cryptograpy extensions unavailable on your ARMv8 device")
+      message(STATUS "Crypto extensions unavailable on your ARMv8 device")
     endif()
->>>>>>> Stashed changes
   else()
     message(STATUS "AES support disabled")
   endif()