Skip to content

Commit adb6e00

Browse files
0xc0170hugueskamba
authored andcommitted
CMake ARMClang6: use armclang for asm
Fixes the issue of armasm, passing -DMACRO={0,0} - fails to parse. We use armclang frontend but passing -masm=armasm.
1 parent a36b734 commit adb6e00

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

cmake/toolchains/ARM.cmake

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Copyright (c) 2020 ARM Limited. All rights reserved.
22
# SPDX-License-Identifier: Apache-2.0
33

4-
set(CMAKE_ASM_COMPILER "armasm")
4+
set(CMAKE_ASM_COMPILER "armclang")
55
set(CMAKE_C_COMPILER "armclang")
66
set(CMAKE_CXX_COMPILER "armclang")
77
set(CMAKE_AR "armar")
@@ -42,14 +42,10 @@ function(mbed_set_toolchain_options target)
4242
$<$<COMPILE_LANGUAGE:CXX>:${common_options}>
4343
)
4444

45-
set(asm_preproc_options
46-
"--target=arm-arm-none-eabi,-D,MBED_CONF_PLATFORM_CRASH_CAPTURE_ENABLED"
47-
)
4845
target_compile_options(${target}
4946
PUBLIC
47+
$<$<COMPILE_LANGUAGE:ASM>:--target=arm-arm-none-eabi -masm=armasm>
5048
$<$<COMPILE_LANGUAGE:ASM>:${MBED_STUDIO_ARM_COMPILER}>
51-
$<$<COMPILE_LANGUAGE:ASM>:--cpreproc>
52-
$<$<COMPILE_LANGUAGE:ASM>:--cpreproc_opts=${asm_preproc_options}>
5349
)
5450

5551
target_compile_definitions(${target}

0 commit comments

Comments
 (0)