Skip to content
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

[libcxx] Remove clang-18 workaround in picolib build #133254

Merged
merged 2 commits into from
Mar 28, 2025
Merged

[libcxx] Remove clang-18 workaround in picolib build #133254

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebd3845
[libcxx] Remove clang-18 workaround in picolib build
DavidSpickett Mar 27, 2025
709f5a2
simplify
DavidSpickett Mar 28, 2025
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
16 changes: 9 additions & 7 deletions libcxx/utils/ci/run-buildbot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,13 @@ function test-armv7m-picolibc() {

step "Generating CMake for compiler-rt"
flags="--sysroot=${INSTALL_DIR}"
# LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON means that we produce a file
# libclang_rt.builtins.a that will be installed to
# ${INSTALL_DIR}/lib/armv7m-unknown-none-eabi/.
# With LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=OFF, the filename includes the
# architecture name, which is not what Clang's driver expects to find.
# The install location will however be wrong with
# LLVM_ENABLE_PER_TARGET_RUNTIME_DIR=ON, so we correct that below.
${CMAKE} \
-S "${MONOREPO_ROOT}/compiler-rt" \
-B "${BUILD_DIR}/compiler-rt" \
Expand All @@ -226,13 +233,8 @@ function test-armv7m-picolibc() {

step "Installing compiler-rt"
${NINJA} -vC "${BUILD_DIR}/compiler-rt" install

# Prior to clang 19, armv7m-none-eabi normalised to armv7m-none-unknown-eabi.
# clang 19 changed this to armv7m-unknown-none-eabi. So for as long as 18.x
# is supported, we have to ask clang what the triple will be.
NORMALISED_TARGET_TRIPLE=$(${CC-cc} --target=armv7m-none-eabi -print-target-triple)
# Without this step linking fails later in the build.
mv "${BUILD_DIR}/install/lib/${NORMALISED_TARGET_TRIPLE}"/* "${BUILD_DIR}/install/lib"
# Move compiler-rt libs into the same directory as all the picolib objects.
mv "${INSTALL_DIR}/lib/armv7m-unknown-none-eabi"/* "${INSTALL_DIR}/lib"

check-runtimes
}
Expand Down