diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-01-24 18:25:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-24 18:25:44 +0100 |
| commit | bea83213f3cf0293b0c7707ff1ddcdb6519e0d64 (patch) | |
| tree | 41f0d77e46cd6cab8053116270c68401061b4539 /src/ci | |
| parent | 8348f8338859d6267ef52d4671d98e8a4cf76a6f (diff) | |
| parent | 6abba95045e28e768a2b553f6b0cd2f04a71bfe0 (diff) | |
| download | rust-bea83213f3cf0293b0c7707ff1ddcdb6519e0d64.tar.gz rust-bea83213f3cf0293b0c7707ff1ddcdb6519e0d64.zip | |
Rollup merge of #57803 - jethrogb:jb/sgx-unwind-version, r=alexcrichton
Several changes to libunwind for SGX target Two fixes: * #34978 bites again! * __rust_alloc are actually private symbols. Add new public versions. Also, these ones are `extern "C"`. Upstream changes (https://github.com/fortanix/llvm-project/pull/2, https://github.com/fortanix/llvm-project/pull/3): * b7357de Avoid too new relocation types being emitted * 0feefe5 Use new symbol names to call Rust allocator Fixes https://github.com/fortanix/rust-sgx/issues/65
Diffstat (limited to 'src/ci')
| -rw-r--r-- | src/ci/docker/dist-various-2/Dockerfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ci/docker/dist-various-2/Dockerfile b/src/ci/docker/dist-various-2/Dockerfile index 906255533ad..952c1ba2ccb 100644 --- a/src/ci/docker/dist-various-2/Dockerfile +++ b/src/ci/docker/dist-various-2/Dockerfile @@ -32,7 +32,7 @@ RUN /tmp/build-solaris-toolchain.sh sparcv9 sparcv9 solaris-sparc COPY dist-various-2/build-x86_64-fortanix-unknown-sgx-toolchain.sh /tmp/ # We pass the commit id of the port of LLVM's libunwind to the build script. # Any update to the commit id here, should cause the container image to be re-built from this point on. -RUN /tmp/build-x86_64-fortanix-unknown-sgx-toolchain.sh "bbe23902411be88d7388f381becefadd6e3ef819" +RUN /tmp/build-x86_64-fortanix-unknown-sgx-toolchain.sh "13fad13f8ea83a8da58d04a5faa45943151b3398" COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh |