Skip to content

Commit 0997a61

Browse files
am11am11
committed
Address CR feedback
1 parent faadaf9 commit 0997a61

File tree

5 files changed

+26
-22
lines changed

5 files changed

+26
-22
lines changed

‎eng/native/configurecompiler.cmake‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ elseif (CLR_CMAKE_HOST_ARCH_POWERPC64)
360360
set(ARCH_HOST_NAME ppc64le)
361361
add_definitions(-DHOST_POWERPC64 -DHOST_64BIT)
362362
else ()
363-
message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
363+
clr_unknown_arch()
364364
endif ()
365365

366366
if (CLR_CMAKE_HOST_UNIX)
@@ -384,7 +384,7 @@ if (CLR_CMAKE_HOST_UNIX)
384384
elseif(CLR_CMAKE_HOST_UNIX_POWERPC64)
385385
message("Detected Linux ppc64le")
386386
else()
387-
message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
387+
clr_unknown_arch()
388388
endif()
389389
endif(CLR_CMAKE_HOST_LINUX)
390390
endif(CLR_CMAKE_HOST_UNIX)
@@ -404,7 +404,7 @@ if (CLR_CMAKE_HOST_UNIX)
404404
elseif(CLR_CMAKE_HOST_UNIX_ARM64)
405405
message("Detected OSX ARM64")
406406
else()
407-
message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
407+
clr_unknown_arch()
408408
endif()
409409
elseif (CLR_CMAKE_HOST_IOS)
410410
add_definitions(-DHOST_APPLE)
@@ -414,7 +414,7 @@ if (CLR_CMAKE_HOST_UNIX)
414414
elseif(CLR_CMAKE_HOST_UNIX_ARM64)
415415
message("Detected iOS ARM64")
416416
else()
417-
message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
417+
clr_unknown_arch()
418418
endif()
419419
elseif (CLR_CMAKE_HOST_TVOS)
420420
add_definitions(-DHOST_APPLE)
@@ -424,7 +424,7 @@ if (CLR_CMAKE_HOST_UNIX)
424424
elseif(CLR_CMAKE_HOST_UNIX_ARM64)
425425
message("Detected tvOS ARM64")
426426
else()
427-
message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
427+
clr_unknown_arch()
428428
endif()
429429
elseif(CLR_CMAKE_HOST_FREEBSD)
430430
if(CLR_CMAKE_HOST_UNIX_ARM64)
@@ -521,7 +521,7 @@ elseif (CLR_CMAKE_TARGET_ARCH_MIPS64)
521521
add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:IGNORE_DEFAULT_TARGET_ARCH>>>:TARGET_MIPS64>)
522522
add_compile_definitions($<$<NOT:$<BOOL:$<TARGET_PROPERTY:IGNORE_DEFAULT_TARGET_ARCH>>>:TARGET_64BIT>)
523523
else ()
524-
message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
524+
clr_unknown_arch()
525525
endif ()
526526

527527
#--------------------------------------
@@ -684,7 +684,7 @@ if (CLR_CMAKE_HOST_UNIX)
684684
set(CLR_CMAKE_MACCATALYST_COMPILER_TARGET "x86_64-apple-ios15.0-macabi")
685685
add_link_options(-target ${CLR_CMAKE_MACCATALYST_COMPILER_TARGET})
686686
else()
687-
message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
687+
clr_unknown_arch()
688688
endif()
689689
# These options are intentionally set using the CMAKE_XXX_FLAGS instead of
690690
# add_compile_options so that they take effect on the configuration functions
@@ -701,7 +701,7 @@ if (CLR_CMAKE_HOST_UNIX)
701701
elseif(CLR_CMAKE_HOST_ARCH_AMD64)
702702
add_compile_options(-arch x86_64)
703703
else()
704-
message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
704+
clr_unknown_arch()
705705
endif()
706706
endif(CLR_CMAKE_HOST_MACCATALYST)
707707

‎eng/native/configureplatform.cmake‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ if(CLR_CMAKE_HOST_OS STREQUAL linux)
3232
elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL riscv64)
3333
set(CLR_CMAKE_HOST_UNIX_RISCV64 1)
3434
else()
35-
message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
35+
clr_unknown_arch()
3636
endif()
3737
else()
3838
# CMAKE_SYSTEM_PROCESSOR returns the value of `uname -p` on target.
@@ -67,7 +67,7 @@ if(CLR_CMAKE_HOST_OS STREQUAL linux)
6767
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL mips64)
6868
set(CLR_CMAKE_HOST_UNIX_MIPS64 1)
6969
else()
70-
message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
70+
clr_unknown_arch()
7171
endif()
7272
endif()
7373
set(CLR_CMAKE_HOST_LINUX 1)
@@ -111,7 +111,7 @@ if(CLR_CMAKE_HOST_OS STREQUAL darwin)
111111
elseif(CMAKE_OSX_ARCHITECTURES STREQUAL arm64)
112112
set(CLR_CMAKE_HOST_UNIX_ARM64 1)
113113
else()
114-
message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
114+
clr_unknown_arch()
115115
endif()
116116
set(CMAKE_ASM_COMPILE_OBJECT "${CMAKE_C_COMPILER} <FLAGS> <DEFINES> <INCLUDES> -o <OBJECT> -c <SOURCE>")
117117
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)
129129
elseif(CMAKE_OSX_ARCHITECTURES MATCHES "arm64")
130130
set(CLR_CMAKE_HOST_UNIX_ARM64 1)
131131
else()
132-
message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
132+
clr_unknown_arch()
133133
endif()
134134
endif(CLR_CMAKE_HOST_OS STREQUAL ios OR CLR_CMAKE_HOST_OS STREQUAL iossimulator)
135135

