build(wamr): fix target selection

Allow building for ARM(32) and MIPS platform.

Signed-off-by: Marco Casaroli <marco.casaroli@gmail.com>

Author: casaroli

cmake/wamr.cmake

@@ -14,31 +14,24 @@ set (WAMR_BUILD_REF_TYPES 1)
 set (WASM_ENABLE_LOG 1)
 set (WAMR_BUILD_SHARED_HEAP 1)
 
-if (NOT DEFINED WAMR_BUILD_PLATFORM)
-    set (WAMR_BUILD_PLATFORM "linux")
-endif()
+set (WAMR_BUILD_PLATFORM "linux")
 
-# Set WAMR_BUILD_TARGET, currently values supported:
-# "X86_64", "AMD_64", "X86_32", "AARCH64[sub]", "ARM[sub]", "THUMB[sub]",
-# "MIPS", "XTENSA", "RISCV64[sub]", "RISCV32[sub]"
-if (NOT DEFINED WAMR_BUILD_TARGET)
-    if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm64|aarch64)")
-        set (WAMR_BUILD_TARGET "AARCH64")
-        if (NOT DEFINED WAMR_BUILD_SIMD)
-            set (WAMR_BUILD_SIMD 1)
-        endif ()
-    elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64")
-        set (WAMR_BUILD_TARGET "RISCV64")
-    elseif (CMAKE_SIZEOF_VOID_P EQUAL 8)
-        set (WAMR_BUILD_TARGET "X86_64")
-        if (NOT DEFINED WAMR_BUILD_SIMD)
-            set (WAMR_BUILD_SIMD 1)
-        endif ()
-    elseif (CMAKE_SIZEOF_VOID_P EQUAL 4)
-        set (WAMR_BUILD_TARGET "X86_32")
-    else ()
-        message(SEND_ERROR "Unsupported build target platform!")
-    endif ()
+if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm64|aarch64)")
+  set (WAMR_BUILD_TARGET "AARCH64")
+  set (WAMR_BUILD_SIMD 1)
+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm")
+  set (WAMR_BUILD_TARGET "ARM")
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64")
+  set (WAMR_BUILD_TARGET "RISCV64")
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+  set (WAMR_BUILD_TARGET "X86_64")
+  set (WAMR_BUILD_SIMD 1)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "i686")
+  set (WAMR_BUILD_TARGET "X86_32")
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "mips")
+  set (WAMR_BUILD_TARGET "MIPS")
+else ()
+  message(SEND_ERROR "Unsupported CMAKE_SYSTEM_PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}!")
 endif ()
 
 add_subdirectory(wasm-micro-runtime)