From 30b09a96a8de54eca0e3f2b5a4cebead1e50010a Mon Sep 17 00:00:00 2001
From: Adeel <3840695+am11@users.noreply.github.com>
Date: Sun, 30 Mar 2025 15:43:30 +0300
Subject: [PATCH 1/2] Improve error handling of unknown arch

---
 eng/native/configurecompiler.cmake  | 16 ++++++++--------
 eng/native/configureplatform.cmake  | 22 +++++++++++-----------
 eng/native/functions.cmake          | 10 ----------
 src/coreclr/jit/CMakeLists.txt      |  4 ++--
 src/coreclr/unwinder/CMakeLists.txt |  2 +-
 5 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/eng/native/configurecompiler.cmake b/eng/native/configurecompiler.cmake
index e8ad8615f6d4bd..6e5ee6a34ff298 100644
--- a/eng/native/configurecompiler.cmake
+++ b/eng/native/configurecompiler.cmake
@@ -360,7 +360,7 @@ elseif (CLR_CMAKE_HOST_ARCH_POWERPC64)
   set(ARCH_HOST_NAME ppc64le)
   add_definitions(-DHOST_POWERPC64 -DHOST_64BIT)
 else ()
-  clr_unknown_arch()
+  message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
 endif ()
 
 if (CLR_CMAKE_HOST_UNIX)
@@ -384,7 +384,7 @@ if (CLR_CMAKE_HOST_UNIX)
     elseif(CLR_CMAKE_HOST_UNIX_POWERPC64)
       message("Detected Linux ppc64le")
     else()
-      clr_unknown_arch()
+      message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
     endif()
   endif(CLR_CMAKE_HOST_LINUX)
 endif(CLR_CMAKE_HOST_UNIX)
@@ -404,7 +404,7 @@ if (CLR_CMAKE_HOST_UNIX)
     elseif(CLR_CMAKE_HOST_UNIX_ARM64)
       message("Detected OSX ARM64")
     else()
-      clr_unknown_arch()
+      message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
     endif()
   elseif (CLR_CMAKE_HOST_IOS)
     add_definitions(-DHOST_APPLE)
@@ -414,7 +414,7 @@ if (CLR_CMAKE_HOST_UNIX)
     elseif(CLR_CMAKE_HOST_UNIX_ARM64)
       message("Detected iOS ARM64")
     else()
-      clr_unknown_arch()
+      message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
     endif()
   elseif (CLR_CMAKE_HOST_TVOS)
     add_definitions(-DHOST_APPLE)
@@ -424,7 +424,7 @@ if (CLR_CMAKE_HOST_UNIX)
     elseif(CLR_CMAKE_HOST_UNIX_ARM64)
       message("Detected tvOS ARM64")
     else()
-      clr_unknown_arch()
+      message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
     endif()
   elseif(CLR_CMAKE_HOST_FREEBSD)
     if(CLR_CMAKE_HOST_UNIX_ARM64)
@@ -521,7 +521,7 @@ elseif (CLR_CMAKE_TARGET_ARCH_MIPS64)
     add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:IGNORE_DEFAULT_TARGET_ARCH>>>:TARGET_MIPS64>)
     add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:IGNORE_DEFAULT_TARGET_ARCH>>>:TARGET_64BIT>)
 else ()
-    clr_unknown_arch()
+    message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
 endif ()
 
 #--------------------------------------
@@ -684,7 +684,7 @@ if (CLR_CMAKE_HOST_UNIX)
       set(CLR_CMAKE_MACCATALYST_COMPILER_TARGET "x86_64-apple-ios15.0-macabi")
       add_link_options(-target ${CLR_CMAKE_MACCATALYST_COMPILER_TARGET})
     else()
-      clr_unknown_arch()
+      message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
     endif()
     # These options are intentionally set using the CMAKE_XXX_FLAGS instead of
     # add_compile_options so that they take effect on the configuration functions
