Skip to content

Commit 54cce0f

Browse files
borsbors
committed
Auto merge of #59182 - hug-dev:armv8m-base-hf, r=<try>
Add dist builder for Armv8-M Baseline and HF This commit adds the Armv8-M Baseline and Armv8-M Mainline with FPU targets 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. Made possible with the recent change merged in `compiler-builtins`: rust-lang/compiler-builtins#276 A new `compiler-builtins` might be necessary for successfull compilation of the artefacts of those targets.
2 parents 9c499cc + 7fca98b commit 54cce0f

File tree

6 files changed

+28
-21
lines changed

6 files changed

+28
-21
lines changed

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ matrix:
131131
if: branch = auto
132132
- env: IMAGE=dist-various-1 DEPLOY=1
133133
name: dist-various-1
134-
if: branch = auto
134+
if: branch = try
135135
- env: IMAGE=dist-various-2 DEPLOY=1
136136
name: dist-various-2
137137
if: branch = auto

‎Cargo.lock

+20-20
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ dependencies = [
1717
name = "alloc"
1818
version = "0.0.0"
1919
dependencies = [
20-
"compiler_builtins 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
20+
"compiler_builtins 0.1.8 (git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support)",
2121
"core 0.0.0",
2222
"rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
2323
"rand_xorshift 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -106,7 +106,7 @@ version = "0.1.27"
106106
source = "registry+https://github.com/rust-lang/crates.io-index"
107107
dependencies = [
108108
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
109-
"compiler_builtins 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
109+
"compiler_builtins 0.1.8 (git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support)",
110110
"libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
111111
"rustc-std-workspace-core 1.0.0",
112112
]
@@ -463,8 +463,8 @@ dependencies = [
463463

464464
[[package]]
465465
name = "compiler_builtins"
466-
version = "0.1.5"
467-
source = "registry+https://github.com/rust-lang/crates.io-index"
466+
version = "0.1.8"
467+
source = "git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support#e745aea2c2ba46fef91d3761c9af699e5dc214f5"
468468
dependencies = [
469469
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
470470
"rustc-std-workspace-core 1.0.0",
@@ -748,7 +748,7 @@ name = "dlmalloc"
748748
version = "0.1.3"
749749
source = "registry+https://github.com/rust-lang/crates.io-index"
750750
dependencies = [
751-
"compiler_builtins 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
751+
"compiler_builtins 0.1.8 (git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support)",
752752
"libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
753753
"rustc-std-workspace-core 1.0.0",
754754
]
@@ -906,7 +906,7 @@ name = "fortanix-sgx-abi"
906906
version = "0.3.2"
907907
source = "registry+https://github.com/rust-lang/crates.io-index"
908908
dependencies = [
909-
"compiler_builtins 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
909+
"compiler_builtins 0.1.8 (git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support)",
910910
"rustc-std-workspace-core 1.0.0",
911911
]
912912

@@ -1748,7 +1748,7 @@ dependencies = [
17481748
name = "panic_abort"
17491749
version = "0.0.0"
17501750
dependencies = [
1751-
"compiler_builtins 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
1751+
"compiler_builtins 0.1.8 (git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support)",
17521752
"core 0.0.0",
17531753
"libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
17541754
]
@@ -1758,7 +1758,7 @@ name = "panic_unwind"
17581758
version = "0.0.0"
17591759
dependencies = [
17601760
"alloc 0.0.0",
1761-
"compiler_builtins 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
1761+
"compiler_builtins 0.1.8 (git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support)",
17621762
"core 0.0.0",
17631763
"libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
17641764
"unwind 0.0.0",
@@ -1943,7 +1943,7 @@ name = "profiler_builtins"
19431943
version = "0.0.0"
19441944
dependencies = [
19451945
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
1946-
"compiler_builtins 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
1946+
"compiler_builtins 0.1.8 (git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support)",
19471947
"core 0.0.0",
19481948
]
19491949

@@ -2066,7 +2066,7 @@ name = "rand_chacha"
20662066
version = "0.1.0"
20672067
source = "registry+https://github.com/rust-lang/crates.io-index"
20682068
dependencies = [
2069-
"rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
2069+
"rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
20702070
"rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
20712071
]
20722072

@@ -2088,7 +2088,7 @@ name = "rand_hc"
20882088
version = "0.1.0"
20892089
source = "registry+https://github.com/rust-lang/crates.io-index"
20902090
dependencies = [
2091-
"rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
2091+
"rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
20922092
]
20932093

20942094
[[package]]
@@ -2113,7 +2113,7 @@ name = "rand_xorshift"
21132113
version = "0.1.0"
21142114
source = "registry+https://github.com/rust-lang/crates.io-index"
21152115
dependencies = [
2116-
"rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
2116+
"rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
21172117
]
21182118

21192119
[[package]]
@@ -2476,7 +2476,7 @@ name = "rustc-demangle"
24762476
version = "0.1.10"
24772477
source = "registry+https://github.com/rust-lang/crates.io-index"
24782478
dependencies = [
2479-
"compiler_builtins 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
2479+
"compiler_builtins 0.1.8 (git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support)",
24802480
"rustc-std-workspace-core 1.0.0",
24812481
]
24822482

@@ -2576,7 +2576,7 @@ dependencies = [
25762576
"alloc 0.0.0",
25772577
"build_helper 0.1.0",
25782578
"cmake 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
2579-
"compiler_builtins 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
2579+
"compiler_builtins 0.1.8 (git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support)",
25802580
"core 0.0.0",
25812581
]
25822582

@@ -2803,7 +2803,7 @@ dependencies = [
28032803
"alloc 0.0.0",
28042804
"build_helper 0.1.0",
28052805
"cmake 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
2806-
"compiler_builtins 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
2806+
"compiler_builtins 0.1.8 (git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support)",
28072807
"core 0.0.0",
28082808
]
28092809

@@ -2864,7 +2864,7 @@ dependencies = [
28642864
"alloc 0.0.0",
28652865
"build_helper 0.1.0",
28662866
"cmake 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
2867-
"compiler_builtins 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
2867+
"compiler_builtins 0.1.8 (git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support)",
28682868
"core 0.0.0",
28692869
]
28702870

@@ -2985,7 +2985,7 @@ dependencies = [
29852985
"alloc 0.0.0",
29862986
"build_helper 0.1.0",
29872987
"cmake 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
2988-
"compiler_builtins 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
2988+
"compiler_builtins 0.1.8 (git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support)",
29892989
"core 0.0.0",
29902990
]
29912991

@@ -3252,7 +3252,7 @@ dependencies = [
32523252
"alloc 0.0.0",
32533253
"backtrace-sys 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
32543254
"cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
3255-
"compiler_builtins 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
3255+
"compiler_builtins 0.1.8 (git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support)",
32563256
"core 0.0.0",
32573257
"dlmalloc 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
32583258
"fortanix-sgx-abi 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3817,7 +3817,7 @@ dependencies = [
38173817
name = "unwind"
38183818
version = "0.0.0"
38193819
dependencies = [
3820-
"compiler_builtins 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
3820+
"compiler_builtins 0.1.8 (git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support)",
38213821
"core 0.0.0",
38223822
"libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
38233823
]
@@ -4013,7 +4013,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
40134013
"checksum colored 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b0aa3473e85a3161b59845d6096b289bb577874cafeaf75ea1b1beaa6572c7fc"
40144014
"checksum commoncrypto 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d056a8586ba25a1e4d61cb090900e495952c7886786fc55f909ab2f819b69007"
40154015
"checksum commoncrypto-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1fed34f46747aa73dfaa578069fd8279d2818ade2b55f38f22a9401c7f4083e2"
4016-
"checksum compiler_builtins 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6711d51cb46744dd8305293cc3fbc392aaff7a8f5095a7c4fae1e5113ef07c96"
4016+
"checksum compiler_builtins 0.1.8 (git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support)" = "<none>"
40174017
"checksum compiletest_rs 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)" = "56c799b1f7142badf3b047b4c1f2074cc96b6b784fb2432f2ed9c87da0a03749"
40184018
"checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e"
40194019
"checksum core-foundation 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4e2640d6d0bf22e82bed1b73c6aef8d5dd31e5abe6666c57e6d45e2649f4f887"

‎Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ debug-assertions = false
5555
cargo = { path = "src/tools/cargo" }
5656

5757
[patch.crates-io]
58+
compiler_builtins = { git = "https://github.com/hug-dev/compiler-builtins", branch = "armv8m-support" }
5859
# Similar to Cargo above we want the RLS to use a vendored version of `rustfmt`
5960
# that we're shipping as well (to ensure that the rustfmt in RLS and the
6061
# `rustfmt` executable are the same exact version).

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

+2
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,9 @@ ENV TARGETS=$TARGETS,thumbv6m-none-eabi
109109
ENV TARGETS=$TARGETS,thumbv7m-none-eabi
110110
ENV TARGETS=$TARGETS,thumbv7em-none-eabi
111111
ENV TARGETS=$TARGETS,thumbv7em-none-eabihf
112+
ENV TARGETS=$TARGETS,thumbv8m.base-none-eabi
112113
ENV TARGETS=$TARGETS,thumbv8m.main-none-eabi
114+
ENV TARGETS=$TARGETS,thumbv8m.main-none-eabihf
113115
ENV TARGETS=$TARGETS,riscv32imc-unknown-none-elf
114116
ENV TARGETS=$TARGETS,riscv32imac-unknown-none-elf
115117
ENV TARGETS=$TARGETS,riscv64imac-unknown-none-elf

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

+2
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,9 @@ static TARGETS: &'static [&'static str] = &[
103103
"thumbv7em-none-eabi",
104104
"thumbv7em-none-eabihf",
105105
"thumbv7m-none-eabi",
106+
"thumbv8m.base-none-eabi",
106107
"thumbv8m.main-none-eabi",
108+
"thumbv8m.main-none-eabihf",
107109
"wasm32-unknown-emscripten",
108110
"wasm32-unknown-unknown",
109111
"x86_64-apple-darwin",

‎src/tools/tidy/src/extdeps.rs

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ use std::path::Path;
66
/// List of whitelisted sources for packages.
77
const WHITELISTED_SOURCES: &[&str] = &[
88
"\"registry+https://github.com/rust-lang/crates.io-index\"",
9+
"\"git+https://github.com/hug-dev/compiler-builtins?branch=\
10+
armv8m-support#e745aea2c2ba46fef91d3761c9af699e5dc214f5\"",
911
];
1012

1113
/// Checks for external package sources.

0 commit comments

Comments
 (0)