From 7c1723c01292ae647df05a0253ada613bba8dff8 Mon Sep 17 00:00:00 2001 From: Paolo Teti Date: Fri, 24 Aug 2018 10:39:30 +0200 Subject: [PATCH 01/10] Add target for Little-endian ARM Cortex-R4F/R5F MCUs Similar to `armebv7r-none-eabihf`, but for Little-endian MCUs. As example TI RM4x/RM5x are Little-endian Cortex-R4F/R5F MCUs. CI/Dockerfile is intentionally in the disabled folder. --- .../dist-armv7r-none-eabihf/Dockerfile | 34 ++++++++++++++++ .../spec/armv7r_none_eabihf.rs | 40 +++++++++++++++++++ src/librustc_target/spec/mod.rs | 1 + src/tools/build-manifest/src/main.rs | 1 + 4 files changed, 76 insertions(+) create mode 100644 src/ci/docker/disabled/dist-armv7r-none-eabihf/Dockerfile create mode 100644 src/librustc_target/spec/armv7r_none_eabihf.rs diff --git a/src/ci/docker/disabled/dist-armv7r-none-eabihf/Dockerfile b/src/ci/docker/disabled/dist-armv7r-none-eabihf/Dockerfile new file mode 100644 index 0000000000000..41e56276720a8 --- /dev/null +++ b/src/ci/docker/disabled/dist-armv7r-none-eabihf/Dockerfile @@ -0,0 +1,34 @@ +FROM ubuntu:16.04 + +RUN apt-get update && apt-get install -y --no-install-recommends \ + g++ \ + make \ + file \ + curl \ + ca-certificates \ + python2.7 \ + git \ + cmake \ + sudo \ + xz-utils \ + bzip2 \ + libssl-dev \ + pkg-config + + +COPY scripts/sccache.sh /scripts/ +RUN sh /scripts/sccache.sh + +# GNU Arm Embedded Toolchain 7-2018-q2-update (June 27,2018) +ENV BASE_URL=https://developer.arm.com/-/media/Files/downloads/gnu-rm/ +RUN curl -L $BASE_URL/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2 | tar -xj +ENV PATH=$PATH:/gcc-arm-none-eabi-7-2018-q2-update/bin + +ENV TARGET=armv7r-none-eabihf + +ENV CC_armv7r_none_eabihf=arm-none-eabi-gcc \ + CFLAGS_armv7r_none_eabihf="-march=armv7-r" + +ENV RUST_CONFIGURE_ARGS --disable-docs + +ENV SCRIPT python2.7 ../x.py dist --target $TARGET diff --git a/src/librustc_target/spec/armv7r_none_eabihf.rs b/src/librustc_target/spec/armv7r_none_eabihf.rs new file mode 100644 index 0000000000000..e885440d094f8 --- /dev/null +++ b/src/librustc_target/spec/armv7r_none_eabihf.rs @@ -0,0 +1,40 @@ +// Copyright 2018 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// Targets the Little-endian Cortex-R4F/R5F processor (ARMv7-R) + +use std::default::Default; +use spec::{LinkerFlavor, PanicStrategy, Target, TargetOptions, TargetResult}; + +pub fn target() -> TargetResult { + Ok(Target { + llvm_target: "armv7r-none-eabihf".to_string(), + target_endian: "little".to_string(), + target_pointer_width: "32".to_string(), + target_c_int_width: "32".to_string(), + data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(), + arch: "arm".to_string(), + target_os: "none".to_string(), + target_env: "".to_string(), + target_vendor: "".to_string(), + linker_flavor: LinkerFlavor::Gcc, + + options: TargetOptions { + executables: true, + relocation_model: "static".to_string(), + panic_strategy: PanicStrategy::Abort, + features: "+vfp3,+d16,+fp-only-sp".to_string(), + max_atomic_width: Some(32), + abi_blacklist: super::arm_base::abi_blacklist(), + emit_debug_gdb_scripts: false, + .. Default::default() + }, + }) +} diff --git a/src/librustc_target/spec/mod.rs b/src/librustc_target/spec/mod.rs index 7608ccab66f3d..399fb5f13f07c 100644 --- a/src/librustc_target/spec/mod.rs +++ b/src/librustc_target/spec/mod.rs @@ -371,6 +371,7 @@ supported_targets! { ("armv7s-apple-ios", armv7s_apple_ios), ("armebv7r-none-eabihf", armebv7r_none_eabihf), + ("armv7r-none-eabihf", armv7r_none_eabihf), ("x86_64-sun-solaris", x86_64_sun_solaris), ("sparcv9-sun-solaris", sparcv9_sun_solaris), diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index 76c15f6601a4a..999cfc1b29b1b 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -64,6 +64,7 @@ static TARGETS: &'static [&'static str] = &[ "armv7-unknown-linux-gnueabihf", "armv7-unknown-linux-musleabihf", "armebv7r-none-eabihf", + "armv7r-none-eabihf", "armv7s-apple-ios", "asmjs-unknown-emscripten", "i386-apple-ios", From 63d94905fab4293041041c1497d299d00aabb868 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Fri, 24 Aug 2018 19:16:20 +0200 Subject: [PATCH 02/10] add armv7r-none-eabi target --- src/librustc_target/spec/armv7r_none_eabi.rs | 40 ++++++++++++++++++++ src/librustc_target/spec/mod.rs | 1 + 2 files changed, 41 insertions(+) create mode 100644 src/librustc_target/spec/armv7r_none_eabi.rs diff --git a/src/librustc_target/spec/armv7r_none_eabi.rs b/src/librustc_target/spec/armv7r_none_eabi.rs new file mode 100644 index 0000000000000..43148d593f13d --- /dev/null +++ b/src/librustc_target/spec/armv7r_none_eabi.rs @@ -0,0 +1,40 @@ +// Copyright 2018 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// Targets the Little-endian Cortex-R4/R5 processor (ARMv7-R) + +use std::default::Default; +use spec::{LinkerFlavor, LldFlavor, PanicStrategy, Target, TargetOptions, TargetResult}; + +pub fn target() -> TargetResult { + Ok(Target { + llvm_target: "armv7r-unknown-none-eabi".to_string(), + target_endian: "little".to_string(), + target_pointer_width: "32".to_string(), + target_c_int_width: "32".to_string(), + data_layout: "e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(), + arch: "arm".to_string(), + target_os: "none".to_string(), + target_env: "".to_string(), + target_vendor: "".to_string(), + linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld), + + options: TargetOptions { + executables: true, + linker: Some("rust-lld".to_owned()), + relocation_model: "static".to_string(), + panic_strategy: PanicStrategy::Abort, + max_atomic_width: Some(32), + abi_blacklist: super::arm_base::abi_blacklist(), + emit_debug_gdb_scripts: false, + .. Default::default() + }, + }) +} diff --git a/src/librustc_target/spec/mod.rs b/src/librustc_target/spec/mod.rs index 399fb5f13f07c..023511b0d5108 100644 --- a/src/librustc_target/spec/mod.rs +++ b/src/librustc_target/spec/mod.rs @@ -372,6 +372,7 @@ supported_targets! { ("armebv7r-none-eabihf", armebv7r_none_eabihf), ("armv7r-none-eabihf", armv7r_none_eabihf), + ("armv7r-none-eabi", armv7r_none_eabi), ("x86_64-sun-solaris", x86_64_sun_solaris), ("sparcv9-sun-solaris", sparcv9_sun_solaris), From 2c3a693dfa2b6b760a47a9f7b8556b568062c4fe Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Fri, 24 Aug 2018 19:16:41 +0200 Subject: [PATCH 03/10] make the armebv7r target more consistent with the armv7r one by removing the redundant +v7 feature --- src/librustc_target/spec/armebv7r_none_eabihf.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/librustc_target/spec/armebv7r_none_eabihf.rs b/src/librustc_target/spec/armebv7r_none_eabihf.rs index c111d2ffe8b4a..e75e05eb945c7 100644 --- a/src/librustc_target/spec/armebv7r_none_eabihf.rs +++ b/src/librustc_target/spec/armebv7r_none_eabihf.rs @@ -30,7 +30,7 @@ pub fn target() -> TargetResult { executables: true, relocation_model: "static".to_string(), panic_strategy: PanicStrategy::Abort, - features: "+v7,+vfp3,+d16,+fp-only-sp".to_string(), + features: "+vfp3,+d16,+fp-only-sp".to_string(), max_atomic_width: Some(32), abi_blacklist: super::arm_base::abi_blacklist(), emit_debug_gdb_scripts: false, From 3537d7b54c4870e144ac5a3b4d69f6d5297d5066 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Fri, 24 Aug 2018 19:18:11 +0200 Subject: [PATCH 04/10] set a default linker for the other Cortex-R targets --- src/librustc_target/spec/armebv7r_none_eabihf.rs | 5 +++-- src/librustc_target/spec/armv7r_none_eabihf.rs | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/librustc_target/spec/armebv7r_none_eabihf.rs b/src/librustc_target/spec/armebv7r_none_eabihf.rs index e75e05eb945c7..f5e1f8ff8df7c 100644 --- a/src/librustc_target/spec/armebv7r_none_eabihf.rs +++ b/src/librustc_target/spec/armebv7r_none_eabihf.rs @@ -11,7 +11,7 @@ // Targets the Cortex-R4F/R5F processor (ARMv7-R) use std::default::Default; -use spec::{LinkerFlavor, PanicStrategy, Target, TargetOptions, TargetResult}; +use spec::{LinkerFlavor, LldFlavor, PanicStrategy, Target, TargetOptions, TargetResult}; pub fn target() -> TargetResult { Ok(Target { @@ -24,10 +24,11 @@ pub fn target() -> TargetResult { target_os: "none".to_string(), target_env: String::new(), target_vendor: String::new(), - linker_flavor: LinkerFlavor::Gcc, + linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld), options: TargetOptions { executables: true, + linker: Some("rust-lld".to_owned()), relocation_model: "static".to_string(), panic_strategy: PanicStrategy::Abort, features: "+vfp3,+d16,+fp-only-sp".to_string(), diff --git a/src/librustc_target/spec/armv7r_none_eabihf.rs b/src/librustc_target/spec/armv7r_none_eabihf.rs index e885440d094f8..713624ec7b214 100644 --- a/src/librustc_target/spec/armv7r_none_eabihf.rs +++ b/src/librustc_target/spec/armv7r_none_eabihf.rs @@ -11,7 +11,7 @@ // Targets the Little-endian Cortex-R4F/R5F processor (ARMv7-R) use std::default::Default; -use spec::{LinkerFlavor, PanicStrategy, Target, TargetOptions, TargetResult}; +use spec::{LinkerFlavor, LldFlavor, PanicStrategy, Target, TargetOptions, TargetResult}; pub fn target() -> TargetResult { Ok(Target { @@ -24,10 +24,11 @@ pub fn target() -> TargetResult { target_os: "none".to_string(), target_env: "".to_string(), target_vendor: "".to_string(), - linker_flavor: LinkerFlavor::Gcc, + linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld), options: TargetOptions { executables: true, + linker: Some("rust-lld".to_owned()), relocation_model: "static".to_string(), panic_strategy: PanicStrategy::Abort, features: "+vfp3,+d16,+fp-only-sp".to_string(), From 84fa5d8037c8f6122c5ed3f89bc687fe484b66bf Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Fri, 24 Aug 2018 19:19:28 +0200 Subject: [PATCH 05/10] build rust-std components for the Cortex-R targets --- src/ci/docker/dist-various-1/Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ci/docker/dist-various-1/Dockerfile b/src/ci/docker/dist-various-1/Dockerfile index bfc5e712f76c3..b095c6a228f77 100644 --- a/src/ci/docker/dist-various-1/Dockerfile +++ b/src/ci/docker/dist-various-1/Dockerfile @@ -103,6 +103,9 @@ ENV TARGETS=$TARGETS,thumbv7m-none-eabi ENV TARGETS=$TARGETS,thumbv7em-none-eabi ENV TARGETS=$TARGETS,thumbv7em-none-eabihf ENV TARGETS=$TARGETS,riscv32imac-unknown-none-elf +ENV TARGETS=$TARGETS,armebv7r-none-eabihf +ENV TARGETS=$TARGETS,armv7r-none-eabi +ENV TARGETS=$TARGETS,armv7r-none-eabihf ENV CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \ CC_mips_unknown_linux_musl=mips-openwrt-linux-gcc \ @@ -120,7 +123,7 @@ ENV RUST_CONFIGURE_ARGS \ --enable-emscripten \ --disable-docs -ENV SCRIPT \ +ENV SCRIPT \ python2.7 ../x.py test --target $RUN_MAKE_TARGETS src/test/run-make && \ python2.7 ../x.py dist --target $TARGETS From c9d8e28b8c283d25e85ca4775e3cdcb63e3fb07c Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Fri, 24 Aug 2018 19:32:49 +0200 Subject: [PATCH 06/10] add armebv7r-none-eabi target --- src/ci/docker/dist-various-1/Dockerfile | 1 + .../spec/armebv7r_none_eabi.rs | 40 +++++++++++++++++++ src/librustc_target/spec/mod.rs | 3 +- 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 src/librustc_target/spec/armebv7r_none_eabi.rs diff --git a/src/ci/docker/dist-various-1/Dockerfile b/src/ci/docker/dist-various-1/Dockerfile index b095c6a228f77..743fb02d9b7c1 100644 --- a/src/ci/docker/dist-various-1/Dockerfile +++ b/src/ci/docker/dist-various-1/Dockerfile @@ -103,6 +103,7 @@ ENV TARGETS=$TARGETS,thumbv7m-none-eabi ENV TARGETS=$TARGETS,thumbv7em-none-eabi ENV TARGETS=$TARGETS,thumbv7em-none-eabihf ENV TARGETS=$TARGETS,riscv32imac-unknown-none-elf +ENV TARGETS=$TARGETS,armebv7r-none-eabi ENV TARGETS=$TARGETS,armebv7r-none-eabihf ENV TARGETS=$TARGETS,armv7r-none-eabi ENV TARGETS=$TARGETS,armv7r-none-eabihf diff --git a/src/librustc_target/spec/armebv7r_none_eabi.rs b/src/librustc_target/spec/armebv7r_none_eabi.rs new file mode 100644 index 0000000000000..8d3ff1b800fb2 --- /dev/null +++ b/src/librustc_target/spec/armebv7r_none_eabi.rs @@ -0,0 +1,40 @@ +// Copyright 2016 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// Targets the Big endian Cortex-R4/R5 processor (ARMv7-R) + +use std::default::Default; +use spec::{LinkerFlavor, LldFlavor, PanicStrategy, Target, TargetOptions, TargetResult}; + +pub fn target() -> TargetResult { + Ok(Target { + llvm_target: "armebv7r-unknown-none-eabi".to_string(), + target_endian: "big".to_string(), + target_pointer_width: "32".to_string(), + target_c_int_width: "32".to_string(), + data_layout: "E-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64".to_string(), + arch: "arm".to_string(), + target_os: "none".to_string(), + target_env: "".to_string(), + target_vendor: "".to_string(), + linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld), + + options: TargetOptions { + executables: true, + linker: Some("rust-lld".to_owned()), + relocation_model: "static".to_string(), + panic_strategy: PanicStrategy::Abort, + max_atomic_width: Some(32), + abi_blacklist: super::arm_base::abi_blacklist(), + emit_debug_gdb_scripts: false, + .. Default::default() + }, + }) +} diff --git a/src/librustc_target/spec/mod.rs b/src/librustc_target/spec/mod.rs index 023511b0d5108..7c0cdf991ef44 100644 --- a/src/librustc_target/spec/mod.rs +++ b/src/librustc_target/spec/mod.rs @@ -370,9 +370,10 @@ supported_targets! { ("armv7-apple-ios", armv7_apple_ios), ("armv7s-apple-ios", armv7s_apple_ios), + ("armebv7r-none-eabi", armebv7r_none_eabi), ("armebv7r-none-eabihf", armebv7r_none_eabihf), - ("armv7r-none-eabihf", armv7r_none_eabihf), ("armv7r-none-eabi", armv7r_none_eabi), + ("armv7r-none-eabihf", armv7r_none_eabihf), ("x86_64-sun-solaris", x86_64_sun_solaris), ("sparcv9-sun-solaris", sparcv9_sun_solaris), From a597b6a45c27f87c0bddc9290b6ac26f93336bbf Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Fri, 24 Aug 2018 19:34:13 +0200 Subject: [PATCH 07/10] more consistent llvm triples --- src/librustc_target/spec/armebv7r_none_eabihf.rs | 2 +- src/librustc_target/spec/armv7r_none_eabihf.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/librustc_target/spec/armebv7r_none_eabihf.rs b/src/librustc_target/spec/armebv7r_none_eabihf.rs index f5e1f8ff8df7c..0343ea7bd17e9 100644 --- a/src/librustc_target/spec/armebv7r_none_eabihf.rs +++ b/src/librustc_target/spec/armebv7r_none_eabihf.rs @@ -15,7 +15,7 @@ use spec::{LinkerFlavor, LldFlavor, PanicStrategy, Target, TargetOptions, Target pub fn target() -> TargetResult { Ok(Target { - llvm_target: "armebv7r-none-eabihf".to_string(), + llvm_target: "armebv7r-unknown-none-eabihf".to_string(), target_endian: "big".to_string(), target_pointer_width: "32".to_string(), target_c_int_width: "32".to_string(), diff --git a/src/librustc_target/spec/armv7r_none_eabihf.rs b/src/librustc_target/spec/armv7r_none_eabihf.rs index 713624ec7b214..036b0544c5244 100644 --- a/src/librustc_target/spec/armv7r_none_eabihf.rs +++ b/src/librustc_target/spec/armv7r_none_eabihf.rs @@ -15,7 +15,7 @@ use spec::{LinkerFlavor, LldFlavor, PanicStrategy, Target, TargetOptions, Target pub fn target() -> TargetResult { Ok(Target { - llvm_target: "armv7r-none-eabihf".to_string(), + llvm_target: "armv7r-unknown-none-eabihf".to_string(), target_endian: "little".to_string(), target_pointer_width: "32".to_string(), target_c_int_width: "32".to_string(), From e2e72cc3ef159fb460cfb782a672f2382d89f915 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Fri, 24 Aug 2018 20:07:56 +0200 Subject: [PATCH 08/10] fix docker build for the armebv7r-none-eabi target --- src/ci/docker/dist-various-1/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ci/docker/dist-various-1/Dockerfile b/src/ci/docker/dist-various-1/Dockerfile index 743fb02d9b7c1..e072959baa9c2 100644 --- a/src/ci/docker/dist-various-1/Dockerfile +++ b/src/ci/docker/dist-various-1/Dockerfile @@ -111,7 +111,8 @@ ENV TARGETS=$TARGETS,armv7r-none-eabihf ENV CC_mipsel_unknown_linux_musl=mipsel-openwrt-linux-gcc \ CC_mips_unknown_linux_musl=mips-openwrt-linux-gcc \ CC_sparc64_unknown_linux_gnu=sparc64-linux-gnu-gcc \ - CC_x86_64_unknown_redox=x86_64-unknown-redox-gcc + CC_x86_64_unknown_redox=x86_64-unknown-redox-gcc \ + CC_armebv7r_none_eabi=arm-none-eabi-gcc ENV RUST_CONFIGURE_ARGS \ --musl-root-armv5te=/musl-armv5te \ From 264c47a2aadb97cfa746f981f361d340d8b5a970 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Fri, 24 Aug 2018 20:08:22 +0200 Subject: [PATCH 09/10] remove no longer needed Docker images --- .../dist-armebv7r-none-eabihf/Dockerfile | 36 ------------------- .../dist-armv7r-none-eabihf/Dockerfile | 34 ------------------ 2 files changed, 70 deletions(-) delete mode 100644 src/ci/docker/disabled/dist-armebv7r-none-eabihf/Dockerfile delete mode 100644 src/ci/docker/disabled/dist-armv7r-none-eabihf/Dockerfile diff --git a/src/ci/docker/disabled/dist-armebv7r-none-eabihf/Dockerfile b/src/ci/docker/disabled/dist-armebv7r-none-eabihf/Dockerfile deleted file mode 100644 index 34c6e640abb7c..0000000000000 --- a/src/ci/docker/disabled/dist-armebv7r-none-eabihf/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -FROM ubuntu:16.04 - -RUN apt-get update && apt-get install -y --no-install-recommends \ - g++ \ - make \ - file \ - curl \ - ca-certificates \ - python2.7 \ - git \ - cmake \ - sudo \ - xz-utils \ - bzip2 \ - libssl-dev \ - pkg-config - - -COPY scripts/sccache.sh /scripts/ -RUN sh /scripts/sccache.sh - -ENV BASE_URL=https://releases.linaro.org/components/toolchain/binaries/latest/armeb-eabi/ -ENV GCC_LINARO=gcc-linaro-7.2.1-2017.11-x86_64_armeb-eabi - -RUN curl -sL $BASE_URL/$GCC_LINARO.tar.xz | tar -xJ - -ENV PATH=$PATH:/$GCC_LINARO/bin - -ENV TARGET=armebv7r-none-eabihf - -ENV CC_armebv7r_none_eabihf=armeb-eabi-gcc \ - CFLAGS_armebv7r_none_eabihf="-march=armv7-r" - -ENV RUST_CONFIGURE_ARGS --disable-docs - -ENV SCRIPT python2.7 ../x.py dist --target $TARGET diff --git a/src/ci/docker/disabled/dist-armv7r-none-eabihf/Dockerfile b/src/ci/docker/disabled/dist-armv7r-none-eabihf/Dockerfile deleted file mode 100644 index 41e56276720a8..0000000000000 --- a/src/ci/docker/disabled/dist-armv7r-none-eabihf/Dockerfile +++ /dev/null @@ -1,34 +0,0 @@ -FROM ubuntu:16.04 - -RUN apt-get update && apt-get install -y --no-install-recommends \ - g++ \ - make \ - file \ - curl \ - ca-certificates \ - python2.7 \ - git \ - cmake \ - sudo \ - xz-utils \ - bzip2 \ - libssl-dev \ - pkg-config - - -COPY scripts/sccache.sh /scripts/ -RUN sh /scripts/sccache.sh - -# GNU Arm Embedded Toolchain 7-2018-q2-update (June 27,2018) -ENV BASE_URL=https://developer.arm.com/-/media/Files/downloads/gnu-rm/ -RUN curl -L $BASE_URL/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2 | tar -xj -ENV PATH=$PATH:/gcc-arm-none-eabi-7-2018-q2-update/bin - -ENV TARGET=armv7r-none-eabihf - -ENV CC_armv7r_none_eabihf=arm-none-eabi-gcc \ - CFLAGS_armv7r_none_eabihf="-march=armv7-r" - -ENV RUST_CONFIGURE_ARGS --disable-docs - -ENV SCRIPT python2.7 ../x.py dist --target $TARGET From 521df797d5ca67ef362913621ea2a10aa7c4deaf Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Fri, 24 Aug 2018 20:48:44 +0200 Subject: [PATCH 10/10] add the other two targets to the manifest --- src/tools/build-manifest/src/main.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index 999cfc1b29b1b..2bdbdd16c5c65 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -63,7 +63,9 @@ static TARGETS: &'static [&'static str] = &[ "armv7-unknown-cloudabi-eabihf", "armv7-unknown-linux-gnueabihf", "armv7-unknown-linux-musleabihf", + "armebv7r-none-eabi", "armebv7r-none-eabihf", + "armv7r-none-eabi", "armv7r-none-eabihf", "armv7s-apple-ios", "asmjs-unknown-emscripten",