@@ -701,7 +701,7 @@ if (CLR_CMAKE_HOST_UNIX)
     elseif(CLR_CMAKE_HOST_ARCH_AMD64)
       add_compile_options(-arch x86_64)
     else()
-      clr_unknown_arch()
+      message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
     endif()
   endif(CLR_CMAKE_HOST_MACCATALYST)
 
diff --git a/eng/native/configureplatform.cmake b/eng/native/configureplatform.cmake
index b04bfc9ca1397c..0f8bb54cecbd8d 100644
--- a/eng/native/configureplatform.cmake
+++ b/eng/native/configureplatform.cmake
@@ -32,7 +32,7 @@ if(CLR_CMAKE_HOST_OS STREQUAL linux)
         elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL riscv64)
             set(CLR_CMAKE_HOST_UNIX_RISCV64 1)
         else()
-            clr_unknown_arch()
+            message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
         endif()
     else()
         # CMAKE_SYSTEM_PROCESSOR returns the value of `uname -p` on target.
@@ -67,7 +67,7 @@ if(CLR_CMAKE_HOST_OS STREQUAL linux)
         elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL mips64)
             set(CLR_CMAKE_HOST_UNIX_MIPS64 1)
         else()
-            clr_unknown_arch()
+            message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
         endif()
     endif()
     set(CLR_CMAKE_HOST_LINUX 1)
@@ -111,7 +111,7 @@ if(CLR_CMAKE_HOST_OS STREQUAL darwin)
     elseif(CMAKE_OSX_ARCHITECTURES STREQUAL arm64)
         set(CLR_CMAKE_HOST_UNIX_ARM64 1)
     else()
-        clr_unknown_arch()
+        message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
     endif()
     set(CMAKE_ASM_COMPILE_OBJECT "${CMAKE_C_COMPILER} <FLAGS> <DEFINES> <INCLUDES> -o <OBJECT> -c <SOURCE>")
 endif(CLR_CMAKE_HOST_OS STREQUAL darwin)
@@ -129,7 +129,7 @@ if(CLR_CMAKE_HOST_OS STREQUAL ios OR CLR_CMAKE_HOST_OS STREQUAL iossimulator)
     elseif(CMAKE_OSX_ARCHITECTURES MATCHES "arm64")
         set(CLR_CMAKE_HOST_UNIX_ARM64 1)
     else()
-        clr_unknown_arch()
+        message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
     endif()
 endif(CLR_CMAKE_HOST_OS STREQUAL ios OR CLR_CMAKE_HOST_OS STREQUAL iossimulator)
 
@@ -142,7 +142,7 @@ if(CLR_CMAKE_HOST_OS STREQUAL tvos OR CLR_CMAKE_HOST_OS STREQUAL tvossimulator)
     elseif(CMAKE_OSX_ARCHITECTURES MATCHES "arm64")
         set(CLR_CMAKE_HOST_UNIX_ARM64 1)
     else()
-        clr_unknown_arch()
+        message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
     endif()
 endif(CLR_CMAKE_HOST_OS STREQUAL tvos OR CLR_CMAKE_HOST_OS STREQUAL tvossimulator)
 
@@ -159,7 +159,7 @@ if(CLR_CMAKE_HOST_OS STREQUAL android)
     elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL i686)
         set(CLR_CMAKE_HOST_UNIX_X86 1)
     else()
-        clr_unknown_arch()
+        message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
     endif()
 endif(CLR_CMAKE_HOST_OS STREQUAL android)
 
@@ -170,7 +170,7 @@ if(CLR_CMAKE_HOST_OS STREQUAL freebsd)
     elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL arm64)
         set(CLR_CMAKE_HOST_UNIX_ARM64 1)
     else()
-        clr_unknown_arch()
+        message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
     endif()
     set(CLR_CMAKE_HOST_FREEBSD 1)
 endif(CLR_CMAKE_HOST_OS STREQUAL freebsd)
