Skip to content

Change SIM boards that uses libcxx to use Clang. #17850

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
Barto22 wants to merge 8 commits into from
Closed

Change SIM boards that uses libcxx to use Clang. #17850

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
af7f300
boards/sim/: Change SIM boards to use Clang.
Barto22 Jan 13, 2026
b6cf48a
/boards/sim/: Added clang toolchain only for CI build
Barto22 Jan 13, 2026
9476f69
/tools/ci/: Revert changes in scripts.
Barto22 Jan 13, 2026
30d3ceb
/tools/ci/: Revert formatting
Barto22 Jan 13, 2026
2fe28e0
/tools/ci/: Minor style fixes to revert changes.
Barto22 Jan 13, 2026
4f0894d
/tools/ci/: Revert formatting
Barto22 Jan 13, 2026
83a3cc2
/tools/ci/: Revert darwin.sh file
Barto22 Jan 13, 2026
107d5a5
/tools/ci/: Revert formatting
Barto22 Jan 13, 2026
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 boards/sim/sim/sim/scripts/Make.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@ else
ARCHCFLAGS += -fno-pic
ARCHCXXFLAGS += -fno-pic
ifneq ($(CONFIG_HOST_MACOS),y)
ARCHCFLAGS += -mcmodel=medium
ARCHCXXFLAGS += -mcmodel=medium
ARCHCFLAGS += -mcmodel=large
ARCHCXXFLAGS += -mcmodel=large
endif
endif

