compiler/iar: Support SDK 0.18 directory layout

The iar toolchain uses some tools from the Zephyr SDK. With version
0.18, the path to the GNU generic.cmake file has moved. Adapt to that by
checking for the new location and using that if available.

Signed-off-by: Keith Packard <keithp@keithp.com>

Author: keith-packard

cmake/bintools/iar/target.cmake

@@ -8,7 +8,11 @@ include(extensions)
 # Specifically choose arm-zephyr-eabi from the zephyr sdk for objcopy and friends
 
 if("${IAR_TOOLCHAIN_VARIANT}" STREQUAL "iccarm")
-  set(IAR_ZEPHYR_HOME ${ZEPHYR_SDK_INSTALL_DIR}/arm-zephyr-eabi/bin)
+  if(EXISTS ${ZEPHYR_SDK_INSTALL_DIR}/cmake/zephyr/gnu/generic.cmake)
+    set(IAR_ZEPHYR_HOME ${ZEPHYR_SDK_INSTALL_DIR}/gnu/arm-zephyr-eabi/bin)
+  else()
+    set(IAR_ZEPHYR_HOME ${ZEPHYR_SDK_INSTALL_DIR}/arm-zephyr-eabi/bin)
+  endif()
   set(IAR_GNU_PREFIX arm-zephyr-eabi-)
 else()
   message(ERROR "IAR_TOOLCHAIN_VARIANT not set")

cmake/compiler/iar/generic.cmake

@@ -3,7 +3,11 @@
 # SPDX-License-Identifier: Apache-2.0
 
 if(NOT CMAKE_DTS_PREPROCESSOR)
-  find_program(CMAKE_DTS_PREPROCESSOR arm-zephyr-eabi-gcc PATHS ${ZEPHYR_SDK_INSTALL_DIR}/arm-zephyr-eabi/bin NO_DEFAULT_PATH)
+  if(EXISTS ${ZEPHYR_SDK_INSTALL_DIR}/cmake/zephyr/gnu/generic.cmake)
+    find_program(CMAKE_DTS_PREPROCESSOR arm-zephyr-eabi-gcc PATHS ${ZEPHYR_SDK_INSTALL_DIR}/gnu/arm-zephyr-eabi/bin NO_DEFAULT_PATH)
+  else()
+    find_program(CMAKE_DTS_PREPROCESSOR arm-zephyr-eabi-gcc PATHS ${ZEPHYR_SDK_INSTALL_DIR}/arm-zephyr-eabi/bin NO_DEFAULT_PATH)
+  endif()
 endif()
 
 if(NOT CMAKE_DTS_PREPROCESSOR)

cmake/compiler/iar/target.cmake

@@ -32,15 +32,29 @@ find_program(CMAKE_AR
 
 set(CMAKE_ASM_COMPILER)
 if("${IAR_TOOLCHAIN_VARIANT}" STREQUAL "iccarm")
-  find_program(CMAKE_ASM_COMPILER
-    arm-zephyr-eabi-gcc
-    PATHS ${ZEPHYR_SDK_INSTALL_DIR}/arm-zephyr-eabi/bin
-    NO_DEFAULT_PATH )
+  if(EXISTS ${ZEPHYR_SDK_INSTALL_DIR}/cmake/zephyr/gnu/generic.cmake)
+    find_program(CMAKE_ASM_COMPILER
+      arm-zephyr-eabi-gcc
+      PATHS ${ZEPHYR_SDK_INSTALL_DIR}/gnu/arm-zephyr-eabi/bin
+      NO_DEFAULT_PATH )
+  else()
+    find_program(CMAKE_ASM_COMPILER
+      arm-zephyr-eabi-gcc
+      PATHS ${ZEPHYR_SDK_INSTALL_DIR}/arm-zephyr-eabi/bin
+      NO_DEFAULT_PATH )
+  endif()
 else()
-  find_program(CMAKE_ASM_COMPILER
-    riscv64-zephyr-elf-gcc
-    PATHS ${ZEPHYR_SDK_INSTALL_DIR}/riscv64-zephyr-elf/bin
-    NO_DEFAULT_PATH )
+  if(EXISTS ${ZEPHYR_SDK_INSTALL_DIR}/cmake/zephyr/gnu/generic.cmake)
+    find_program(CMAKE_ASM_COMPILER
+      riscv64-zephyr-elf-gcc
+      PATHS ${ZEPHYR_SDK_INSTALL_DIR}/gnu/riscv64-zephyr-elf/bin
+      NO_DEFAULT_PATH )
+  else()
+    find_program(CMAKE_ASM_COMPILER
+      riscv64-zephyr-elf-gcc
+      PATHS ${ZEPHYR_SDK_INSTALL_DIR}/riscv64-zephyr-elf/bin
+      NO_DEFAULT_PATH )
+  endif()
 endif()
 
 message(STATUS "Found assembler ${CMAKE_ASM_COMPILER}")