@@ -197,7 +197,7 @@ if(CLR_CMAKE_HOST_OS STREQUAL sunos)
         set(CLR_CMAKE_HOST_UNIX_AMD64 1)
         set(CMAKE_SYSTEM_PROCESSOR "amd64")
     else()
-        clr_unknown_arch()
+        message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
     endif()
 
     EXECUTE_PROCESS(
@@ -298,7 +298,7 @@ elseif(WIN32)
     elseif(CLR_CMAKE_HOST_ARCH STREQUAL arm64)
         set(CLR_CMAKE_HOST_ARCH_ARM64 1)
     else()
-        clr_unknown_arch()
+        message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
     endif()
 endif()
 
@@ -343,7 +343,7 @@ elseif(CLR_CMAKE_TARGET_ARCH STREQUAL wasm)
 elseif(CLR_CMAKE_TARGET_ARCH STREQUAL mips64)
     set(CLR_CMAKE_TARGET_ARCH_MIPS64 1)
 else()
-    clr_unknown_arch()
+    message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
 endif()
 
 # Set TARGET architecture variables
@@ -469,7 +469,7 @@ if(CLR_CMAKE_TARGET_UNIX)
     elseif(CLR_CMAKE_TARGET_ARCH STREQUAL mips64)
         set(CLR_CMAKE_TARGET_UNIX_MIPS64 1)
     else()
-        clr_unknown_arch()
+        message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
     endif()
 endif(CLR_CMAKE_TARGET_UNIX)
 
diff --git a/eng/native/functions.cmake b/eng/native/functions.cmake
index 581dbd28fb2bad..28c55726160191 100644
--- a/eng/native/functions.cmake
+++ b/eng/native/functions.cmake
@@ -1,13 +1,3 @@
-function(clr_unknown_arch)
-    if (WIN32)
-        message(FATAL_ERROR "Only AMD64, ARM64, ARM, I386, LOONGARCH64 and RISCV64 hosts are supported. Found: ${CMAKE_SYSTEM_PROCESSOR}")
-    elseif(CLR_CROSS_COMPONENTS_BUILD)
-        message(FATAL_ERROR "Only AMD64, ARM64, I386, LOONGARCH64 and RISCV64 hosts are supported for linux cross-architecture component. Found: ${CMAKE_SYSTEM_PROCESSOR}")
-    else()
-        message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
-    endif()
-endfunction()
-
 # C to MASM include file translator
 # This is replacement for the deprecated h2inc tool that used to be part of VS.
 function(h2inc filename output)
diff --git a/src/coreclr/jit/CMakeLists.txt b/src/coreclr/jit/CMakeLists.txt
index 288edf637a6dd4..0cb32759374cf9 100644
--- a/src/coreclr/jit/CMakeLists.txt
+++ b/src/coreclr/jit/CMakeLists.txt
@@ -54,7 +54,7 @@ function(create_standalone_jit)
     set(JIT_ARCH_SOURCES ${JIT_RISCV64_SOURCES})
     set(JIT_ARCH_HEADERS ${JIT_RISCV64_HEADERS})
   else()
-    clr_unknown_arch()
+    message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
   endif()
 
   add_jit(${TARGETDETAILS_TARGET})
@@ -499,7 +499,7 @@ elseif(CLR_CMAKE_TARGET_ARCH_WASM)
   set(JIT_ARCH_SOURCES ${JIT_WASM32_SOURCES})
   set(JIT_ARCH_HEADERS ${JIT_WASM32_HEADERS})
 else()
-  clr_unknown_arch()
+  message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
 endif()
 
 
diff --git a/src/coreclr/unwinder/CMakeLists.txt b/src/coreclr/unwinder/CMakeLists.txt
index 01c7bca64a7888..f6f0ab581c23ff 100644
--- a/src/coreclr/unwinder/CMakeLists.txt
+++ b/src/coreclr/unwinder/CMakeLists.txt
@@ -72,7 +72,7 @@ function(create_platform_unwinder)
   elseif(TARGETDETAILS_ARCH STREQUAL "arm64")
     set(ARCH_SOURCES_DIR arm64)
   else()
-    clr_unknown_arch()
+    message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
   endif()
 
   set(UNWINDER_SOURCES ${ARCH_SOURCES_DIR}/unwinder.cpp)

From 0997a61818d1acf23071e7b07cb36d2c9a06c64d Mon Sep 17 00:00:00 2001
From: Adeel <3840695+am11@users.noreply.github.com>
Date: Wed, 2 Apr 2025 18:43:09 +0300
Subject: [PATCH 2/2] Address CR feedback

---
 eng/native/configurecompiler.cmake  | 16 ++++++++--------
 eng/native/configureplatform.cmake  | 22 +++++++++++-----------
 eng/native/functions.cmake          |  4 ++++
 src/coreclr/jit/CMakeLists.txt      |  4 ++--
 src/coreclr/unwinder/CMakeLists.txt |  2 +-
 5 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/eng/native/configurecompiler.cmake b/eng/native/configurecompiler.cmake
index 6e5ee6a34ff298..e8ad8615f6d4bd 100644
--- a/eng/native/configurecompiler.cmake
+++ b/eng/native/configurecompiler.cmake
@@ -360,7 +360,7 @@ elseif (CLR_CMAKE_HOST_ARCH_POWERPC64)
   set(ARCH_HOST_NAME ppc64le)
   add_definitions(-DHOST_POWERPC64 -DHOST_64BIT)
 else ()
-  message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
+  clr_unknown_arch()
 endif ()
 
 if (CLR_CMAKE_HOST_UNIX)
@@ -384,7 +384,7 @@ if (CLR_CMAKE_HOST_UNIX)
     elseif(CLR_CMAKE_HOST_UNIX_POWERPC64)
       message("Detected Linux ppc64le")
     else()
-      message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
+      clr_unknown_arch()
     endif()
   endif(CLR_CMAKE_HOST_LINUX)
 endif(CLR_CMAKE_HOST_UNIX)
@@ -404,7 +404,7 @@ if (CLR_CMAKE_HOST_UNIX)
     elseif(CLR_CMAKE_HOST_UNIX_ARM64)
       message("Detected OSX ARM64")
     else()
-      message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
+      clr_unknown_arch()
     endif()
   elseif (CLR_CMAKE_HOST_IOS)
     add_definitions(-DHOST_APPLE)
@@ -414,7 +414,7 @@ if (CLR_CMAKE_HOST_UNIX)
     elseif(CLR_CMAKE_HOST_UNIX_ARM64)
       message("Detected iOS ARM64")
     else()
-      message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
+      clr_unknown_arch()
     endif()
   elseif (CLR_CMAKE_HOST_TVOS)
     add_definitions(-DHOST_APPLE)
@@ -424,7 +424,7 @@ if (CLR_CMAKE_HOST_UNIX)
     elseif(CLR_CMAKE_HOST_UNIX_ARM64)
       message("Detected tvOS ARM64")
     else()
-      message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
+      clr_unknown_arch()
     endif()
   elseif(CLR_CMAKE_HOST_FREEBSD)
     if(CLR_CMAKE_HOST_UNIX_ARM64)
@@ -521,7 +521,7 @@ elseif (CLR_CMAKE_TARGET_ARCH_MIPS64)
     add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:IGNORE_DEFAULT_TARGET_ARCH>>>:TARGET_MIPS64>)
     add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:IGNORE_DEFAULT_TARGET_ARCH>>>:TARGET_64BIT>)
 else ()
