Merge topic 'iar-asm' into release-4.1

87d95b2222 ASM: Restore CMAKE_ASM_COMPILER_ARCHITECTURE_ID persistence

Acked-by: Kitware Robot <[email protected]>
Merge-request: !11160

Modules/CMakeASMCompiler.cmake.in

@@ -18,7 +18,7 @@ set(CMAKE_ASM@ASM_DIALECT@_COMPILER_ID "@_CMAKE_ASM_COMPILER_ID@")
 set(CMAKE_ASM@ASM_DIALECT@_COMPILER_VERSION "@_CMAKE_ASM_COMPILER_VERSION@")
 set(CMAKE_ASM@ASM_DIALECT@_COMPILER_ENV_VAR "@_CMAKE_ASM_COMPILER_ENV_VAR@")
 @_SET_CMAKE_ASM_COMPILER_ID_VENDOR_MATCH@
-set(CMAKE_ASM@ASM_DIALECT@_ARCHITECTURE_ID "@_CMAKE_ASM_ARCHITECTURE_ID@")
+set(CMAKE_ASM@ASM_DIALECT@_COMPILER_ARCHITECTURE_ID "@_CMAKE_ASM_COMPILER_ARCHITECTURE_ID@")
 @_SET_CMAKE_ASM_COMPILER_SYSROOT@
 
 set(CMAKE_ASM@ASM_DIALECT@_IGNORE_EXTENSIONS h;H;o;O;obj;OBJ;def;DEF;rc;RC)

Tests/RunCMake/IAR/RunCMakeTest.cmake

@@ -13,6 +13,7 @@ function(run_toolchain case)
   run_cmake_with_options(${case} "-DPSEUDO_ICSTAT=${PSEUDO_ICSTAT}" ${ARGN})
   set(RunCMake_TEST_NO_CLEAN 1)
   set(RunCMake_TEST_OUTPUT_MERGE 1)
+  run_cmake_command(${case}-reconfig ${CMAKE_COMMAND} .)
   run_cmake_command(${case}-build ${CMAKE_COMMAND} --build .)
 endfunction()