Skip to content

Commit b6cf48a

Browse files
Barto22Barto22
committed
/boards/sim/: Added clang toolchain only for CI build
This commit will add clang toolchain only for CI builds. Signed-off-by: Bartosz <bartol2205@gmail.com>
1 parent af7f300 commit b6cf48a

13 files changed

Lines changed: 396 additions & 406 deletions

File tree

‎boards/sim/sim/sim/configs/citest/defconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ CONFIG_ARCH_BOARD="sim"
1515
CONFIG_ARCH_BOARD_SIM=y
1616
CONFIG_ARCH_CHIP="sim"
1717
CONFIG_ARCH_SIM=y
18-
CONFIG_SIM_TOOLCHAIN_CLANG=y
1918
CONFIG_BOARDCTL_APP_SYMTAB=y
2019
CONFIG_BOARDCTL_POWEROFF=y
2120
CONFIG_BOARDCTL_ROMDISK=y

‎boards/sim/sim/sim/configs/libcxxtest/defconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ CONFIG_ARCH_BOARD="sim"
1111
CONFIG_ARCH_BOARD_SIM=y
1212
CONFIG_ARCH_CHIP="sim"
1313
CONFIG_ARCH_SIM=y
14-
CONFIG_SIM_TOOLCHAIN_CLANG=y
1514
CONFIG_BOARDCTL_APP_SYMTAB=y
1615
CONFIG_BOARDCTL_POWEROFF=y
1716
CONFIG_BOARD_LOOPSPERMSEC=0

‎boards/sim/sim/sim/configs/matter/defconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ CONFIG_ARCH_BOARD="sim"
1212
CONFIG_ARCH_BOARD_SIM=y
1313
CONFIG_ARCH_CHIP="sim"
1414
CONFIG_ARCH_SIM=y
15-
CONFIG_SIM_TOOLCHAIN_CLANG=y
1615
CONFIG_BOARDCTL_APP_SYMTAB=y
1716
CONFIG_BOARDCTL_POWEROFF=y
1817
CONFIG_BOARD_LOOPSPERMSEC=0

‎boards/sim/sim/sim/configs/tflm/defconfig‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ CONFIG_ARCH_BOARD="sim"
1111
CONFIG_ARCH_BOARD_SIM=y
1212
CONFIG_ARCH_CHIP="sim"
1313
CONFIG_ARCH_SIM=y
14-
CONFIG_SIM_TOOLCHAIN_CLANG=y
1514
CONFIG_BOARDCTL_APP_SYMTAB=y
1615
CONFIG_BOARDCTL_POWEROFF=y
1716
CONFIG_BOARD_LOOPSPERMSEC=0

‎boards/sim/sim/sim/scripts/Make.defs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -186,15 +186,9 @@ endif
186186

187187
ARCHPICFLAGS = -fpic
188188

189-
ifeq ($(CONFIG_SIM_TOOLCHAIN_CLANG),y)
190-
CC = $(CROSSDEV)clang
191-
CXX = $(CROSSDEV)clang++
192-
CPP = $(CROSSDEV)clang -E -P -x c
193-
else
194189
CC = $(CROSSDEV)cc
195190
CXX = $(CROSSDEV)c++
196191
CPP = $(CROSSDEV)cc -E -P -x c
197-
endif
198192
LD = $(CROSSDEV)ld
199193
ifeq ($(CONFIG_HOST_MACOS),y)
200194
STRIP = $(CROSSDEV)strip

