From 9e41a2a49fb527cb43636520833b7ccfb8067969 Mon Sep 17 00:00:00 2001 From: Oliver Scherer Date: Wed, 2 Oct 2019 18:07:07 +0200 Subject: [PATCH 1/2] Emit `_fltused` on `uefi` targets as a short-term workaround --- ci/docker/x86_64-unknown-uefi/Dockerfile | 4 ++++ src/x86_64.rs | 7 +++++++ 2 files changed, 11 insertions(+) create mode 100644 ci/docker/x86_64-unknown-uefi/Dockerfile diff --git a/ci/docker/x86_64-unknown-uefi/Dockerfile b/ci/docker/x86_64-unknown-uefi/Dockerfile new file mode 100644 index 000000000..98000f4eb --- /dev/null +++ b/ci/docker/x86_64-unknown-uefi/Dockerfile @@ -0,0 +1,4 @@ +FROM ubuntu:18.04 +RUN apt-get update && \ + apt-get install -y --no-install-recommends \ + gcc libc6-dev ca-certificates diff --git a/src/x86_64.rs b/src/x86_64.rs index 2360ab8a6..6940f8d9d 100644 --- a/src/x86_64.rs +++ b/src/x86_64.rs @@ -73,3 +73,10 @@ pub unsafe fn ___chkstk() { ); intrinsics::unreachable(); } + +// HACK(https://github.com/rust-lang/rust/issues/62785): x86_64-unknown-uefi needs special LLVM +// support unless we emit the _fltused +#[no_mangle] +#[used] +#[cfg(target_os = "uefi")] +static _fltused: i32 = 0; From dffad9b98ac33c4e22a08397cfbcc52262ab1676 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Thu, 7 Nov 2019 11:03:45 -0800 Subject: [PATCH 2/2] Remove stray docker container --- ci/docker/x86_64-unknown-uefi/Dockerfile | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 ci/docker/x86_64-unknown-uefi/Dockerfile diff --git a/ci/docker/x86_64-unknown-uefi/Dockerfile b/ci/docker/x86_64-unknown-uefi/Dockerfile deleted file mode 100644 index 98000f4eb..000000000 --- a/ci/docker/x86_64-unknown-uefi/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM ubuntu:18.04 -RUN apt-get update && \ - apt-get install -y --no-install-recommends \ - gcc libc6-dev ca-certificates