Skip to content

Commit 9e29511

Browse files
Rollup merge of rust-lang#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 3a2d846 + 39ca0f9 commit 9e29511

File tree

3 files changed

+24
-22
lines changed

3 files changed

+24
-22
lines changed

Cargo.lock

+22-22
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ name = "backtrace-sys"
9696
version = "0.1.24"
9797
source = "registry+https://github.com/rust-lang/crates.io-index"
9898
dependencies = [
99-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
99+
"cc 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
100100
"libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
101101
]
102102

@@ -128,7 +128,7 @@ name = "bootstrap"
128128
version = "0.0.0"
129129
dependencies = [
130130
"build_helper 0.1.0",
131-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
131+
"cc 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
132132
"cmake 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
133133
"filetime 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
134134
"getopts 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -260,7 +260,7 @@ version = "0.1.0"
260260

261261
[[package]]
262262
name = "cc"
263-
version = "1.0.25"
263+
version = "1.0.27"
264264
source = "registry+https://github.com/rust-lang/crates.io-index"
265265

266266
[[package]]
@@ -378,7 +378,7 @@ name = "cmake"
378378
version = "0.1.33"
379379
source = "registry+https://github.com/rust-lang/crates.io-index"
380380
dependencies = [
381-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
381+
"cc 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
382382
]
383383

384384
[[package]]
@@ -410,7 +410,7 @@ name = "compiler_builtins"
410410
version = "0.1.2"
411411
source = "registry+https://github.com/rust-lang/crates.io-index"
412412
dependencies = [
413-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
413+
"cc 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
414414
"rustc-std-workspace-core 1.0.0",
415415
]
416416

@@ -602,7 +602,7 @@ name = "curl-sys"
602602
version = "0.4.15"
603603
source = "registry+https://github.com/rust-lang/crates.io-index"
604604
dependencies = [
605-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
605+
"cc 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
606606
"libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
607607
"libnghttp2-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
608608
"libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1071,7 +1071,7 @@ name = "jemalloc-sys"
10711071
version = "0.1.8"
10721072
source = "registry+https://github.com/rust-lang/crates.io-index"
10731073
dependencies = [
1074-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
1074+
"cc 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
10751075
"fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
10761076
"libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
10771077
]
@@ -1155,7 +1155,7 @@ name = "libgit2-sys"
11551155
version = "0.7.10"
11561156
source = "registry+https://github.com/rust-lang/crates.io-index"
11571157
dependencies = [
1158-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
1158+
"cc 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
11591159
"curl-sys 0.4.15 (registry+https://github.com/rust-lang/crates.io-index)",
11601160
"libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
11611161
"libssh2-sys 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1169,7 +1169,7 @@ name = "libnghttp2-sys"
11691169
version = "0.1.1"
11701170
source = "registry+https://github.com/rust-lang/crates.io-index"
11711171
dependencies = [
1172-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
1172+
"cc 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
11731173
"libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
11741174
]
11751175

@@ -1178,7 +1178,7 @@ name = "libssh2-sys"
11781178
version = "0.2.11"
11791179
source = "registry+https://github.com/rust-lang/crates.io-index"
11801180
dependencies = [
1181-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
1181+
"cc 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
11821182
"libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
11831183
"libz-sys 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
11841184
"openssl-sys 0.9.39 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1191,7 +1191,7 @@ name = "libz-sys"
11911191
version = "1.0.25"
11921192
source = "registry+https://github.com/rust-lang/crates.io-index"
11931193
dependencies = [
1194-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
1194+
"cc 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
11951195
"libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
11961196
"pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
11971197
"vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1239,7 +1239,7 @@ name = "lzma-sys"
12391239
version = "0.1.10"
12401240
source = "registry+https://github.com/rust-lang/crates.io-index"
12411241
dependencies = [
1242-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
1242+
"cc 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
12431243
"filetime 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
12441244
"libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
12451245
"pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1345,7 +1345,7 @@ name = "miniz-sys"
13451345
version = "0.1.11"
13461346
source = "registry+https://github.com/rust-lang/crates.io-index"
13471347
dependencies = [
1348-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
1348+
"cc 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
13491349
"libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
13501350
]
13511351

@@ -1362,7 +1362,7 @@ name = "miniz_oxide_c_api"
13621362
version = "0.2.0"
13631363
source = "registry+https://github.com/rust-lang/crates.io-index"
13641364
dependencies = [
1365-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
1365+
"cc 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
13661366
"crc 1.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
13671367
"libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
13681368
"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.27 (registry+https://github.com/rust-lang/crates.io-index)",
14781478
]
14791479

14801480
[[package]]
14811481
name = "openssl-sys"
14821482
version = "0.9.39"
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.27 (registry+https://github.com/rust-lang/crates.io-index)",
14861486
"libc 0.2.45 (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.27 (registry+https://github.com/rust-lang/crates.io-index)",
16851685
"compiler_builtins 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
16861686
"core 0.0.0",
16871687
]
@@ -2316,7 +2316,7 @@ dependencies = [
23162316
name = "rustc_codegen_llvm"
23172317
version = "0.0.0"
23182318
dependencies = [
2319-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
2319+
"cc 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
23202320
"memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
23212321
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
23222322
"rustc-demangle 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2328,7 +2328,7 @@ name = "rustc_codegen_ssa"
23282328
version = "0.0.0"
23292329
dependencies = [
23302330
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
2331-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
2331+
"cc 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
23322332
"jobserver 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
23332333
"libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
23342334
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2479,7 +2479,7 @@ name = "rustc_llvm"
24792479
version = "0.0.0"
24802480
dependencies = [
24812481
"build_helper 0.1.0",
2482-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
2482+
"cc 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
24832483
]
24842484

24852485
[[package]]
@@ -2886,7 +2886,7 @@ version = "0.0.0"
28862886
dependencies = [
28872887
"alloc 0.0.0",
28882888
"build_helper 0.1.0",
2889-
"cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)",
2889+
"cc 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
28902890
"compiler_builtins 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
28912891
"core 0.0.0",
28922892
"dlmalloc 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3397,7 +3397,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
33973397
"checksum byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d"
33983398
"checksum bytesize 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "716960a18f978640f25101b5cbf1c6f6b0d3192fab36a2d98ca96f0ecbe41010"
33993399
"checksum cargo_metadata 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d8dfe3adeb30f7938e6c1dd5327f29235d8ada3e898aeb08c343005ec2915a2"
3400-
"checksum cc 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)" = "f159dfd43363c4d08055a07703eb7a3406b0dac4d0584d96965a3262db3c9d16"
3400+
"checksum cc 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)" = "155ed195f7bd722d1dfeb30365b9d0c1f6a078fa7ca4014497e5935d90993d6f"
34013401
"checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
34023402
"checksum chalk-engine 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6749eb72e7d4355d944a99f15fbaea701b978c18c5e184a025fcde942b0c9779"
34033403
"checksum chalk-macros 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "295635afd6853aa9f20baeb7f0204862440c0fe994c5a253d5f479dac41d047e"

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

+1
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ ENV TARGETS=$TARGETS,thumbv6m-none-eabi
103103
ENV TARGETS=$TARGETS,thumbv7m-none-eabi
104104
ENV TARGETS=$TARGETS,thumbv7em-none-eabi
105105
ENV TARGETS=$TARGETS,thumbv7em-none-eabihf
106+
ENV TARGETS=$TARGETS,thumbv8m.main-none-eabi
106107
ENV TARGETS=$TARGETS,riscv32imc-unknown-none-elf
107108
ENV TARGETS=$TARGETS,riscv32imac-unknown-none-elf
108109
ENV TARGETS=$TARGETS,armebv7r-none-eabi

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

+1
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ static TARGETS: &'static [&'static str] = &[
100100
"thumbv7em-none-eabi",
101101
"thumbv7em-none-eabihf",
102102
"thumbv7m-none-eabi",
103+
"thumbv8m.main-none-eabi",
103104
"wasm32-unknown-emscripten",
104105
"wasm32-unknown-unknown",
105106
"x86_64-apple-darwin",

0 commit comments

Comments
 (0)