Skip to content

Commit eb5c2c3

Browse files
authored
Clang related fixes (#2231)
* workaround change in llvm picked up by llvm ETA 19 * fix clang compilation not including floating point instructions in build output
1 parent e85c3e5 commit eb5c2c3

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

cmake/preload/toolchains/pico_arm_clang_arm.cmake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# NOTE: THIS IS A WIP ONLY PICO_ARM_GCC IS CURRENTLY SUPPORTED
2-
# todo there is probably a more "cmake" way of doing this going thru the standard path with our "PICO" platform
31
# i.e. CMake<Lang>Information and whatnot
42
include(${CMAKE_CURRENT_LIST_DIR}/util/find_compiler.cmake)
53

cmake/preload/toolchains/pico_arm_cortex_m33_clang.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ set(CMAKE_SYSTEM_PROCESSOR cortex-m33)
44
set(PICO_CLANG_RUNTIMES armv8m.main_soft_nofp armv8m.main-unknown-none-eabi)
55

66
set(PICO_COMMON_LANG_FLAGS "-mcpu=cortex-m33 --target=armv8m.main-none-eabi -mfloat-abi=softfp -march=armv8m.main+fp+dsp")
7-
7+
set(PICO_DISASM_OBJDUMP_ARGS --mcpu=cortex-m33 --arch=armv8m.main+fp+dsp)
88
include(${CMAKE_CURRENT_LIST_DIR}/util/pico_arm_clang_common.cmake)

src/cmake/on_device.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,9 @@ function(pico_add_dis_output TARGET)
3737
set(EXTRA_COMMAND COMMAND picotool coprodis --quiet ${output_path}$<IF:$<BOOL:$<TARGET_PROPERTY:${TARGET},OUTPUT_NAME>>,$<TARGET_PROPERTY:${TARGET},OUTPUT_NAME>,$<TARGET_PROPERTY:${TARGET},NAME>>.dis ${output_path}$<IF:$<BOOL:$<TARGET_PROPERTY:${TARGET},OUTPUT_NAME>>,$<TARGET_PROPERTY:${TARGET},OUTPUT_NAME>,$<TARGET_PROPERTY:${TARGET},NAME>>.dis)
3838
endif()
3939
endif()
40-
4140
add_custom_command(TARGET ${TARGET} POST_BUILD
4241
COMMAND ${CMAKE_OBJDUMP} -h $<TARGET_FILE:${TARGET}> > ${output_path}$<IF:$<BOOL:$<TARGET_PROPERTY:${TARGET},OUTPUT_NAME>>,$<TARGET_PROPERTY:${TARGET},OUTPUT_NAME>,$<TARGET_PROPERTY:${TARGET},NAME>>.dis
43-
COMMAND ${CMAKE_OBJDUMP} -d $<TARGET_FILE:${TARGET}> >> ${output_path}$<IF:$<BOOL:$<TARGET_PROPERTY:${TARGET},OUTPUT_NAME>>,$<TARGET_PROPERTY:${TARGET},OUTPUT_NAME>,$<TARGET_PROPERTY:${TARGET},NAME>>.dis
42+
COMMAND ${CMAKE_OBJDUMP} -d ${PICO_DISASM_OBJDUMP_ARGS} $<TARGET_FILE:${TARGET}> >> ${output_path}$<IF:$<BOOL:$<TARGET_PROPERTY:${TARGET},OUTPUT_NAME>>,$<TARGET_PROPERTY:${TARGET},OUTPUT_NAME>,$<TARGET_PROPERTY:${TARGET},NAME>>.dis
4443
${EXTRA_COMMAND}
4544
VERBATIM
4645
)

src/rp2_common/pico_clib_interface/picolibc_interface.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
#include <stdio.h>
88
#include <stdlib.h>
99
#include <unistd.h>
10+
#include <machine/time.h>
11+
#include <time.h>
1012
#include <sys/time.h>
1113
#include <sys/times.h>
1214

0 commit comments

Comments
 (0)