Skip to content

Commit

Permalink
Rollup merge of rust-lang#56954 - hug-dev:armv8m-main-ci, r=alexcrichton
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
@Mark-Simulacrum
Mark-Simulacrum authored Dec 21, 2018
2 parents 3a2d846 + 39ca0f9 commit 9e29511
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 22 deletions.
44 changes: 22 additions & 22 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ name = "backtrace-sys"
version = "0.1.24"
source = "registry+https:/rust-lang/crates.io-index"
dependencies = [
"cc 1.0.25 (registry+https:/rust-lang/crates.io-index)",
"cc 1.0.27 (registry+https:/rust-lang/crates.io-index)",
"libc 0.2.45 (registry+https:/rust-lang/crates.io-index)",
]

Expand Down Expand Up @@ -128,7 +128,7 @@ name = "bootstrap"
version = "0.0.0"
dependencies = [
"build_helper 0.1.0",
"cc 1.0.25 (registry+https:/rust-lang/crates.io-index)",
"cc 1.0.27 (registry+https:/rust-lang/crates.io-index)",
"cmake 0.1.33 (registry+https:/rust-lang/crates.io-index)",
"filetime 0.2.4 (registry+https:/rust-lang/crates.io-index)",
"getopts 0.2.17 (registry+https:/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -260,7 +260,7 @@ version = "0.1.0"

[[package]]
name = "cc"
version = "1.0.25"
version = "1.0.27"
source = "registry+https:/rust-lang/crates.io-index"

[[package]]
Expand Down Expand Up @@ -378,7 +378,7 @@ name = "cmake"
version = "0.1.33"
source = "registry+https:/rust-lang/crates.io-index"
dependencies = [
"cc 1.0.25 (registry+https:/rust-lang/crates.io-index)",
"cc 1.0.27 (registry+https:/rust-lang/crates.io-index)",
]

[[package]]
Expand Down Expand Up @@ -410,7 +410,7 @@ name = "compiler_builtins"
version = "0.1.2"
source = "registry+https:/rust-lang/crates.io-index"
dependencies = [
"cc 1.0.25 (registry+https:/rust-lang/crates.io-index)",
"cc 1.0.27 (registry+https:/rust-lang/crates.io-index)",
"rustc-std-workspace-core 1.0.0",
]

Expand Down Expand Up @@ -602,7 +602,7 @@ name = "curl-sys"
version = "0.4.15"
source = "registry+https:/rust-lang/crates.io-index"
dependencies = [
"cc 1.0.25 (registry+https:/rust-lang/crates.io-index)",
"cc 1.0.27 (registry+https:/rust-lang/crates.io-index)",
"libc 0.2.45 (registry+https:/rust-lang/crates.io-index)",
"libnghttp2-sys 0.1.1 (registry+https:/rust-lang/crates.io-index)",
"libz-sys 1.0.25 (registry+https:/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -1071,7 +1071,7 @@ name = "jemalloc-sys"
version = "0.1.8"
source = "registry+https:/rust-lang/crates.io-index"
dependencies = [
"cc 1.0.25 (registry+https:/rust-lang/crates.io-index)",
"cc 1.0.27 (registry+https:/rust-lang/crates.io-index)",
"fs_extra 1.1.0 (registry+https:/rust-lang/crates.io-index)",
"libc 0.2.45 (registry+https:/rust-lang/crates.io-index)",
]
Expand Down Expand Up @@ -1155,7 +1155,7 @@ name = "libgit2-sys"
version = "0.7.10"
source = "registry+https:/rust-lang/crates.io-index"
dependencies = [
"cc 1.0.25 (registry+https:/rust-lang/crates.io-index)",
"cc 1.0.27 (registry+https:/rust-lang/crates.io-index)",
"curl-sys 0.4.15 (registry+https:/rust-lang/crates.io-index)",
"libc 0.2.45 (registry+https:/rust-lang/crates.io-index)",
"libssh2-sys 0.2.11 (registry+https:/rust-lang/crates.io-index)",
Expand All @@ -1169,7 +1169,7 @@ name = "libnghttp2-sys"
version = "0.1.1"
source = "registry+https:/rust-lang/crates.io-index"
dependencies = [
"cc 1.0.25 (registry+https:/rust-lang/crates.io-index)",
"cc 1.0.27 (registry+https:/rust-lang/crates.io-index)",
"libc 0.2.45 (registry+https:/rust-lang/crates.io-index)",
]

Expand All @@ -1178,7 +1178,7 @@ name = "libssh2-sys"
version = "0.2.11"
source = "registry+https:/rust-lang/crates.io-index"
dependencies = [
"cc 1.0.25 (registry+https:/rust-lang/crates.io-index)",
"cc 1.0.27 (registry+https:/rust-lang/crates.io-index)",
"libc 0.2.45 (registry+https:/rust-lang/crates.io-index)",
"libz-sys 1.0.25 (registry+https:/rust-lang/crates.io-index)",
"openssl-sys 0.9.39 (registry+https:/rust-lang/crates.io-index)",
Expand All @@ -1191,7 +1191,7 @@ name = "libz-sys"
version = "1.0.25"
source = "registry+https:/rust-lang/crates.io-index"
dependencies = [
"cc 1.0.25 (registry+https:/rust-lang/crates.io-index)",
"cc 1.0.27 (registry+https:/rust-lang/crates.io-index)",
"libc 0.2.45 (registry+https:/rust-lang/crates.io-index)",
"pkg-config 0.3.14 (registry+https:/rust-lang/crates.io-index)",
"vcpkg 0.2.6 (registry+https:/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -1239,7 +1239,7 @@ name = "lzma-sys"
version = "0.1.10"
source = "registry+https:/rust-lang/crates.io-index"
dependencies = [
"cc 1.0.25 (registry+https:/rust-lang/crates.io-index)",
"cc 1.0.27 (registry+https:/rust-lang/crates.io-index)",
"filetime 0.2.4 (registry+https:/rust-lang/crates.io-index)",
"libc 0.2.45 (registry+https:/rust-lang/crates.io-index)",
"pkg-config 0.3.14 (registry+https:/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -1345,7 +1345,7 @@ name = "miniz-sys"
version = "0.1.11"
source = "registry+https:/rust-lang/crates.io-index"
dependencies = [
"cc 1.0.25 (registry+https:/rust-lang/crates.io-index)",
"cc 1.0.27 (registry+https:/rust-lang/crates.io-index)",
"libc 0.2.45 (registry+https:/rust-lang/crates.io-index)",
]

Expand All @@ -1362,7 +1362,7 @@ name = "miniz_oxide_c_api"
version = "0.2.0"
source = "registry+https:/rust-lang/crates.io-index"
dependencies = [
"cc 1.0.25 (registry+https:/rust-lang/crates.io-index)",
"cc 1.0.27 (registry+https:/rust-lang/crates.io-index)",
"crc 1.8.1 (registry+https:/rust-lang/crates.io-index)",
"libc 0.2.45 (registry+https:/rust-lang/crates.io-index)",
"miniz_oxide 0.2.0 (registry+https:/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -1474,15 +1474,15 @@ name = "openssl-src"
version = "111.1.0+1.1.1a"
source = "registry+https:/rust-lang/crates.io-index"
dependencies = [
"cc 1.0.25 (registry+https:/rust-lang/crates.io-index)",
"cc 1.0.27 (registry+https:/rust-lang/crates.io-index)",
]

[[package]]
name = "openssl-sys"
version = "0.9.39"
source = "registry+https:/rust-lang/crates.io-index"
dependencies = [
"cc 1.0.25 (registry+https:/rust-lang/crates.io-index)",
"cc 1.0.27 (registry+https:/rust-lang/crates.io-index)",
"libc 0.2.45 (registry+https:/rust-lang/crates.io-index)",
"openssl-src 111.1.0+1.1.1a (registry+https:/rust-lang/crates.io-index)",
"pkg-config 0.3.14 (registry+https:/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -1681,7 +1681,7 @@ version = "0.0.0"
name = "profiler_builtins"
version = "0.0.0"
dependencies = [
"cc 1.0.25 (registry+https:/rust-lang/crates.io-index)",
"cc 1.0.27 (registry+https:/rust-lang/crates.io-index)",
"compiler_builtins 0.1.2 (registry+https:/rust-lang/crates.io-index)",
"core 0.0.0",
]
Expand Down Expand Up @@ -2316,7 +2316,7 @@ dependencies = [
name = "rustc_codegen_llvm"
version = "0.0.0"
dependencies = [
"cc 1.0.25 (registry+https:/rust-lang/crates.io-index)",
"cc 1.0.27 (registry+https:/rust-lang/crates.io-index)",
"memmap 0.6.2 (registry+https:/rust-lang/crates.io-index)",
"num_cpus 1.8.0 (registry+https:/rust-lang/crates.io-index)",
"rustc-demangle 0.1.10 (registry+https:/rust-lang/crates.io-index)",
Expand All @@ -2328,7 +2328,7 @@ name = "rustc_codegen_ssa"
version = "0.0.0"
dependencies = [
"bitflags 1.0.4 (registry+https:/rust-lang/crates.io-index)",
"cc 1.0.25 (registry+https:/rust-lang/crates.io-index)",
"cc 1.0.27 (registry+https:/rust-lang/crates.io-index)",
"jobserver 0.1.12 (registry+https:/rust-lang/crates.io-index)",
"libc 0.2.45 (registry+https:/rust-lang/crates.io-index)",
"log 0.4.6 (registry+https:/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -2479,7 +2479,7 @@ name = "rustc_llvm"
version = "0.0.0"
dependencies = [
"build_helper 0.1.0",
"cc 1.0.25 (registry+https:/rust-lang/crates.io-index)",
"cc 1.0.27 (registry+https:/rust-lang/crates.io-index)",
]

[[package]]
Expand Down Expand Up @@ -2886,7 +2886,7 @@ version = "0.0.0"
dependencies = [
"alloc 0.0.0",
"build_helper 0.1.0",
"cc 1.0.25 (registry+https:/rust-lang/crates.io-index)",
"cc 1.0.27 (registry+https:/rust-lang/crates.io-index)",
"compiler_builtins 0.1.2 (registry+https:/rust-lang/crates.io-index)",
"core 0.0.0",
"dlmalloc 0.1.1 (registry+https:/rust-lang/crates.io-index)",
Expand Down Expand Up @@ -3397,7 +3397,7 @@ source = "registry+https:/rust-lang/crates.io-index"
"checksum byteorder 1.2.7 (registry+https:/rust-lang/crates.io-index)" = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d"
"checksum bytesize 1.0.0 (registry+https:/rust-lang/crates.io-index)" = "716960a18f978640f25101b5cbf1c6f6b0d3192fab36a2d98ca96f0ecbe41010"
"checksum cargo_metadata 0.6.2 (registry+https:/rust-lang/crates.io-index)" = "7d8dfe3adeb30f7938e6c1dd5327f29235d8ada3e898aeb08c343005ec2915a2"
"checksum cc 1.0.25 (registry+https:/rust-lang/crates.io-index)" = "f159dfd43363c4d08055a07703eb7a3406b0dac4d0584d96965a3262db3c9d16"
"checksum cc 1.0.27 (registry+https:/rust-lang/crates.io-index)" = "155ed195f7bd722d1dfeb30365b9d0c1f6a078fa7ca4014497e5935d90993d6f"
"checksum cfg-if 0.1.6 (registry+https:/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
"checksum chalk-engine 0.8.0 (registry+https:/rust-lang/crates.io-index)" = "6749eb72e7d4355d944a99f15fbaea701b978c18c5e184a025fcde942b0c9779"
"checksum chalk-macros 0.1.0 (registry+https:/rust-lang/crates.io-index)" = "295635afd6853aa9f20baeb7f0204862440c0fe994c5a253d5f479dac41d047e"
Expand Down
1 change: 1 addition & 0 deletions src/ci/docker/dist-various-1/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ 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.main-none-eabi
ENV TARGETS=$TARGETS,riscv32imc-unknown-none-elf
ENV TARGETS=$TARGETS,riscv32imac-unknown-none-elf
ENV TARGETS=$TARGETS,armebv7r-none-eabi
Expand Down
1 change: 1 addition & 0 deletions src/tools/build-manifest/src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ static TARGETS: &'static [&'static str] = &[
"thumbv7em-none-eabi",
"thumbv7em-none-eabihf",
"thumbv7m-none-eabi",
"thumbv8m.main-none-eabi",
"wasm32-unknown-emscripten",
"wasm32-unknown-unknown",
"x86_64-apple-darwin",
Expand Down

0 comments on commit 9e29511

Please sign in to comment.