@@ -142,7 +142,7 @@ if(CLR_CMAKE_HOST_OS STREQUAL tvos OR CLR_CMAKE_HOST_OS STREQUAL tvossimulator)
142142
elseif(CMAKE_OSX_ARCHITECTURES MATCHES "arm64")
143143
set(CLR_CMAKE_HOST_UNIX_ARM64 1)
144144
else()
145-
message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
145+
clr_unknown_arch()
146146
endif()
147147
endif(CLR_CMAKE_HOST_OS STREQUAL tvos OR CLR_CMAKE_HOST_OS STREQUAL tvossimulator)
148148

@@ -159,7 +159,7 @@ if(CLR_CMAKE_HOST_OS STREQUAL android)
159159
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL i686)
160160
set(CLR_CMAKE_HOST_UNIX_X86 1)
161161
else()
162-
message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
162+
clr_unknown_arch()
163163
endif()
164164
endif(CLR_CMAKE_HOST_OS STREQUAL android)
165165

@@ -170,7 +170,7 @@ if(CLR_CMAKE_HOST_OS STREQUAL freebsd)
170170
elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL arm64)
171171
set(CLR_CMAKE_HOST_UNIX_ARM64 1)
172172
else()
173-
message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
173+
clr_unknown_arch()
174174
endif()
175175
set(CLR_CMAKE_HOST_FREEBSD 1)
176176
endif(CLR_CMAKE_HOST_OS STREQUAL freebsd)
@@ -197,7 +197,7 @@ if(CLR_CMAKE_HOST_OS STREQUAL sunos)
197197
set(CLR_CMAKE_HOST_UNIX_AMD64 1)
198198
set(CMAKE_SYSTEM_PROCESSOR "amd64")
199199
else()
200-
message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
200+
clr_unknown_arch()
201201
endif()
202202

203203
EXECUTE_PROCESS(
@@ -298,7 +298,7 @@ elseif(WIN32)
298298
elseif(CLR_CMAKE_HOST_ARCH STREQUAL arm64)
299299
set(CLR_CMAKE_HOST_ARCH_ARM64 1)
300300
else()
301-
message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
301+
clr_unknown_arch()
302302
endif()
303303
endif()
304304

@@ -343,7 +343,7 @@ elseif(CLR_CMAKE_TARGET_ARCH STREQUAL wasm)
343343
elseif(CLR_CMAKE_TARGET_ARCH STREQUAL mips64)
344344
set(CLR_CMAKE_TARGET_ARCH_MIPS64 1)
345345
else()
346-
message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
346+
clr_unknown_arch()
347347
endif()
348348

349349
# Set TARGET architecture variables
@@ -469,7 +469,7 @@ if(CLR_CMAKE_TARGET_UNIX)
469469
elseif(CLR_CMAKE_TARGET_ARCH STREQUAL mips64)
470470
set(CLR_CMAKE_TARGET_UNIX_MIPS64 1)
471471
else()
472-
message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
472+
clr_unknown_arch()
473473
endif()
474474
endif(CLR_CMAKE_TARGET_UNIX)
475475

‎eng/native/functions.cmake‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
function(clr_unknown_arch)
2+
message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
3+
endfunction()
4+
15
# C to MASM include file translator
26
# This is replacement for the deprecated h2inc tool that used to be part of VS.
37
function(h2inc filename output)

‎src/coreclr/jit/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ function(create_standalone_jit)
5454
set(JIT_ARCH_SOURCES ${JIT_RISCV64_SOURCES})
5555
set(JIT_ARCH_HEADERS ${JIT_RISCV64_HEADERS})
5656
else()
57-
message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
57+
clr_unknown_arch()
5858
endif()
5959

6060
add_jit(${TARGETDETAILS_TARGET})
@@ -499,7 +499,7 @@ elseif(CLR_CMAKE_TARGET_ARCH_WASM)
499499
set(JIT_ARCH_SOURCES ${JIT_WASM32_SOURCES})
500500
set(JIT_ARCH_HEADERS ${JIT_WASM32_HEADERS})
501501
else()
502-
message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
502+
clr_unknown_arch()
503503
endif()
504504

505505

‎src/coreclr/unwinder/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ function(create_platform_unwinder)
7272
elseif(TARGETDETAILS_ARCH STREQUAL "arm64")
7373
set(ARCH_SOURCES_DIR arm64)
7474
else()
75-
message(FATAL_ERROR "'${CMAKE_SYSTEM_PROCESSOR}' is an unsupported architecture.")
75+
clr_unknown_arch()
7676
endif()
7777

7878
set(UNWINDER_SOURCES ${ARCH_SOURCES_DIR}/unwinder.cpp)

0 commit comments

Comments
 (0)