Skip to content

Commit 55d093b

Browse files
authored
Rollup merge of #147596 - thejpster:build-new-arm-tier2-targets, r=Mark-Simulacrum
Adjust the Arm targets in CI to reflect latest changes * Adds build of `armv7a-none-eabihf` (#146522) * Adds build of `armv8r-none-eabihf` (#146520) * Drops build of `armeb*-none-*` (#146523) I wasn't sure why `armv7a-none-eabihf` was missing from the build-manifest program, but `armv8r-none-eabihf` was there, as they were both Tier 3 targets up until very recently. So, I added it, but that might be wrong.
2 parents ba431a9 + cc96d3f commit 55d093b

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/ci/docker/host-x86_64/dist-various-1/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,12 @@ ENV TARGETS=$TARGETS,riscv32imac-unknown-none-elf
111111
ENV TARGETS=$TARGETS,riscv32imafc-unknown-none-elf
112112
ENV TARGETS=$TARGETS,riscv64imac-unknown-none-elf
113113
ENV TARGETS=$TARGETS,riscv64gc-unknown-none-elf
114-
ENV TARGETS=$TARGETS,armebv7r-none-eabi
115-
ENV TARGETS=$TARGETS,armebv7r-none-eabihf
116114
ENV TARGETS=$TARGETS,armv7r-none-eabi
117115
ENV TARGETS=$TARGETS,armv7r-none-eabihf
116+
ENV TARGETS=$TARGETS,armv8r-none-eabihf
118117
ENV TARGETS=$TARGETS,thumbv7neon-unknown-linux-gnueabihf
119118
ENV TARGETS=$TARGETS,armv7a-none-eabi
119+
ENV TARGETS=$TARGETS,armv7a-none-eabihf
120120

121121
ENV CFLAGS_armv5te_unknown_linux_musleabi="-march=armv5te -marm -mfloat-abi=soft" \
122122
CFLAGS_arm_unknown_linux_musleabi="-march=armv6 -marm" \

src/tools/build-manifest/src/main.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ static TARGETS: &[&str] = &[
8989
"armv7-unknown-linux-gnueabi",
9090
"armv7-unknown-linux-gnueabihf",
9191
"armv7a-none-eabi",
92+
"armv7a-none-eabihf",
9293
"thumbv7neon-unknown-linux-gnueabihf",
9394
"armv7-unknown-linux-musleabi",
9495
"armv7-unknown-linux-musleabihf",

0 commit comments

Comments
 (0)