Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions libcxx/cmake/caches/Armv7M-picolibc.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ set(CMAKE_C_COMPILER_TARGET "armv7m-none-eabi" CACHE STRING "")
set(CMAKE_C_FLAGS "-mfloat-abi=soft" CACHE STRING "")
set(CMAKE_SYSTEM_NAME Generic CACHE STRING "")
set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY CACHE STRING "")
set(LLVM_USE_LINKER "lld" CACHE STRING "")
set(COMPILER_RT_BAREMETAL_BUILD ON CACHE BOOL "")
set(COMPILER_RT_BUILD_LIBFUZZER OFF CACHE BOOL "")
set(COMPILER_RT_BUILD_PROFILE OFF CACHE BOOL "")
Expand Down
2 changes: 1 addition & 1 deletion libcxx/test/configs/armv7m-picolibc-libc++.cfg.in
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ config.substitutions.append(('%{compile_flags}',
' -Wno-atomic-alignment'
))
config.substitutions.append(('%{link_flags}',
'-nostdlib -nostdlib++ -L %{lib-dir} -lc++ -lc++abi'
'-fuse-ld=lld -nostdlib -nostdlib++ -L %{lib-dir} -lc++ -lc++abi'
' -lc -lm -lclang_rt.builtins -lsemihost -lcrt0-semihost' +
' -T {}'.format(libc_linker_script) +
' -Wl,--defsym=__flash=0x0'
Expand Down
2 changes: 1 addition & 1 deletion libcxx/utils/ci/build-picolibc.sh
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ cat <<EOF > "${picolibc_build_dir}/meson-cross-build.txt"
c = ['${CC:-cc}', '--target=${target}', '-mfloat-abi=soft', '-nostdlib']
ar = 'llvm-ar'
as = 'llvm-as'
ld = 'lld'
c_ld = 'lld'
strip = 'llvm-strip'
[host_machine]
system = 'none'
Expand Down
2 changes: 1 addition & 1 deletion libcxxabi/test/configs/armv7m-picolibc-libc++abi.cfg.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ config.substitutions.append(('%{compile_flags}',
'-nostdinc++ -I %{include} -I %{cxx-include} -I %{cxx-target-include} %{maybe-include-libunwind} -I %{libcxx}/test/support -I %{libcxx}/src -D_LIBCPP_ENABLE_CXX17_REMOVED_UNEXPECTED_FUNCTIONS'
))
config.substitutions.append(('%{link_flags}',
'-nostdlib -nostdlib++ -L %{lib} -lc++ -lc++abi'
'-fuse-ld=lld -nostdlib -nostdlib++ -L %{lib} -lc++ -lc++abi'
' -lc -lm -lclang_rt.builtins -lsemihost -lcrt0-semihost' +
' -T {}'.format(libc_linker_script) +
' -Wl,--defsym=__flash=0x0'
Expand Down
2 changes: 1 addition & 1 deletion libunwind/test/configs/armv7m-picolibc-libunwind.cfg.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ config.substitutions.append(('%{compile_flags}',
'-nostdinc++ -I %{include}'
))
config.substitutions.append(('%{link_flags}',
'-nostdlib -nostdlib++ -L %{lib} -lunwind'
'-fuse-ld=lld -nostdlib -nostdlib++ -L %{lib} -lunwind'
' -lc -lm -lclang_rt.builtins -lsemihost -lcrt0-semihost' +
' -T {}'.format(libc_linker_script) +
' -Wl,--defsym=__flash=0x0'
Expand Down
Loading