diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85006e36..612214b9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -226,15 +226,17 @@ endif ()
         set(EXTRA_C_FLAGS "${EXTRA_C_FLAGS} -DNDEBUG")
         set(EXTRA_CXX_FLAGS "${EXTRA_CXX_FLAGS} -DNDEBUG")
     endif()
-    
-    if (ARCH_IA32 OR ARCH_ARM32 OR ARCH_X86_64)
-        if (NOT CMAKE_C_FLAGS MATCHES .*march.* AND NOT CMAKE_C_FLAGS MATCHES .*mtune.*)
-            set(ARCH_C_FLAGS "-march=${GNUCC_ARCH} -mtune=${TUNE_FLAG}")
-        endif()
-        if (NOT CMAKE_CXX_FLAGS MATCHES .*march.* AND NOT CMAKE_CXX_FLAGS MATCHES .*mtune.*)
-            set(ARCH_CXX_FLAGS "-march=${GNUCC_ARCH} -mtune=${TUNE_FLAG}")
-        endif()
-    elseif(ARCH_AARCH64)
+
+
+    if (NOT CMAKE_C_FLAGS MATCHES .*march.* AND NOT CMAKE_C_FLAGS MATCHES .*mtune.*)
+           set(ARCH_C_FLAGS "-march=${GNUCC_ARCH} -mtune=${TUNE_FLAG}")
+    endif()
+
+    if (NOT CMAKE_CXX_FLAGS MATCHES .*march.* AND NOT CMAKE_CXX_FLAGS MATCHES .*mtune.*)
+           set(ARCH_CXX_FLAGS "-march=${GNUCC_ARCH} -mtune=${TUNE_FLAG}")
+    endif()
+
+    if(ARCH_AARCH64)
         if (NOT CMAKE_C_FLAGS MATCHES .*march.* AND NOT CMAKE_C_FLAGS MATCHES .*mtune.*)
             set(ARCH_C_FLAGS "-mtune=${TUNE_FLAG}")
         endif()