Skip to content

[libcxx][CI] Prepare ARM Picolibc builds for upgrade to clang 21 #158300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[libcxx][CI] Prepare ARM Picolibc builds for upgrade to clang 21 #158300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions libcxx/cmake/caches/Armv7M-picolibc.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
set(CMAKE_ASM_COMPILER_TARGET "armv7m-none-eabi" CACHE STRING "")
set(CMAKE_CXX_COMPILER_TARGET "armv7m-none-eabi" CACHE STRING "")
set(CMAKE_CXX_FLAGS "-mfloat-abi=soft" CACHE STRING "")
set(CMAKE_CXX_FLAGS "-mfloat-abi=soft -gdwarf-4" CACHE STRING "")
set(CMAKE_C_COMPILER_TARGET "armv7m-none-eabi" CACHE STRING "")
set(CMAKE_C_FLAGS "-mfloat-abi=soft" CACHE STRING "")
set(CMAKE_C_FLAGS "-mfloat-abi=soft -gdwarf-4" CACHE STRING "")
set(CMAKE_SYSTEM_NAME Generic CACHE STRING "")
set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY CACHE STRING "")
set(COMPILER_RT_BAREMETAL_BUILD ON CACHE BOOL "")
Expand Down
6 changes: 3 additions & 3 deletions libcxx/test/configs/armv7m-picolibc-libc++.cfg.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ libc_linker_script = '@CMAKE_INSTALL_PREFIX@/lib/picolibcpp.ld'
config.substitutions.append(('%{flags}', '--sysroot=@CMAKE_INSTALL_PREFIX@'))

config.substitutions.append(('%{compile_flags}',
'-nostdinc++ -I %{include-dir} -I %{target-include-dir} -I %{libcxx-dir}/test/support'
'-nostdinc++ -I %{include-dir} -I %{target-include-dir} -I %{libcxx-dir}/test/support -gdwarf-4'

# Disable warnings in the <atomic> implementation:
# "large atomic operation may incur significant performance penalty; the
# access size (4 bytes) exceeds the max lock-free size (0 bytes)"
' -Wno-atomic-alignment'
))
config.substitutions.append(('%{link_flags}',
'-nostdlib -nostdlib++ -L %{lib-dir} -lc++ -lc++abi'
' -lc -lm -lclang_rt.builtins -lsemihost -lcrt0-semihost' +
'-nostdlib -nostdlib++ -L %{lib-dir} -Wl,--start-group -lc++ -lc++abi'
' -lunwind -lc -lm -lclang_rt.builtins -lsemihost -lcrt0-semihost -Wl,--end-group' +
' -T {}'.format(libc_linker_script) +
' -Wl,--defsym=__flash=0x0'
' -Wl,--defsym=__flash_size=0x400000'
Expand Down
2 changes: 1 addition & 1 deletion libcxx/test/libcxx/utilities/exception_guard.odr.sh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

// RUN: %{cxx} %s %{flags} %{compile_flags} -c -o %t.except.o -O1 -fexceptions
// RUN: %{cxx} %s %{flags} %{compile_flags} -c -o %t.noexcept.o -O1 -fno-exceptions
// RUN: %{cxx} %{flags} %{link_flags} -o %t.exe %t.except.o %t.noexcept.o
// RUN: %{cxx} %{flags} -o %t.exe %t.except.o %t.noexcept.o %{link_flags}
// RUN: %{run}

#include <__utility/exception_guard.h>
Expand Down
2 changes: 1 addition & 1 deletion libcxx/utils/ci/build-picolibc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ rm -rf "${picolibc_source_dir}/picolibc-${picolibc_commit}"

cat <<EOF > "${picolibc_build_dir}/meson-cross-build.txt"
[binaries]
c = ['${CC:-cc}', '--target=${target}', '-mfloat-abi=soft', '-nostdlib']
c = ['${CC:-cc}', '--target=${target}', '-mfloat-abi=soft', '-nostdlib', '-gdwarf-4']
ar = 'llvm-ar'
as = 'llvm-as'
ld = 'lld'
Expand Down
6 changes: 3 additions & 3 deletions libcxxabi/test/configs/armv7m-picolibc-libc++abi.cfg.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ libc_linker_script = '@CMAKE_INSTALL_PREFIX@/lib/picolibcpp.ld'
config.substitutions.append(('%{flags}', '--sysroot=@CMAKE_INSTALL_PREFIX@'))

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'
'-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 -gdwarf-4'
))
config.substitutions.append(('%{link_flags}',
'-nostdlib -nostdlib++ -L %{lib} -lc++ -lc++abi'
' -lc -lm -lclang_rt.builtins -lsemihost -lcrt0-semihost' +
'-nostdlib -nostdlib++ -L %{lib} -Wl,--start-group -lc++ -lc++abi'
' -lunwind -lc -lm -lclang_rt.builtins -lsemihost -lcrt0-semihost -Wl,--end-group' +
' -T {}'.format(libc_linker_script) +
' -Wl,--defsym=__flash=0x0'
' -Wl,--defsym=__flash_size=0x400000'
Expand Down
6 changes: 3 additions & 3 deletions libunwind/test/configs/armv7m-picolibc-libunwind.cfg.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ libc_linker_script = '@CMAKE_INSTALL_PREFIX@/lib/picolibcpp.ld'
config.substitutions.append(('%{flags}', '--sysroot=@CMAKE_INSTALL_PREFIX@'))

config.substitutions.append(('%{compile_flags}',
'-nostdinc++ -I %{include}'
'-nostdinc++ -I %{include} -gdwarf-4'
))
config.substitutions.append(('%{link_flags}',
'-nostdlib -nostdlib++ -L %{lib} -lunwind'
' -lc -lm -lclang_rt.builtins -lsemihost -lcrt0-semihost' +
'-nostdlib -nostdlib++ -L %{lib} -Wl,--start-group -lunwind'
' -lc -lm -lclang_rt.builtins -lsemihost -lcrt0-semihost -Wl,--end-group' +
' -T {}'.format(libc_linker_script) +
' -Wl,--defsym=__flash=0x0'
' -Wl,--defsym=__flash_size=0x400000'
Expand Down
Loading