-    message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
+    clr_unknown_arch()
 endif ()
 
 #--------------------------------------
@@ -684,7 +684,7 @@ if (CLR_CMAKE_HOST_UNIX)
       set(CLR_CMAKE_MACCATALYST_COMPILER_TARGET "x86_64-apple-ios15.0-macabi")
       add_link_options(-target ${CLR_CMAKE_MACCATALYST_COMPILER_TARGET})
     else()
-      message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
+      clr_unknown_arch()
     endif()
     # These options are intentionally set using the CMAKE_XXX_FLAGS instead of
     # add_compile_options so that they take effect on the configuration functions
@@ -701,7 +701,7 @@ if (CLR_CMAKE_HOST_UNIX)
     elseif(CLR_CMAKE_HOST_ARCH_AMD64)
       add_compile_options(-arch x86_64)
     else()
-      message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
+      clr_unknown_arch()
     endif()
   endif(CLR_CMAKE_HOST_MACCATALYST)
 
diff --git a/eng/native/configureplatform.cmake b/eng/native/configureplatform.cmake
index 0f8bb54cecbd8d..b04bfc9ca1397c 100644
--- a/eng/native/configureplatform.cmake
+++ b/eng/native/configureplatform.cmake
@@ -32,7 +32,7 @@ if(CLR_CMAKE_HOST_OS STREQUAL linux)
         elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL riscv64)
             set(CLR_CMAKE_HOST_UNIX_RISCV64 1)
         else()
