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.
rust-lang · Mar 20, 2019 · 54cce0f · 54cce0f
2 parents 9c499cc + 7fca98b
commit 54cce0f
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -131,7 +131,7 @@ matrix:
       if: branch = auto
     - env: IMAGE=dist-various-1 DEPLOY=1
       name: dist-various-1
-      if: branch = auto
+      if: branch = try
     - env: IMAGE=dist-various-2 DEPLOY=1
       name: dist-various-2
       if: branch = auto

diff --git a/Cargo.lock b/Cargo.lock
@@ -17,7 +17,7 @@ dependencies = [
 name = "alloc"
 version = "0.0.0"
 dependencies = [
- "compiler_builtins 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiler_builtins 0.1.8 (git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support)",
  "core 0.0.0",
  "rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_xorshift 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -106,7 +106,7 @@ version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
- "compiler_builtins 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiler_builtins 0.1.8 (git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support)",
  "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-std-workspace-core 1.0.0",
 ]
@@ -463,8 +463,8 @@ dependencies = [
 
 [[package]]
 name = "compiler_builtins"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+version = "0.1.8"
+source = "git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support#e745aea2c2ba46fef91d3761c9af699e5dc214f5"
 dependencies = [
  "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-std-workspace-core 1.0.0",
@@ -748,7 +748,7 @@ name = "dlmalloc"
 version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "compiler_builtins 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiler_builtins 0.1.8 (git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support)",
  "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-std-workspace-core 1.0.0",
 ]
@@ -906,7 +906,7 @@ name = "fortanix-sgx-abi"
 version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "compiler_builtins 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiler_builtins 0.1.8 (git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support)",
  "rustc-std-workspace-core 1.0.0",
 ]
 
@@ -1748,7 +1748,7 @@ dependencies = [
 name = "panic_abort"
 version = "0.0.0"
 dependencies = [
- "compiler_builtins 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiler_builtins 0.1.8 (git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support)",
  "core 0.0.0",
  "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1758,7 +1758,7 @@ name = "panic_unwind"
 version = "0.0.0"
 dependencies = [
  "alloc 0.0.0",
- "compiler_builtins 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiler_builtins 0.1.8 (git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support)",
  "core 0.0.0",
  "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
  "unwind 0.0.0",
@@ -1943,7 +1943,7 @@ name = "profiler_builtins"
 version = "0.0.0"
 dependencies = [
  "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
- "compiler_builtins 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiler_builtins 0.1.8 (git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support)",
  "core 0.0.0",
 ]
 
@@ -2066,7 +2066,7 @@ name = "rand_chacha"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2088,7 +2088,7 @@ name = "rand_hc"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2113,7 +2113,7 @@ name = "rand_xorshift"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2476,7 +2476,7 @@ name = "rustc-demangle"
 version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "compiler_builtins 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiler_builtins 0.1.8 (git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support)",
  "rustc-std-workspace-core 1.0.0",
 ]
 
@@ -2576,7 +2576,7 @@ dependencies = [
  "alloc 0.0.0",
  "build_helper 0.1.0",
  "cmake 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "compiler_builtins 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiler_builtins 0.1.8 (git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support)",
  "core 0.0.0",
 ]
 
@@ -2803,7 +2803,7 @@ dependencies = [
  "alloc 0.0.0",
  "build_helper 0.1.0",
  "cmake 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "compiler_builtins 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiler_builtins 0.1.8 (git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support)",
  "core 0.0.0",
 ]
 
@@ -2864,7 +2864,7 @@ dependencies = [
  "alloc 0.0.0",
  "build_helper 0.1.0",
  "cmake 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "compiler_builtins 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiler_builtins 0.1.8 (git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support)",
  "core 0.0.0",
 ]
 
@@ -2985,7 +2985,7 @@ dependencies = [
  "alloc 0.0.0",
  "build_helper 0.1.0",
  "cmake 0.1.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "compiler_builtins 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiler_builtins 0.1.8 (git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support)",
  "core 0.0.0",
 ]
 
@@ -3252,7 +3252,7 @@ dependencies = [
  "alloc 0.0.0",
  "backtrace-sys 0.1.27 (registry+https://github.com/rust-lang/crates.io-index)",
  "cc 1.0.28 (registry+https://github.com/rust-lang/crates.io-index)",
- "compiler_builtins 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiler_builtins 0.1.8 (git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support)",
  "core 0.0.0",
  "dlmalloc 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "fortanix-sgx-abi 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3817,7 +3817,7 @@ dependencies = [
 name = "unwind"
 version = "0.0.0"
 dependencies = [
- "compiler_builtins 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "compiler_builtins 0.1.8 (git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support)",
  "core 0.0.0",
  "libc 0.2.46 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -4013,7 +4013,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum colored 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b0aa3473e85a3161b59845d6096b289bb577874cafeaf75ea1b1beaa6572c7fc"
 "checksum commoncrypto 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d056a8586ba25a1e4d61cb090900e495952c7886786fc55f909ab2f819b69007"
 "checksum commoncrypto-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1fed34f46747aa73dfaa578069fd8279d2818ade2b55f38f22a9401c7f4083e2"
-"checksum compiler_builtins 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6711d51cb46744dd8305293cc3fbc392aaff7a8f5095a7c4fae1e5113ef07c96"
+"checksum compiler_builtins 0.1.8 (git+https://github.com/hug-dev/compiler-builtins?branch=armv8m-support)" = "<none>"
 "checksum compiletest_rs 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)" = "56c799b1f7142badf3b047b4c1f2074cc96b6b784fb2432f2ed9c87da0a03749"
 "checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e"
 "checksum core-foundation 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4e2640d6d0bf22e82bed1b73c6aef8d5dd31e5abe6666c57e6d45e2649f4f887"

diff --git a/Cargo.toml b/Cargo.toml
@@ -55,6 +55,7 @@ debug-assertions = false
 cargo = { path = "src/tools/cargo" }
 
 [patch.crates-io]
+compiler_builtins = { git = "https://github.com/hug-dev/compiler-builtins", branch = "armv8m-support" }
 # Similar to Cargo above we want the RLS to use a vendored version of `rustfmt`
 # that we're shipping as well (to ensure that the rustfmt in RLS and the
 # `rustfmt` executable are the same exact version).

diff --git a/src/ci/docker/dist-various-1/Dockerfile b/src/ci/docker/dist-various-1/Dockerfile
@@ -109,7 +109,9 @@ ENV TARGETS=$TARGETS,thumbv6m-none-eabi
 ENV TARGETS=$TARGETS,thumbv7m-none-eabi
 ENV TARGETS=$TARGETS,thumbv7em-none-eabi
 ENV TARGETS=$TARGETS,thumbv7em-none-eabihf
+ENV TARGETS=$TARGETS,thumbv8m.base-none-eabi
 ENV TARGETS=$TARGETS,thumbv8m.main-none-eabi
+ENV TARGETS=$TARGETS,thumbv8m.main-none-eabihf
 ENV TARGETS=$TARGETS,riscv32imc-unknown-none-elf
 ENV TARGETS=$TARGETS,riscv32imac-unknown-none-elf
 ENV TARGETS=$TARGETS,riscv64imac-unknown-none-elf

diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs
@@ -103,7 +103,9 @@ static TARGETS: &'static [&'static str] = &[
     "thumbv7em-none-eabi",
     "thumbv7em-none-eabihf",
     "thumbv7m-none-eabi",
+    "thumbv8m.base-none-eabi",
     "thumbv8m.main-none-eabi",
+    "thumbv8m.main-none-eabihf",
     "wasm32-unknown-emscripten",
     "wasm32-unknown-unknown",
     "x86_64-apple-darwin",

diff --git a/src/tools/tidy/src/extdeps.rs b/src/tools/tidy/src/extdeps.rs
@@ -6,6 +6,8 @@ use std::path::Path;
 /// List of whitelisted sources for packages.
 const WHITELISTED_SOURCES: &[&str] = &[
     "\"registry+https://github.com/rust-lang/crates.io-index\"",
+    "\"git+https://github.com/hug-dev/compiler-builtins?branch=\
+armv8m-support#e745aea2c2ba46fef91d3761c9af699e5dc214f5\"",
 ];
 
 /// Checks for external package sources.