From 8126023c944c9590c6334f8c070243695c81bc18 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Fri, 20 Oct 2017 00:41:29 +0200 Subject: [PATCH 01/10] add the target-c-int-width field to the target specifications this is a new mandatory field in the target specification --- docker/aarch64-unknown-linux-steed.json | 1 + docker/arm-unknown-linux-steedeabi.json | 1 + docker/arm-unknown-linux-steedeabihf.json | 1 + docker/armv7-unknown-linux-steedeabihf.json | 1 + docker/i686-unknown-linux-steed.json | 1 + docker/mips-unknown-linux-steed.json | 1 + docker/mipsel-unknown-linux-steed.json | 1 + docker/powerpc-unknown-linux-steed.json | 1 + docker/powerpc64-unknown-linux-steed.json | 1 + docker/powerpc64le-unknown-linux-steed.json | 1 + docker/x86_64-unknown-linux-steed.json | 1 + 11 files changed, 11 insertions(+) diff --git a/docker/aarch64-unknown-linux-steed.json b/docker/aarch64-unknown-linux-steed.json index fae3d55c7..78270712f 100644 --- a/docker/aarch64-unknown-linux-steed.json +++ b/docker/aarch64-unknown-linux-steed.json @@ -24,6 +24,7 @@ "-nostartfiles" ] }, + "target-c-int-width": 32, "target-endian": "little", "target-family": "unix", "target-pointer-width": "64", diff --git a/docker/arm-unknown-linux-steedeabi.json b/docker/arm-unknown-linux-steedeabi.json index 581294513..e31f5caca 100644 --- a/docker/arm-unknown-linux-steedeabi.json +++ b/docker/arm-unknown-linux-steedeabi.json @@ -25,6 +25,7 @@ "-nostartfiles" ] }, + "target-c-int-width": 32, "target-endian": "little", "target-family": "unix", "target-pointer-width": "32", diff --git a/docker/arm-unknown-linux-steedeabihf.json b/docker/arm-unknown-linux-steedeabihf.json index 73173cd52..871ccb9b8 100644 --- a/docker/arm-unknown-linux-steedeabihf.json +++ b/docker/arm-unknown-linux-steedeabihf.json @@ -25,6 +25,7 @@ "-nostartfiles" ] }, + "target-c-int-width": 32, "target-endian": "little", "target-family": "unix", "target-pointer-width": "32", diff --git a/docker/armv7-unknown-linux-steedeabihf.json b/docker/armv7-unknown-linux-steedeabihf.json index 371e582a8..6201d01bd 100644 --- a/docker/armv7-unknown-linux-steedeabihf.json +++ b/docker/armv7-unknown-linux-steedeabihf.json @@ -25,6 +25,7 @@ "-nostartfiles" ] }, + "target-c-int-width": 32, "target-endian": "little", "target-family": "unix", "target-pointer-width": "32", diff --git a/docker/i686-unknown-linux-steed.json b/docker/i686-unknown-linux-steed.json index a85a6c6c4..73d2c2456 100644 --- a/docker/i686-unknown-linux-steed.json +++ b/docker/i686-unknown-linux-steed.json @@ -19,6 +19,7 @@ "-nostartfiles" ] }, + "target-c-int-width": 32, "target-endian": "little", "target-family": "unix", "target-pointer-width": "32", diff --git a/docker/mips-unknown-linux-steed.json b/docker/mips-unknown-linux-steed.json index e70febfbe..208d9af9b 100644 --- a/docker/mips-unknown-linux-steed.json +++ b/docker/mips-unknown-linux-steed.json @@ -19,6 +19,7 @@ ] }, "relocation-model": "static", + "target-c-int-width": 32, "target-endian": "big", "target-family": "unix", "target-pointer-width": "32", diff --git a/docker/mipsel-unknown-linux-steed.json b/docker/mipsel-unknown-linux-steed.json index e495debf6..e1d4dd741 100644 --- a/docker/mipsel-unknown-linux-steed.json +++ b/docker/mipsel-unknown-linux-steed.json @@ -18,6 +18,7 @@ "-nostartfiles" ] }, + "target-c-int-width": 32, "relocation-model": "static", "target-endian": "little", "target-family": "unix", diff --git a/docker/powerpc-unknown-linux-steed.json b/docker/powerpc-unknown-linux-steed.json index c8ac4f95c..7bd6c671a 100644 --- a/docker/powerpc-unknown-linux-steed.json +++ b/docker/powerpc-unknown-linux-steed.json @@ -17,6 +17,7 @@ "-nostartfiles" ] }, + "target-c-int-width": 32, "target-endian": "big", "target-family": "unix", "target-pointer-width": "32", diff --git a/docker/powerpc64-unknown-linux-steed.json b/docker/powerpc64-unknown-linux-steed.json index e0af6bdbe..c27ea4f03 100644 --- a/docker/powerpc64-unknown-linux-steed.json +++ b/docker/powerpc64-unknown-linux-steed.json @@ -18,6 +18,7 @@ "-nostartfiles" ] }, + "target-c-int-width": 32, "target-endian": "big", "target-family": "unix", "target-pointer-width": "64", diff --git a/docker/powerpc64le-unknown-linux-steed.json b/docker/powerpc64le-unknown-linux-steed.json index 2ce3308d8..94827dbd6 100644 --- a/docker/powerpc64le-unknown-linux-steed.json +++ b/docker/powerpc64le-unknown-linux-steed.json @@ -18,6 +18,7 @@ "-nostartfiles" ] }, + "target-c-int-width": 32, "target-endian": "little", "target-family": "unix", "target-pointer-width": "64", diff --git a/docker/x86_64-unknown-linux-steed.json b/docker/x86_64-unknown-linux-steed.json index 4d2ae0d2a..8c9836fcd 100644 --- a/docker/x86_64-unknown-linux-steed.json +++ b/docker/x86_64-unknown-linux-steed.json @@ -19,6 +19,7 @@ "-nostartfiles" ] }, + "target-c-int-width": 32, "target-endian": "little", "target-family": "unix", "target-pointer-width": "64", From 8bb2e868a3062782b6142286a99c25838597d24a Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Fri, 20 Oct 2017 00:50:07 +0200 Subject: [PATCH 02/10] the field needs to be a string, I think --- docker/aarch64-unknown-linux-steed.json | 2 +- docker/arm-unknown-linux-steedeabi.json | 2 +- docker/arm-unknown-linux-steedeabihf.json | 2 +- docker/armv7-unknown-linux-steedeabihf.json | 2 +- docker/i686-unknown-linux-steed.json | 2 +- docker/mips-unknown-linux-steed.json | 2 +- docker/mipsel-unknown-linux-steed.json | 2 +- docker/powerpc-unknown-linux-steed.json | 2 +- docker/powerpc64-unknown-linux-steed.json | 2 +- docker/powerpc64le-unknown-linux-steed.json | 2 +- docker/x86_64-unknown-linux-steed.json | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docker/aarch64-unknown-linux-steed.json b/docker/aarch64-unknown-linux-steed.json index 78270712f..c4bcd77b5 100644 --- a/docker/aarch64-unknown-linux-steed.json +++ b/docker/aarch64-unknown-linux-steed.json @@ -24,7 +24,7 @@ "-nostartfiles" ] }, - "target-c-int-width": 32, + "target-c-int-width": "32", "target-endian": "little", "target-family": "unix", "target-pointer-width": "64", diff --git a/docker/arm-unknown-linux-steedeabi.json b/docker/arm-unknown-linux-steedeabi.json index e31f5caca..60b670b57 100644 --- a/docker/arm-unknown-linux-steedeabi.json +++ b/docker/arm-unknown-linux-steedeabi.json @@ -25,7 +25,7 @@ "-nostartfiles" ] }, - "target-c-int-width": 32, + "target-c-int-width": "32", "target-endian": "little", "target-family": "unix", "target-pointer-width": "32", diff --git a/docker/arm-unknown-linux-steedeabihf.json b/docker/arm-unknown-linux-steedeabihf.json index 871ccb9b8..6c1a4d665 100644 --- a/docker/arm-unknown-linux-steedeabihf.json +++ b/docker/arm-unknown-linux-steedeabihf.json @@ -25,7 +25,7 @@ "-nostartfiles" ] }, - "target-c-int-width": 32, + "target-c-int-width": "32", "target-endian": "little", "target-family": "unix", "target-pointer-width": "32", diff --git a/docker/armv7-unknown-linux-steedeabihf.json b/docker/armv7-unknown-linux-steedeabihf.json index 6201d01bd..963c91e06 100644 --- a/docker/armv7-unknown-linux-steedeabihf.json +++ b/docker/armv7-unknown-linux-steedeabihf.json @@ -25,7 +25,7 @@ "-nostartfiles" ] }, - "target-c-int-width": 32, + "target-c-int-width": "32", "target-endian": "little", "target-family": "unix", "target-pointer-width": "32", diff --git a/docker/i686-unknown-linux-steed.json b/docker/i686-unknown-linux-steed.json index 73d2c2456..b496273bc 100644 --- a/docker/i686-unknown-linux-steed.json +++ b/docker/i686-unknown-linux-steed.json @@ -19,7 +19,7 @@ "-nostartfiles" ] }, - "target-c-int-width": 32, + "target-c-int-width": "32", "target-endian": "little", "target-family": "unix", "target-pointer-width": "32", diff --git a/docker/mips-unknown-linux-steed.json b/docker/mips-unknown-linux-steed.json index 208d9af9b..2ca095d2b 100644 --- a/docker/mips-unknown-linux-steed.json +++ b/docker/mips-unknown-linux-steed.json @@ -19,7 +19,7 @@ ] }, "relocation-model": "static", - "target-c-int-width": 32, + "target-c-int-width": "32", "target-endian": "big", "target-family": "unix", "target-pointer-width": "32", diff --git a/docker/mipsel-unknown-linux-steed.json b/docker/mipsel-unknown-linux-steed.json index e1d4dd741..3f18675db 100644 --- a/docker/mipsel-unknown-linux-steed.json +++ b/docker/mipsel-unknown-linux-steed.json @@ -18,7 +18,7 @@ "-nostartfiles" ] }, - "target-c-int-width": 32, + "target-c-int-width": "32", "relocation-model": "static", "target-endian": "little", "target-family": "unix", diff --git a/docker/powerpc-unknown-linux-steed.json b/docker/powerpc-unknown-linux-steed.json index 7bd6c671a..1d92ee876 100644 --- a/docker/powerpc-unknown-linux-steed.json +++ b/docker/powerpc-unknown-linux-steed.json @@ -17,7 +17,7 @@ "-nostartfiles" ] }, - "target-c-int-width": 32, + "target-c-int-width": "32", "target-endian": "big", "target-family": "unix", "target-pointer-width": "32", diff --git a/docker/powerpc64-unknown-linux-steed.json b/docker/powerpc64-unknown-linux-steed.json index c27ea4f03..5d67095fc 100644 --- a/docker/powerpc64-unknown-linux-steed.json +++ b/docker/powerpc64-unknown-linux-steed.json @@ -18,7 +18,7 @@ "-nostartfiles" ] }, - "target-c-int-width": 32, + "target-c-int-width": "32", "target-endian": "big", "target-family": "unix", "target-pointer-width": "64", diff --git a/docker/powerpc64le-unknown-linux-steed.json b/docker/powerpc64le-unknown-linux-steed.json index 94827dbd6..45267d337 100644 --- a/docker/powerpc64le-unknown-linux-steed.json +++ b/docker/powerpc64le-unknown-linux-steed.json @@ -18,7 +18,7 @@ "-nostartfiles" ] }, - "target-c-int-width": 32, + "target-c-int-width": "32", "target-endian": "little", "target-family": "unix", "target-pointer-width": "64", diff --git a/docker/x86_64-unknown-linux-steed.json b/docker/x86_64-unknown-linux-steed.json index 8c9836fcd..5f60ed30f 100644 --- a/docker/x86_64-unknown-linux-steed.json +++ b/docker/x86_64-unknown-linux-steed.json @@ -19,7 +19,7 @@ "-nostartfiles" ] }, - "target-c-int-width": 32, + "target-c-int-width": "32", "target-endian": "little", "target-family": "unix", "target-pointer-width": "64", From 25b81b0813894aa38af252b4a4d2a7e23ec30518 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Fri, 20 Oct 2017 01:01:01 +0200 Subject: [PATCH 03/10] add feature gates --- src/lib.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index b52949944..a03c591d2 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -7,7 +7,9 @@ #![feature(cfg_target_vendor)] #![feature(collections_range)] #![feature(compiler_builtins_lib)] -#![feature(const_fn)] +#![feature(const_atomic_bool_new)] +#![feature(const_atomic_u8_new)] +#![feature(const_atomic_usize_new)] #![feature(core_intrinsics)] #![feature(custom_attribute)] #![feature(dropck_eyepatch)] @@ -22,8 +24,8 @@ #![feature(lang_items)] #![feature(macro_reexport)] #![feature(naked_functions)] -#![feature(optin_builtin_traits)] #![feature(needs_drop)] +#![feature(optin_builtin_traits)] #![feature(placement_new_protocol)] #![feature(prelude_import)] #![feature(rand)] From a41cea0efbbf46812b81ba85c9cf5e2537fe780d Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Fri, 20 Oct 2017 01:08:12 +0200 Subject: [PATCH 04/10] add back const_fn feature gate --- src/lib.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib.rs b/src/lib.rs index a03c591d2..5d570f1a1 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -10,6 +10,7 @@ #![feature(const_atomic_bool_new)] #![feature(const_atomic_u8_new)] #![feature(const_atomic_usize_new)] +#![feature(const_fn)] #![feature(core_intrinsics)] #![feature(custom_attribute)] #![feature(dropck_eyepatch)] From b1e22d1054a106e9f1e5f28cdf3c19f58a1cc4f4 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Fri, 20 Oct 2017 01:17:08 +0200 Subject: [PATCH 05/10] cross is version 0.1.12 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 010665776..6e363fd79 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,7 +54,7 @@ after_success: after_script: set +e before_cache: - - docker history -q japaric/$TARGET:v0.1.10 | + - docker history -q japaric/$TARGET:v0.1.12 | grep -v \ | xargs docker save | gzip > $HOME/docker/$TARGET.tar.gz From 3a945a5e289f544743ec8ec5414f715ea2f6b46e Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Fri, 20 Oct 2017 01:21:00 +0200 Subject: [PATCH 06/10] qemu up --- docker/aarch64-unknown-linux-steed/Dockerfile | 2 +- docker/arm-unknown-linux-steedeabi/Dockerfile | 2 +- docker/arm-unknown-linux-steedeabihf/Dockerfile | 2 +- docker/armv7-unknown-linux-steedeabihf/Dockerfile | 2 +- docker/mips-unknown-linux-steed/Dockerfile | 2 +- docker/mipsel-unknown-linux-steed/Dockerfile | 2 +- docker/powerpc-unknown-linux-steed/Dockerfile | 2 +- docker/powerpc64-unknown-linux-steed/Dockerfile | 2 +- docker/powerpc64le-unknown-linux-steed/Dockerfile | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docker/aarch64-unknown-linux-steed/Dockerfile b/docker/aarch64-unknown-linux-steed/Dockerfile index 7dba10a05..ec0574271 100644 --- a/docker/aarch64-unknown-linux-steed/Dockerfile +++ b/docker/aarch64-unknown-linux-steed/Dockerfile @@ -14,7 +14,7 @@ COPY lld.sh / RUN bash /lld.sh COPY qemu.sh / -RUN bash /qemu.sh 2.9.0 aarch64 +RUN bash /qemu.sh 2.10.1 aarch64 COPY aarch64-unknown-linux-steed.json /json diff --git a/docker/arm-unknown-linux-steedeabi/Dockerfile b/docker/arm-unknown-linux-steedeabi/Dockerfile index 9f98a1cf5..3681cef33 100644 --- a/docker/arm-unknown-linux-steedeabi/Dockerfile +++ b/docker/arm-unknown-linux-steedeabi/Dockerfile @@ -14,7 +14,7 @@ COPY lld.sh / RUN bash /lld.sh COPY qemu.sh / -RUN bash /qemu.sh 2.9.0 arm +RUN bash /qemu.sh 2.10.1 arm COPY arm-unknown-linux-steedeabi.json /json diff --git a/docker/arm-unknown-linux-steedeabihf/Dockerfile b/docker/arm-unknown-linux-steedeabihf/Dockerfile index c3ddc0baa..aa2fa1132 100644 --- a/docker/arm-unknown-linux-steedeabihf/Dockerfile +++ b/docker/arm-unknown-linux-steedeabihf/Dockerfile @@ -14,7 +14,7 @@ COPY lld.sh / RUN bash /lld.sh COPY qemu.sh / -RUN bash /qemu.sh 2.9.0 arm +RUN bash /qemu.sh 2.10.1 arm COPY arm-unknown-linux-steedeabihf.json /json diff --git a/docker/armv7-unknown-linux-steedeabihf/Dockerfile b/docker/armv7-unknown-linux-steedeabihf/Dockerfile index 83b41cdf5..3d9347be4 100644 --- a/docker/armv7-unknown-linux-steedeabihf/Dockerfile +++ b/docker/armv7-unknown-linux-steedeabihf/Dockerfile @@ -14,7 +14,7 @@ COPY lld.sh / RUN bash /lld.sh COPY qemu.sh / -RUN bash /qemu.sh 2.9.0 arm +RUN bash /qemu.sh 2.10.1 arm COPY armv7-unknown-linux-steedeabihf.json /json diff --git a/docker/mips-unknown-linux-steed/Dockerfile b/docker/mips-unknown-linux-steed/Dockerfile index a71e05274..e30d1daa9 100644 --- a/docker/mips-unknown-linux-steed/Dockerfile +++ b/docker/mips-unknown-linux-steed/Dockerfile @@ -14,7 +14,7 @@ COPY lld.sh / RUN bash /lld.sh COPY qemu.sh / -RUN bash /qemu.sh 2.9.0 mips +RUN bash /qemu.sh 2.10.1 mips COPY mips-unknown-linux-steed.json /json diff --git a/docker/mipsel-unknown-linux-steed/Dockerfile b/docker/mipsel-unknown-linux-steed/Dockerfile index 58f8682e2..c00ad858b 100644 --- a/docker/mipsel-unknown-linux-steed/Dockerfile +++ b/docker/mipsel-unknown-linux-steed/Dockerfile @@ -14,7 +14,7 @@ COPY lld.sh / RUN bash /lld.sh COPY qemu.sh / -RUN bash /qemu.sh 2.9.0 mipsel +RUN bash /qemu.sh 2.10.1 mipsel COPY mipsel-unknown-linux-steed.json /json diff --git a/docker/powerpc-unknown-linux-steed/Dockerfile b/docker/powerpc-unknown-linux-steed/Dockerfile index 430359458..3cdfc966e 100644 --- a/docker/powerpc-unknown-linux-steed/Dockerfile +++ b/docker/powerpc-unknown-linux-steed/Dockerfile @@ -13,7 +13,7 @@ RUN bash /xargo.sh COPY qemu.sh / RUN apt-get install -y --no-install-recommends \ gcc-powerpc-linux-gnu && \ - bash /qemu.sh 2.9.0 ppc + bash /qemu.sh 2.10.1 ppc COPY powerpc-unknown-linux-steed.json /json diff --git a/docker/powerpc64-unknown-linux-steed/Dockerfile b/docker/powerpc64-unknown-linux-steed/Dockerfile index 86ae9fc15..2ae837287 100644 --- a/docker/powerpc64-unknown-linux-steed/Dockerfile +++ b/docker/powerpc64-unknown-linux-steed/Dockerfile @@ -13,7 +13,7 @@ RUN bash /xargo.sh COPY qemu.sh / RUN apt-get install -y --no-install-recommends \ gcc-powerpc64-linux-gnu && \ - bash /qemu.sh 2.9.0 ppc64 + bash /qemu.sh 2.10.1 ppc64 COPY powerpc64-unknown-linux-steed.json /json diff --git a/docker/powerpc64le-unknown-linux-steed/Dockerfile b/docker/powerpc64le-unknown-linux-steed/Dockerfile index cec07ee5e..d849b0293 100644 --- a/docker/powerpc64le-unknown-linux-steed/Dockerfile +++ b/docker/powerpc64le-unknown-linux-steed/Dockerfile @@ -13,7 +13,7 @@ RUN bash /xargo.sh COPY qemu.sh / RUN apt-get install -y --no-install-recommends \ gcc-powerpc64le-linux-gnu && \ - bash /qemu.sh 2.9.0 ppc64le + bash /qemu.sh 2.10.1 ppc64le COPY powerpc64le-unknown-linux-steed.json /json From b4a3cd51faa836daca7dd0558f1be2e5d36206d2 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Fri, 20 Oct 2017 01:32:27 +0200 Subject: [PATCH 07/10] use cargo runner to launch qemu --- docker/aarch64-unknown-linux-steed/Dockerfile | 3 ++- docker/arm-unknown-linux-steedeabi/Dockerfile | 3 ++- docker/arm-unknown-linux-steedeabihf/Dockerfile | 3 ++- docker/armv7-unknown-linux-steedeabihf/Dockerfile | 3 ++- docker/mips-unknown-linux-steed/Dockerfile | 3 ++- docker/mipsel-unknown-linux-steed/Dockerfile | 3 ++- docker/powerpc-unknown-linux-steed/Dockerfile | 2 +- docker/powerpc64-unknown-linux-steed/Dockerfile | 2 +- docker/powerpc64le-unknown-linux-steed/Dockerfile | 2 +- 9 files changed, 15 insertions(+), 9 deletions(-) diff --git a/docker/aarch64-unknown-linux-steed/Dockerfile b/docker/aarch64-unknown-linux-steed/Dockerfile index ec0574271..90a1169dd 100644 --- a/docker/aarch64-unknown-linux-steed/Dockerfile +++ b/docker/aarch64-unknown-linux-steed/Dockerfile @@ -18,5 +18,6 @@ RUN bash /qemu.sh 2.10.1 aarch64 COPY aarch64-unknown-linux-steed.json /json -ENV RUST_TARGET_PATH=/json \ +ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_STEED_RUNNER=qemu-aarch64 \ + RUST_TARGET_PATH=/json \ RUST_TEST_THREADS=1 diff --git a/docker/arm-unknown-linux-steedeabi/Dockerfile b/docker/arm-unknown-linux-steedeabi/Dockerfile index 3681cef33..e5e9dc6d5 100644 --- a/docker/arm-unknown-linux-steedeabi/Dockerfile +++ b/docker/arm-unknown-linux-steedeabi/Dockerfile @@ -18,5 +18,6 @@ RUN bash /qemu.sh 2.10.1 arm COPY arm-unknown-linux-steedeabi.json /json -ENV RUST_TARGET_PATH=/json \ +ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_STEEDABI_RUNNER=qemu-arm \ + RUST_TARGET_PATH=/json \ RUST_TEST_THREADS=1 diff --git a/docker/arm-unknown-linux-steedeabihf/Dockerfile b/docker/arm-unknown-linux-steedeabihf/Dockerfile index aa2fa1132..173724dcd 100644 --- a/docker/arm-unknown-linux-steedeabihf/Dockerfile +++ b/docker/arm-unknown-linux-steedeabihf/Dockerfile @@ -18,5 +18,6 @@ RUN bash /qemu.sh 2.10.1 arm COPY arm-unknown-linux-steedeabihf.json /json -ENV RUST_TARGET_PATH=/json \ +ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_STEEDABIHF_RUNNER=qemu-arm \ + RUST_TARGET_PATH=/json \ RUST_TEST_THREADS=1 diff --git a/docker/armv7-unknown-linux-steedeabihf/Dockerfile b/docker/armv7-unknown-linux-steedeabihf/Dockerfile index 3d9347be4..75dd7ecd8 100644 --- a/docker/armv7-unknown-linux-steedeabihf/Dockerfile +++ b/docker/armv7-unknown-linux-steedeabihf/Dockerfile @@ -18,5 +18,6 @@ RUN bash /qemu.sh 2.10.1 arm COPY armv7-unknown-linux-steedeabihf.json /json -ENV RUST_TARGET_PATH=/json \ +ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_STEEDABIHF_RUNNER=qemu-arm \ + RUST_TARGET_PATH=/json \ RUST_TEST_THREADS=1 diff --git a/docker/mips-unknown-linux-steed/Dockerfile b/docker/mips-unknown-linux-steed/Dockerfile index e30d1daa9..5b3089a4f 100644 --- a/docker/mips-unknown-linux-steed/Dockerfile +++ b/docker/mips-unknown-linux-steed/Dockerfile @@ -18,5 +18,6 @@ RUN bash /qemu.sh 2.10.1 mips COPY mips-unknown-linux-steed.json /json -ENV RUST_TARGET_PATH=/json \ +ENV CARGO_TARGET_MIPS_UNKNOWN_LINUX_STEED_RUNNER=qemu-mips \ + RUST_TARGET_PATH=/json \ RUST_TEST_THREADS=1 diff --git a/docker/mipsel-unknown-linux-steed/Dockerfile b/docker/mipsel-unknown-linux-steed/Dockerfile index c00ad858b..ef8eb062a 100644 --- a/docker/mipsel-unknown-linux-steed/Dockerfile +++ b/docker/mipsel-unknown-linux-steed/Dockerfile @@ -18,5 +18,6 @@ RUN bash /qemu.sh 2.10.1 mipsel COPY mipsel-unknown-linux-steed.json /json -ENV RUST_TARGET_PATH=/json \ +ENV CARGO_TARGET_MIPSEL_UNKNOWN_LINUX_STEED_RUNNER=qemu-mipsel \ + RUST_TARGET_PATH=/json \ RUST_TEST_THREADS=1 diff --git a/docker/powerpc-unknown-linux-steed/Dockerfile b/docker/powerpc-unknown-linux-steed/Dockerfile index 3cdfc966e..fd921e6d3 100644 --- a/docker/powerpc-unknown-linux-steed/Dockerfile +++ b/docker/powerpc-unknown-linux-steed/Dockerfile @@ -17,6 +17,6 @@ RUN apt-get install -y --no-install-recommends \ COPY powerpc-unknown-linux-steed.json /json -ENV CARGO_TARGET_POWERPC_UNKNOWN_LINUX_STEED_LINKER=powerpc-linux-gnu-gcc \ +ENV CARGO_TARGET_POWERPC_UNKNOWN_LINUX_STEED_RUNNER=qemu-ppc \ RUST_TARGET_PATH=/json \ RUST_TEST_THREADS=1 diff --git a/docker/powerpc64-unknown-linux-steed/Dockerfile b/docker/powerpc64-unknown-linux-steed/Dockerfile index 2ae837287..9f4dd371b 100644 --- a/docker/powerpc64-unknown-linux-steed/Dockerfile +++ b/docker/powerpc64-unknown-linux-steed/Dockerfile @@ -17,6 +17,6 @@ RUN apt-get install -y --no-install-recommends \ COPY powerpc64-unknown-linux-steed.json /json -ENV CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_STEED_LINKER=powerpc64-linux-gnu-gcc \ +ENV CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_STEED_RUNNER=qemu-ppc64 \ RUST_TARGET_PATH=/json \ RUST_TEST_THREADS=1 diff --git a/docker/powerpc64le-unknown-linux-steed/Dockerfile b/docker/powerpc64le-unknown-linux-steed/Dockerfile index d849b0293..b313a58de 100644 --- a/docker/powerpc64le-unknown-linux-steed/Dockerfile +++ b/docker/powerpc64le-unknown-linux-steed/Dockerfile @@ -17,6 +17,6 @@ RUN apt-get install -y --no-install-recommends \ COPY powerpc64le-unknown-linux-steed.json /json -ENV CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_STEED_LINKER=powerpc64le-linux-gnu-gcc \ +ENV CARGO_TARGET_POWERPC64LE_UNKNOWN_LINUX_STEED_RUNNER=qemu-ppc64le \ RUST_TARGET_PATH=/json \ RUST_TEST_THREADS=1 From d8e80807882381961e76bb66295d55f237eccfef Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Fri, 20 Oct 2017 02:07:18 +0200 Subject: [PATCH 08/10] fix typos --- docker/arm-unknown-linux-steedeabi/Dockerfile | 2 +- docker/arm-unknown-linux-steedeabihf/Dockerfile | 2 +- docker/armv7-unknown-linux-steedeabihf/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/arm-unknown-linux-steedeabi/Dockerfile b/docker/arm-unknown-linux-steedeabi/Dockerfile index e5e9dc6d5..510b2cf26 100644 --- a/docker/arm-unknown-linux-steedeabi/Dockerfile +++ b/docker/arm-unknown-linux-steedeabi/Dockerfile @@ -18,6 +18,6 @@ RUN bash /qemu.sh 2.10.1 arm COPY arm-unknown-linux-steedeabi.json /json -ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_STEEDABI_RUNNER=qemu-arm \ +ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_STEEDEABI_RUNNER=qemu-arm \ RUST_TARGET_PATH=/json \ RUST_TEST_THREADS=1 diff --git a/docker/arm-unknown-linux-steedeabihf/Dockerfile b/docker/arm-unknown-linux-steedeabihf/Dockerfile index 173724dcd..dbf15510e 100644 --- a/docker/arm-unknown-linux-steedeabihf/Dockerfile +++ b/docker/arm-unknown-linux-steedeabihf/Dockerfile @@ -18,6 +18,6 @@ RUN bash /qemu.sh 2.10.1 arm COPY arm-unknown-linux-steedeabihf.json /json -ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_STEEDABIHF_RUNNER=qemu-arm \ +ENV CARGO_TARGET_ARM_UNKNOWN_LINUX_STEEDEABIHF_RUNNER=qemu-arm \ RUST_TARGET_PATH=/json \ RUST_TEST_THREADS=1 diff --git a/docker/armv7-unknown-linux-steedeabihf/Dockerfile b/docker/armv7-unknown-linux-steedeabihf/Dockerfile index 75dd7ecd8..ace0d3a29 100644 --- a/docker/armv7-unknown-linux-steedeabihf/Dockerfile +++ b/docker/armv7-unknown-linux-steedeabihf/Dockerfile @@ -18,6 +18,6 @@ RUN bash /qemu.sh 2.10.1 arm COPY armv7-unknown-linux-steedeabihf.json /json -ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_STEEDABIHF_RUNNER=qemu-arm \ +ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_STEEDEABIHF_RUNNER=qemu-arm \ RUST_TARGET_PATH=/json \ RUST_TEST_THREADS=1 From d473fedf5ce1c3818f4c8e8d2414c54498b88865 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Fri, 20 Oct 2017 02:10:15 +0200 Subject: [PATCH 09/10] lld-up --- docker/lld.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/lld.sh b/docker/lld.sh index 37e31d248..770fbbb34 100644 --- a/docker/lld.sh +++ b/docker/lld.sh @@ -16,14 +16,14 @@ main() { done cat <>/etc/apt/sources.list -deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main -deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-4.0 main +deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main +deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main EOF curl -L http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - apt-get update - apt-get install --no-install-recommends -y lld-4.0 - ln -s ld.lld-4.0 /usr/bin/ld.lld + apt-get install --no-install-recommends -y lld-5.0 + ln -s ld.lld-5.0 /usr/bin/ld.lld # Clean up apt-get purge --auto-remove -y ${purge_list[@]} From aacba3abadd41f3ee87ef59b4613dfe601f4d78c Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Fri, 20 Oct 2017 02:20:28 +0200 Subject: [PATCH 10/10] restore the ppc64 linker lld still doesn't work for this target --- docker/powerpc64-unknown-linux-steed/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/powerpc64-unknown-linux-steed/Dockerfile b/docker/powerpc64-unknown-linux-steed/Dockerfile index 9f4dd371b..53aa919b5 100644 --- a/docker/powerpc64-unknown-linux-steed/Dockerfile +++ b/docker/powerpc64-unknown-linux-steed/Dockerfile @@ -17,6 +17,7 @@ RUN apt-get install -y --no-install-recommends \ COPY powerpc64-unknown-linux-steed.json /json -ENV CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_STEED_RUNNER=qemu-ppc64 \ +ENV CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_STEED_LINKER=powerpc64-linux-gnu-gcc \ + CARGO_TARGET_POWERPC64_UNKNOWN_LINUX_STEED_RUNNER=qemu-ppc64 \ RUST_TARGET_PATH=/json \ RUST_TEST_THREADS=1