-            message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
+            clr_unknown_arch()
         endif()
     else()
         # CMAKE_SYSTEM_PROCESSOR returns the value of `uname -p` on target.
@@ -67,7 +67,7 @@ if(CLR_CMAKE_HOST_OS STREQUAL linux)
         elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL mips64)
             set(CLR_CMAKE_HOST_UNIX_MIPS64 1)
         else()
-            message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
+            clr_unknown_arch()
         endif()
     endif()
     set(CLR_CMAKE_HOST_LINUX 1)
@@ -111,7 +111,7 @@ if(CLR_CMAKE_HOST_OS STREQUAL darwin)
     elseif(CMAKE_OSX_ARCHITECTURES STREQUAL arm64)
         set(CLR_CMAKE_HOST_UNIX_ARM64 1)
     else()
-        message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
+        clr_unknown_arch()
     endif()
     set(CMAKE_ASM_COMPILE_OBJECT "${CMAKE_C_COMPILER} <FLAGS> <DEFINES> <INCLUDES> -o <OBJECT> -c <SOURCE>")
 endif(CLR_CMAKE_HOST_OS STREQUAL darwin)
@@ -129,7 +129,7 @@ if(CLR_CMAKE_HOST_OS STREQUAL ios OR CLR_CMAKE_HOST_OS STREQUAL iossimulator)
     elseif(CMAKE_OSX_ARCHITECTURES MATCHES "arm64")
         set(CLR_CMAKE_HOST_UNIX_ARM64 1)
     else()
-        message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
+        clr_unknown_arch()
     endif()
 endif(CLR_CMAKE_HOST_OS STREQUAL ios OR CLR_CMAKE_HOST_OS STREQUAL iossimulator)
 
@@ -142,7 +142,7 @@ if(CLR_CMAKE_HOST_OS STREQUAL tvos OR CLR_CMAKE_HOST_OS STREQUAL tvossimulator)
     elseif(CMAKE_OSX_ARCHITECTURES MATCHES "arm64")
         set(CLR_CMAKE_HOST_UNIX_ARM64 1)
     else()
-        message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
+        clr_unknown_arch()
     endif()
 endif(CLR_CMAKE_HOST_OS STREQUAL tvos OR CLR_CMAKE_HOST_OS STREQUAL tvossimulator)
 
@@ -159,7 +159,7 @@ if(CLR_CMAKE_HOST_OS STREQUAL android)
     elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL i686)
         set(CLR_CMAKE_HOST_UNIX_X86 1)
     else()
-        message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
+        clr_unknown_arch()
     endif()
 endif(CLR_CMAKE_HOST_OS STREQUAL android)
 
@@ -170,7 +170,7 @@ if(CLR_CMAKE_HOST_OS STREQUAL freebsd)
     elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL arm64)
         set(CLR_CMAKE_HOST_UNIX_ARM64 1)
     else()