‎tools/ci/platforms/darwin.sh‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ arm_clang_toolchain() {
4242

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

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

7878
if [ ! -f "${NUTTXTOOLS}/gcc-aarch64-none-elf/bin/aarch64-none-elf-gcc" ]; then
7979
local basefile
80-
basefile=arm-gnu-toolchain-13.2.Rel1-darwin-x86_64-aarch64-none-elf
80+
basefile=arm-gnu-toolchain-15.2.Rel1-darwin-x86_64-aarch64-none-elf
8181
cd "${NUTTXTOOLS}"
8282
# Download the latest ARM64 GCC toolchain prebuilt by ARM
83-
curl -O -L -s https://developer.arm.com/-/media/Files/downloads/gnu/13.2.Rel1/binrel/${basefile}.tar.xz
83+
curl -O -L -s https://developer.arm.com/-/media/Files/downloads/gnu/15.2.Rel1/binrel/${basefile}.tar.xz
8484
xz -d ${basefile}.tar.xz
8585
tar xf ${basefile}.tar
8686
mv ${basefile} gcc-aarch64-none-elf
@@ -256,11 +256,11 @@ python_tools() {
256256
echo "export PYTHONUSERBASE=${NUTTXTOOLS}/pylocal" >> "${NUTTXTOOLS}"/env.sh
257257
add_path "${PYTHONUSERBASE}"/bin
258258
fi
259-
259+
260260
if [ "X$osarch" == "Xarm64" ]; then
261261
python3 -m venv --system-site-packages /opt/homebrew
262262
fi
263-
263+
264264
# workaround for Cython issue
265265
# https://github.com/yaml/pyyaml/pull/702#issuecomment-1638930830
266266
pip3 install "Cython<3.0"
@@ -295,12 +295,12 @@ riscv_gcc_toolchain() {
295295

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

‎tools/ci/platforms/linux.sh‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ arm_clang_toolchain() {
3535

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

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

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

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

164164
if [ ! -f "${NUTTXTOOLS}/riscv-none-elf-gcc/bin/riscv-none-elf-gcc" ]; then
165165
local basefile
166-
basefile=xpack-riscv-none-elf-gcc-14.2.0-3-linux-x64
166+
basefile=xpack-riscv-none-elf-gcc-15.2.0-1-linux-x64
167167
cd "${NUTTXTOOLS}"
168168
# Download the latest RISCV GCC toolchain prebuilt by xPack
169-
wget --quiet https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/download/v14.2.0-3/${basefile}.tar.gz
169+
wget --quiet https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/download/v15.2.0-1/${basefile}.tar.gz
170170
tar zxf ${basefile}.tar.gz
171-
mv xpack-riscv-none-elf-gcc-14.2.0-3 riscv-none-elf-gcc
171+
mv xpack-riscv-none-elf-gcc-15.2.0-1 riscv-none-elf-gcc
172172
rm ${basefile}.tar.gz
173173
fi
174174
command riscv-none-elf-gcc --version

‎tools/ci/platforms/msys2.sh‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ arm_clang_toolchain() {
3535

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

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

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

159159
if [ ! -f "${NUTTXTOOLS}/riscv-none-elf-gcc/bin/riscv-none-elf-gcc" ]; then
160160
local basefile
161-
basefile=xpack-riscv-none-elf-gcc-14.2.0-3-win32-x64
161+
basefile=xpack-riscv-none-elf-gcc-15.2.0-1-win32-x64
162162
cd "${NUTTXTOOLS}"
163163
# Download the latest RISCV GCC toolchain prebuilt by xPack
164-
curl -O -L -s https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/download/v14.2.0-3/${basefile}.zip
164+
curl -O -L -s https://github.com/xpack-dev-tools/riscv-none-elf-gcc-xpack/releases/download/v15.2.0-1/${basefile}.zip
165165
unzip -qo ${basefile}.zip
166-
mv xpack-riscv-none-elf-gcc-14.2.0-3 riscv-none-elf-gcc
166+
mv xpack-riscv-none-elf-gcc-15.2.0-1 riscv-none-elf-gcc
167167
rm ${basefile}.zip
168168
fi
169169
command riscv-none-elf-gcc --version

‎tools/ci/platforms/ubuntu.sh‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ arm_clang_toolchain() {
3535

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

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

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

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

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

0 commit comments

Comments
 (0)