diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-11 14:23:37 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-10-11 14:23:37 (GMT) |
| commit | 18f3e286521437adc3f231cc126833bdcd2c5807 (patch) | |
| tree | 6b7b86759ab63a5c567f5f569548d837b4e932fc /Modules/Compiler/IAR-ASM.cmake | |
| parent | 3709389520f091de10e2c1b7fb8350bacc3a0fb0 (diff) | |
| parent | 5652e11ea1543a9d3038bf104607bf13feb5582a (diff) | |
| download | CMake-18f3e286521437adc3f231cc126833bdcd2c5807.zip CMake-18f3e286521437adc3f231cc126833bdcd2c5807.tar.gz CMake-18f3e286521437adc3f231cc126833bdcd2c5807.tar.bz2 | |
Merge branch 'iar-8051-support' into release-3.16
Merge-request: !3906
Diffstat (limited to 'Modules/Compiler/IAR-ASM.cmake')
| -rw-r--r-- | Modules/Compiler/IAR-ASM.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Modules/Compiler/IAR-ASM.cmake b/Modules/Compiler/IAR-ASM.cmake index 413d9e2..936d4ae 100644 --- a/Modules/Compiler/IAR-ASM.cmake +++ b/Modules/Compiler/IAR-ASM.cmake @@ -40,7 +40,12 @@ elseif("${CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID}" STREQUAL "MSP430") elseif("${CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID}" STREQUAL "V850") set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -S <SOURCE> <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT>") __compiler_iar_xlink(ASM) - set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS r85;asm;msa) + set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s85;asm;msa) + +elseif("${CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID}" STREQUAL "8051") + set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> -S <SOURCE> <DEFINES> <INCLUDES> <FLAGS> -o <OBJECT>") + __compiler_iar_xlink(ASM) + set(CMAKE_ASM_SOURCE_FILE_EXTENSIONS s51;asm;msa) else() message(FATAL_ERROR "CMAKE_ASM${ASM_DIALECT}_COMPILER_ARCHITECTURE_ID not detected. This should be automatic.") |