-        message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
+        clr_unknown_arch()
     endif()
     set(CLR_CMAKE_HOST_FREEBSD 1)
 endif(CLR_CMAKE_HOST_OS STREQUAL freebsd)
@@ -197,7 +197,7 @@ if(CLR_CMAKE_HOST_OS STREQUAL sunos)
         set(CLR_CMAKE_HOST_UNIX_AMD64 1)
         set(CMAKE_SYSTEM_PROCESSOR "amd64")
     else()
-        message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
+        clr_unknown_arch()
     endif()
 
     EXECUTE_PROCESS(
@@ -298,7 +298,7 @@ elseif(WIN32)
     elseif(CLR_CMAKE_HOST_ARCH STREQUAL arm64)
         set(CLR_CMAKE_HOST_ARCH_ARM64 1)
     else()
-        message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
+        clr_unknown_arch()
     endif()
 endif()
 
@@ -343,7 +343,7 @@ elseif(CLR_CMAKE_TARGET_ARCH STREQUAL wasm)
 elseif(CLR_CMAKE_TARGET_ARCH STREQUAL mips64)
     set(CLR_CMAKE_TARGET_ARCH_MIPS64 1)
 else()
-    message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
+    clr_unknown_arch()
 endif()
 
 # Set TARGET architecture variables
@@ -469,7 +469,7 @@ if(CLR_CMAKE_TARGET_UNIX)
     elseif(CLR_CMAKE_TARGET_ARCH STREQUAL mips64)
         set(CLR_CMAKE_TARGET_UNIX_MIPS64 1)
     else()
-        message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
+        clr_unknown_arch()
     endif()
 endif(CLR_CMAKE_TARGET_UNIX)
 
diff --git a/eng/native/functions.cmake b/eng/native/functions.cmake
index 28c55726160191..05c09a2a6fcaf4 100644
--- a/eng/native/functions.cmake
+++ b/eng/native/functions.cmake
@@ -1,3 +1,7 @@
+function(clr_unknown_arch)
+    message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
+endfunction()
+
 # C to MASM include file translator
 # This is replacement for the deprecated h2inc tool that used to be part of VS.
 function(h2inc filename output)
diff --git a/src/coreclr/jit/CMakeLists.txt b/src/coreclr/jit/CMakeLists.txt
index 0cb32759374cf9..288edf637a6dd4 100644
--- a/src/coreclr/jit/CMakeLists.txt
+++ b/src/coreclr/jit/CMakeLists.txt
@@ -54,7 +54,7 @@ function(create_standalone_jit)
     set(JIT_ARCH_SOURCES ${JIT_RISCV64_SOURCES})
     set(JIT_ARCH_HEADERS ${JIT_RISCV64_HEADERS})
   else()
-    message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
+    clr_unknown_arch()
   endif()
 
   add_jit(${TARGETDETAILS_TARGET})
@@ -499,7 +499,7 @@ elseif(CLR_CMAKE_TARGET_ARCH_WASM)
   set(JIT_ARCH_SOURCES ${JIT_WASM32_SOURCES})
   set(JIT_ARCH_HEADERS ${JIT_WASM32_HEADERS})
 else()
-  message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
+  clr_unknown_arch()
 endif()
 
 
diff --git a/src/coreclr/unwinder/CMakeLists.txt b/src/coreclr/unwinder/CMakeLists.txt
index f6f0ab581c23ff..01c7bca64a7888 100644
--- a/src/coreclr/unwinder/CMakeLists.txt
+++ b/src/coreclr/unwinder/CMakeLists.txt
@@ -72,7 +72,7 @@ function(create_platform_unwinder)
   elseif(TARGETDETAILS_ARCH STREQUAL "arm64")
     set(ARCH_SOURCES_DIR arm64)
   else()
-    message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
+    clr_unknown_arch()
   endif()
 
   set(UNWINDER_SOURCES ${ARCH_SOURCES_DIR}/unwinder.cpp)