Expand Down
22 changes: 11 additions & 11 deletions tools/ci/platforms/darwin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ arm_clang_toolchain() {

if [ ! -f "${NUTTXTOOLS}/clang-arm-none-eabi/bin/clang" ]; then
local basefile
basefile=LLVMEmbeddedToolchainForArm-17.0.1-Darwin
basefile=LLVM-ET-Arm-19.1.5-Darwin-universal
cd "${NUTTXTOOLS}"
# Download the latest ARM clang toolchain prebuilt by ARM
curl -O -L -s https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/download/release-17.0.1/${basefile}.dmg
curl -O -L -s https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/download/release-19.1.5/${basefile}.dmg
sudo hdiutil attach ${basefile}.dmg
sudo cp -R /Volumes/${basefile}/${basefile} "${NUTTXTOOLS}"/${basefile}
sudo mv ${basefile} clang-arm-none-eabi
Expand All @@ -60,9 +60,9 @@ arm_gcc_toolchain() {

if [ ! -f "${NUTTXTOOLS}/gcc-arm-none-eabi/bin/arm-none-eabi-gcc" ]; then
local basefile
basefile=arm-gnu-toolchain-13.2.rel1-darwin-x86_64-arm-none-eabi
basefile=arm-gnu-toolchain-15.2.rel1-darwin-x86_64-arm-none-eabi
cd "${NUTTXTOOLS}"
curl -O -L -s https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/${basefile}.tar.xz
curl -O -L -s https://developer.arm.com/-/media/Files/downloads/gnu/15.2.rel1/binrel/${basefile}.tar.xz
xz -d ${basefile}.tar.xz
tar xf ${basefile}.tar
mv ${basefile} gcc-arm-none-eabi
Expand All @@ -77,10 +77,10 @@ arm64_gcc_toolchain() {

if [ ! -f "${NUTTXTOOLS}/gcc-aarch64-none-elf/bin/aarch64-none-elf-gcc" ]; then
local basefile
basefile=arm-gnu-toolchain-13.2.Rel1-darwin-x86_64-aarch64-none-elf
basefile=arm-gnu-toolchain-15.2.Rel1-darwin-x86_64-aarch64-none-elf
cd "${NUTTXTOOLS}"
# Download the latest ARM64 GCC toolchain prebuilt by ARM
curl -O -L -s https://developer.arm.com/-/media/Files/downloads/gnu/13.2.Rel1/binrel/${basefile}.tar.xz
curl -O -L -s https://developer.arm.com/-/media/Files/downloads/gnu/15.2.Rel1/binrel/${basefile}.tar.xz
xz -d ${basefile}.tar.xz
tar xf ${basefile}.tar
mv ${basefile} gcc-aarch64-none-elf
Expand Down Expand Up @@ -256,11 +256,11 @@ python_tools() {
echo "export PYTHONUSERBASE=${NUTTXTOOLS}/pylocal" >> "${NUTTXTOOLS}"/env.sh
add_path "${PYTHONUSERBASE}"/bin
fi

if [ "X$osarch" == "Xarm64" ]; then
python3 -m venv --system-site-packages /opt/homebrew
fi

# workaround for Cython issue
# https://github.com/yaml/pyyaml/pull/702#issuecomment-1638930830
pip3 install "Cython<3.0"
Expand Down Expand Up @@ -295,12 +295,12 @@ riscv_gcc_toolchain() {

if [ ! -f "${NUTTXTOOLS}/riscv-none-elf-gcc/bin/riscv-none-elf-gcc" ]; then
local basefile
basefile=xpack-riscv-none-elf-gcc-14.2.0-3-darwin-x64
basefile=xpack-riscv-none-elf-gcc-15.2.0-1-darwin-x64
cd "${NUTTXTOOLS}"
# Download the latest RISCV GCC toolchain prebuilt by xPack
curl -O -L -s https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/download/v14.2.0-3/${basefile}.tar.gz
curl -O -L -s https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/download/v15.2.0-1/${basefile}.tar.gz
tar zxf ${basefile}.tar.gz
mv xpack-riscv-none-elf-gcc-14.2.0-3 riscv-none-elf-gcc
mv xpack-riscv-none-elf-gcc-15.2.0-1 riscv-none-elf-gcc
rm ${basefile}.tar.gz
fi

Expand Down
20 changes: 10 additions & 10 deletions tools/ci/platforms/linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ arm_clang_toolchain() {

if [ ! -f "${NUTTXTOOLS}/clang-arm-none-eabi/bin/clang" ]; then
local basefile
basefile=LLVMEmbeddedToolchainForArm-17.0.1-Linux-x86_64
basefile=LLVM-ET-Arm-19.1.5-Linux-x86_64
cd "${NUTTXTOOLS}"
# Download the latest ARM clang toolchain prebuilt by ARM
curl -O -L -s https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/download/release-17.0.1/${basefile}.tar.xz
curl -O -L -s https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/download/release-19.1.5/${basefile}.tar.xz
xz -d ${basefile}.tar.xz
tar xf ${basefile}.tar
mv ${basefile} clang-arm-none-eabi
Expand All @@ -53,10 +53,10 @@ arm_gcc_toolchain() {

if [ ! -f "${NUTTXTOOLS}/gcc-arm-none-eabi/bin/arm-none-eabi-gcc" ]; then
local basefile
basefile=arm-gnu-toolchain-13.2.Rel1-x86_64-arm-none-eabi
basefile=arm-gnu-toolchain-15.2.Rel1-x86_64-arm-none-eabi
cd "${NUTTXTOOLS}"
# Download the latest ARM GCC toolchain prebuilt by ARM
curl -O -L -s https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/${basefile}.tar.xz
curl -O -L -s https://developer.arm.com/-/media/Files/downloads/gnu/15.2.rel1/binrel/${basefile}.tar.xz
xz -d ${basefile}.tar.xz
tar xf ${basefile}.tar
mv ${basefile} gcc-arm-none-eabi
Expand All @@ -71,10 +71,10 @@ arm64_gcc_toolchain() {

if [ ! -f "${NUTTXTOOLS}/gcc-aarch64-none-elf/bin/aarch64-none-elf-gcc" ]; then
local basefile
basefile=arm-gnu-toolchain-13.2.Rel1-x86_64-aarch64-none-elf
basefile=arm-gnu-toolchain-15.2.Rel1-x86_64-aarch64-none-elf
cd "${NUTTXTOOLS}"
# Download the latest ARM64 GCC toolchain prebuilt by ARM
curl -O -L -s https://developer.arm.com/-/media/Files/downloads/gnu/13.2.Rel1/binrel/${basefile}.tar.xz
curl -O -L -s https://developer.arm.com/-/media/Files/downloads/gnu/15.2.Rel1/binrel/${basefile}.tar.xz
xz -d ${basefile}.tar.xz
tar xf ${basefile}.tar
mv ${basefile} gcc-aarch64-none-elf
Expand All @@ -88,7 +88,7 @@ bloaty() {
add_path "${NUTTXTOOLS}"/bloaty/bin

if [ ! -f "${NUTTXTOOLS}/bloaty/bin/bloaty" ]; then
git clone --depth 1 --branch v1.1 https://github.com/google/bloaty "${NUTTXTOOLS}"/bloaty-src
git clone --depth 1 https://github.com/google/bloaty "${NUTTXTOOLS}"/bloaty-src
mkdir -p "${NUTTXTOOLS}"/bloaty
cd "${NUTTXTOOLS}"/bloaty-src
cmake -B build -DCMAKE_INSTALL_PREFIX="${NUTTXTOOLS}"/bloaty
Expand Down Expand Up @@ -163,12 +163,12 @@ riscv_gcc_toolchain() {

if [ ! -f "${NUTTXTOOLS}/riscv-none-elf-gcc/bin/riscv-none-elf-gcc" ]; then
local basefile
basefile=xpack-riscv-none-elf-gcc-14.2.0-3-linux-x64
basefile=xpack-riscv-none-elf-gcc-15.2.0-1-linux-x64
cd "${NUTTXTOOLS}"
# Download the latest RISCV GCC toolchain prebuilt by xPack
wget --quiet https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/download/v14.2.0-3/${basefile}.tar.gz
wget --quiet https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/download/v15.2.0-1/${basefile}.tar.gz
tar zxf ${basefile}.tar.gz
mv xpack-riscv-none-elf-gcc-14.2.0-3 riscv-none-elf-gcc
mv xpack-riscv-none-elf-gcc-15.2.0-1 riscv-none-elf-gcc
rm ${basefile}.tar.gz
fi
command riscv-none-elf-gcc --version
Expand Down
18 changes: 9 additions & 9 deletions tools/ci/platforms/msys2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ arm_clang_toolchain() {

if [ ! -f "${NUTTXTOOLS}/clang-arm-none-eabi/bin/clang" ]; then
local basefile
basefile=LLVMEmbeddedToolchainForArm-17.0.1-Windows-x86_64
basefile=LLVM-ET-Arm-19.1.5-Windows-x86_64
cd "${NUTTXTOOLS}"
# Download the latest ARM clang toolchain prebuilt by ARM
curl -O -L -s https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/download/release-17.0.1/${basefile}.zip
curl -O -L -s https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/download/release-19.1.5/${basefile}.zip
unzip -qo ${basefile}.zip
mv ${basefile} clang-arm-none-eabi
rm ${basefile}.zip
Expand All @@ -52,9 +52,9 @@ arm_gcc_toolchain() {

if [ ! -f "${NUTTXTOOLS}/gcc-arm-none-eabi/bin/arm-none-eabi-gcc" ]; then
local basefile
basefile=arm-gnu-toolchain-13.2.Rel1-mingw-w64-i686-arm-none-eabi
basefile=arm-gnu-toolchain-15.2.Rel1-mingw-w64-i686-arm-none-eabi
cd "${NUTTXTOOLS}"
curl -O -L -s https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/${basefile}.zip
curl -O -L -s https://developer.arm.com/-/media/Files/downloads/gnu/15.2.rel1/binrel/${basefile}.zip
unzip -qo ${basefile}.zip
mv ${basefile} gcc-arm-none-eabi
rm ${basefile}.zip
Expand All @@ -68,10 +68,10 @@ arm64_gcc_toolchain() {

if [ ! -f "${NUTTXTOOLS}/gcc-aarch64-none-elf/bin/aarch64-none-elf-gcc" ]; then
local basefile
basefile=arm-gnu-toolchain-13.2.rel1-mingw-w64-i686-aarch64-none-elf
basefile=arm-gnu-toolchain-15.2.Rel1-mingw-w64-i686-aarch64-none-elf
cd "${NUTTXTOOLS}"
# Download the latest ARM64 GCC toolchain prebuilt by ARM
curl -O -L -s https://developer.arm.com/-/media/Files/downloads/gnu/13.2.Rel1/binrel/${basefile}.zip
curl -O -L -s https://developer.arm.com/-/media/Files/downloads/gnu/15.2.Rel1/binrel/${basefile}.zip
unzip -qo ${basefile}.zip
mv ${basefile} gcc-aarch64-none-elf
rm ${basefile}.zip
Expand Down Expand Up @@ -158,12 +158,12 @@ riscv_gcc_toolchain() {

if [ ! -f "${NUTTXTOOLS}/riscv-none-elf-gcc/bin/riscv-none-elf-gcc" ]; then
local basefile
basefile=xpack-riscv-none-elf-gcc-14.2.0-3-win32-x64
basefile=xpack-riscv-none-elf-gcc-15.2.0-1-win32-x64
cd "${NUTTXTOOLS}"
# Download the latest RISCV GCC toolchain prebuilt by xPack
curl -O -L -s https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/download/v14.2.0-3/${basefile}.zip
curl -O -L -s https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/download/v15.2.0-1/${basefile}.zip
unzip -qo ${basefile}.zip
mv xpack-riscv-none-elf-gcc-14.2.0-3 riscv-none-elf-gcc
mv xpack-riscv-none-elf-gcc-15.2.0-1 riscv-none-elf-gcc
rm ${basefile}.zip
fi
command riscv-none-elf-gcc --version
Expand Down
20 changes: 10 additions & 10 deletions tools/ci/platforms/ubuntu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ arm_clang_toolchain() {

if [ ! -f "${NUTTXTOOLS}/clang-arm-none-eabi/bin/clang" ]; then
local basefile
basefile=LLVMEmbeddedToolchainForArm-17.0.1-Linux-x86_64
basefile=LLVM-ET-Arm-19.1.5-Linux-x86_64
cd "${NUTTXTOOLS}"
# Download the latest ARM clang toolchain prebuilt by ARM
curl -O -L -s https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/download/release-17.0.1/${basefile}.tar.xz
curl -O -L -s https://github.com/ARM-software/LLVM-embedded-toolchain-for-Arm/releases/download/release-19.1.5/${basefile}.tar.xz
xz -d ${basefile}.tar.xz
tar xf ${basefile}.tar
mv ${basefile} clang-arm-none-eabi
Expand All @@ -53,10 +53,10 @@ arm_gcc_toolchain() {

if [ ! -f "${NUTTXTOOLS}/gcc-arm-none-eabi/bin/arm-none-eabi-gcc" ]; then
local basefile
basefile=arm-gnu-toolchain-13.2.Rel1-x86_64-arm-none-eabi
basefile=arm-gnu-toolchain-15.2.Rel1-x86_64-arm-none-eabi
cd "${NUTTXTOOLS}"
# Download the latest ARM GCC toolchain prebuilt by ARM
curl -O -L -s https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/${basefile}.tar.xz
curl -O -L -s https://developer.arm.com/-/media/Files/downloads/gnu/15.2.rel1/binrel/${basefile}.tar.xz
xz -d ${basefile}.tar.xz
tar xf ${basefile}.tar
mv ${basefile} gcc-arm-none-eabi
Expand All @@ -71,10 +71,10 @@ arm64_gcc_toolchain() {

if [ ! -f "${NUTTXTOOLS}/gcc-aarch64-none-elf/bin/aarch64-none-elf-gcc" ]; then
local basefile
basefile=arm-gnu-toolchain-13.2.Rel1-x86_64-aarch64-none-elf
basefile=arm-gnu-toolchain-15.2.Rel1-x86_64-aarch64-none-elf
cd "${NUTTXTOOLS}"
# Download the latest ARM64 GCC toolchain prebuilt by ARM
curl -O -L -s https://developer.arm.com/-/media/Files/downloads/gnu/13.2.Rel1/binrel/${basefile}.tar.xz
curl -O -L -s https://developer.arm.com/-/media/Files/downloads/gnu/15.2.Rel1/binrel/${basefile}.tar.xz
xz -d ${basefile}.tar.xz
tar xf ${basefile}.tar
mv ${basefile} gcc-aarch64-none-elf
Expand Down Expand Up @@ -104,7 +104,7 @@ bloaty() {
add_path "${NUTTXTOOLS}"/bloaty/bin

if [ ! -f "${NUTTXTOOLS}/bloaty/bin/bloaty" ]; then
git clone --depth 1 --branch v1.1 https://github.com/google/bloaty "${NUTTXTOOLS}"/bloaty-src
git clone --depth 1 https://github.com/google/bloaty "${NUTTXTOOLS}"/bloaty-src
mkdir -p "${NUTTXTOOLS}"/bloaty
cd "${NUTTXTOOLS}"/bloaty-src
cmake -B build -DCMAKE_INSTALL_PREFIX="${NUTTXTOOLS}"/bloaty
Expand Down Expand Up @@ -216,12 +216,12 @@ riscv_gcc_toolchain() {

if [ ! -f "${NUTTXTOOLS}/riscv-none-elf-gcc/bin/riscv-none-elf-gcc" ]; then
local basefile
basefile=xpack-riscv-none-elf-gcc-14.2.0-3-linux-x64
basefile=xpack-riscv-none-elf-gcc-15.2.0-1-linux-x64
cd "${NUTTXTOOLS}"
# Download the latest RISCV GCC toolchain prebuilt by xPack
curl -O -L -s https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/download/v14.2.0-3/${basefile}.tar.gz
curl -O -L -s https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/download/v15.2.0-1/${basefile}.tar.gz
tar zxf ${basefile}.tar.gz
mv xpack-riscv-none-elf-gcc-14.2.0-3 riscv-none-elf-gcc
mv xpack-riscv-none-elf-gcc-15.2.0-1 riscv-none-elf-gcc
rm ${basefile}.tar.gz
fi

Expand Down
Loading
Loading