Skip to content

Commit a16e1a7

Browse files
borsbors
committed
Auto merge of #56954 - hug-dev:armv8m-main-ci, r=alexcrichton
Add dist builder for Armv8-M Mainline This commit adds the Armv8-M Mainline target in the list of targets that get their dist components built. It also update the build-manifest so that this target gets also its dist components uploaded. I took example on other pull requests doing the same thing for another target to make the changes. Please feel free to comment if things needs to be added or removed. Doing `./x.py dist --target thumbv8m.main-none-eabi` worked locally so I assume that this will also work on the CI. It will (I think) however need a new release of alexcrichton/cc-rs to include the pull request rust-lang/cc-rs#363 @alexcrichton I hope to do the HardFloat version (`thumbv8m.main-none-eabihf`) and Baseline (`thumbv8m.base-none-eabi`) later, as fixes need to be done on compiler-builtins first to support those.
2 parents 9aee7ed + 65ac315 commit a16e1a7

File tree

3 files changed

+32
-24
lines changed

3 files changed

+32
-24
lines changed

‎Cargo.lock

+22-22
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ name = "backtrace-sys"
9797
version = "0.1.27"
9898
source = "registry+https://github.com/rust-lang/crates.io-index"
9999
dependencies = [
100-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
100+
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
101101
"compiler_builtins 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
102102
"libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
103103
"rustc-std-workspace-core 1.0.0",
@@ -131,7 +131,7 @@ name = "bootstrap"
131131
version = "0.0.0"
132132
dependencies = [
133133
"build_helper 0.1.0",
134-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
134+
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
135135
"cmake 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
136136
"filetime 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
137137
"getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -264,7 +264,7 @@ version = "0.1.0"
264264

265265
[[package]]
266266
name = "cc"
267-
version = "1.0.25"
267+
version = "1.0.28"
268268
source = "registry+https://github.com/rust-lang/crates.io-index"
269269

270270
[[package]]
@@ -382,7 +382,7 @@ name = "cmake"
382382
version = "0.1.33"
383383
source = "registry+https://github.com/rust-lang/crates.io-index"
384384
dependencies = [
385-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
385+
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
386386
]
387387

388388
[[package]]
@@ -414,7 +414,7 @@ name = "compiler_builtins"
414414
version = "0.1.4"
415415
source = "registry+https://github.com/rust-lang/crates.io-index"
416416
dependencies = [
417-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
417+
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
418418
"rustc-std-workspace-core 1.0.0",
419419
]
420420

@@ -608,7 +608,7 @@ name = "curl-sys"
608608
version = "0.4.15"
609609
source = "registry+https://github.com/rust-lang/crates.io-index"
610610
dependencies = [
611-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
611+
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
612612
"libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
613613
"libnghttp2-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
614614
"libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1077,7 +1077,7 @@ name = "jemalloc-sys"
10771077
version = "0.1.8"
10781078
source = "registry+https://github.com/rust-lang/crates.io-index"
10791079
dependencies = [
1080-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
1080+
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
10811081
"fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
10821082
"libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
10831083
]
@@ -1161,7 +1161,7 @@ name = "libgit2-sys"
11611161
version = "0.7.11"
11621162
source = "registry+https://github.com/rust-lang/crates.io-index"
11631163
dependencies = [
1164-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
1164+
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
11651165
"curl-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)",
11661166
"libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
11671167
"libssh2-sys 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1175,7 +1175,7 @@ name = "libnghttp2-sys"
11751175
version = "0.1.1"
11761176
source = "registry+https://github.com/rust-lang/crates.io-index"
11771177
dependencies = [
1178-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
1178+
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
11791179
"libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
11801180
]
11811181

@@ -1184,7 +1184,7 @@ name = "libssh2-sys"
11841184
version = "0.2.11"
11851185
source = "registry+https://github.com/rust-lang/crates.io-index"
11861186
dependencies = [
1187-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
1187+
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
11881188
"libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
11891189
"libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
11901190
"openssl-sys 0.9.40 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1197,7 +1197,7 @@ name = "libz-sys"
11971197
version = "1.0.25"
11981198
source = "registry+https://github.com/rust-lang/crates.io-index"
11991199
dependencies = [
1200-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
1200+
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
12011201
"libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
12021202
"pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
12031203
"vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1237,7 +1237,7 @@ name = "lzma-sys"
12371237
version = "0.1.10"
12381238
source = "registry+https://github.com/rust-lang/crates.io-index"
12391239
dependencies = [
1240-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
1240+
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
12411241
"filetime 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
12421242
"libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
12431243
"pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1343,7 +1343,7 @@ name = "miniz-sys"
13431343
version = "0.1.11"
13441344
source = "registry+https://github.com/rust-lang/crates.io-index"
13451345
dependencies = [
1346-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
1346+
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
13471347
"libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
13481348
]
13491349

@@ -1360,7 +1360,7 @@ name = "miniz_oxide_c_api"
13601360
version = "0.2.0"
13611361
source = "registry+https://github.com/rust-lang/crates.io-index"
13621362
dependencies = [
1363-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
1363+
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
13641364
"crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
13651365
"libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
13661366
"miniz_oxide 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1474,15 +1474,15 @@ name = "openssl-src"
14741474
version = "111.1.0+1.1.1a"
14751475
source = "registry+https://github.com/rust-lang/crates.io-index"
14761476
dependencies = [
1477-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
1477+
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
14781478
]
14791479

14801480
[[package]]
14811481
name = "openssl-sys"
14821482
version = "0.9.40"
14831483
source = "registry+https://github.com/rust-lang/crates.io-index"
14841484
dependencies = [
1485-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
1485+
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
14861486
"libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
14871487
"openssl-src 111.1.0+1.1.1a (registry+https://github.com/rust-lang/crates.io-index)",
14881488
"pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1681,7 +1681,7 @@ version = "0.0.0"
16811681
name = "profiler_builtins"
16821682
version = "0.0.0"
16831683
dependencies = [
1684-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
1684+
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
16851685
"compiler_builtins 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
16861686
"core 0.0.0",
16871687
]
@@ -2323,7 +2323,7 @@ dependencies = [
23232323
name = "rustc_codegen_llvm"
23242324
version = "0.0.0"
23252325
dependencies = [
2326-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
2326+
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
23272327
"memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
23282328
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
23292329
"rustc-demangle 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2335,7 +2335,7 @@ name = "rustc_codegen_ssa"
23352335
version = "0.0.0"
23362336
dependencies = [
23372337
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
2338-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
2338+
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
23392339
"jobserver 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
23402340
"libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
23412341
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2485,7 +2485,7 @@ name = "rustc_llvm"
24852485
version = "0.0.0"
24862486
dependencies = [
24872487
"build_helper 0.1.0",
2488-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
2488+
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
24892489
]
24902490

24912491
[[package]]
@@ -2900,7 +2900,7 @@ version = "0.0.0"
29002900
dependencies = [
29012901
"alloc 0.0.0",
29022902
"backtrace-sys 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
2903-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
2903+
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
29042904
"compiler_builtins 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
29052905
"core 0.0.0",
29062906
"dlmalloc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3411,7 +3411,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
34113411
"checksum byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d"
34123412
"checksum bytesize 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "716960a18f978640f25101b5cbf1c6f6b0d3192fab36a2d98ca96f0ecbe41010"
34133413
"checksum cargo_metadata 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d8dfe3adeb30f7938e6c1dd5327f29235d8ada3e898aeb08c343005ec2915a2"
3414-
"checksum cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "f159dfd43363c4d08055a07703eb7a3406b0dac4d0584d96965a3262db3c9d16"
3414+
"checksum cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4a8b715cb4597106ea87c7c84b2f1d452c7492033765df7f32651e66fcf749"
34153415
"checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
34163416
"checksum chalk-engine 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17ec698a6f053a23bfbe646d9f2fde4b02abc19125595270a99e6f44ae0bdd1a"
34173417
"checksum chalk-macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "295635afd6853aa9f20baeb7f0204862440c0fe994c5a253d5f479dac41d047e"

‎src/ci/docker/dist-various-1/Dockerfile

+9-2
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,18 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2121
patch \
2222
libssl-dev \
2323
pkg-config \
24-
gcc-arm-none-eabi \
2524
libnewlib-arm-none-eabi \
26-
qemu-system-arm
25+
qemu-system-arm \
26+
# software-properties-common for the add-apt-repository command
27+
software-properties-common
2728

2829
WORKDIR /build
2930

31+
# Use the team-gcc-arm-embedded PPA for a newer version of Arm GCC
32+
RUN add-apt-repository ppa:team-gcc-arm-embedded/ppa && \
33+
apt-get update && \
34+
apt-get install -y --no-install-recommends gcc-arm-embedded
35+
3036
COPY dist-various-1/build-rumprun.sh /build
3137
RUN ./build-rumprun.sh
3238

@@ -103,6 +109,7 @@ ENV TARGETS=$TARGETS,thumbv6m-none-eabi
103109
ENV TARGETS=$TARGETS,thumbv7m-none-eabi
104110
ENV TARGETS=$TARGETS,thumbv7em-none-eabi
105111
ENV TARGETS=$TARGETS,thumbv7em-none-eabihf
112+
ENV TARGETS=$TARGETS,thumbv8m.main-none-eabi
106113
ENV TARGETS=$TARGETS,riscv32imc-unknown-none-elf
107114
ENV TARGETS=$TARGETS,riscv32imac-unknown-none-elf
108115
ENV TARGETS=$TARGETS,armebv7r-none-eabi

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

+1
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ static TARGETS: &'static [&'static str] = &[
9090
"thumbv7em-none-eabi",
9191
"thumbv7em-none-eabihf",
9292
"thumbv7m-none-eabi",
93+
"thumbv8m.main-none-eabi",
9394
"wasm32-unknown-emscripten",
9495
"wasm32-unknown-unknown",
9596
"x86_64-apple-darwin",

0 commit comments

Comments
 (0)