diff options
| author | Marco A L Barbosa <malbarbo@gmail.com> | 2018-01-27 20:57:10 -0200 |
|---|---|---|
| committer | Marco A L Barbosa <malbarbo@gmail.com> | 2018-01-27 20:57:10 -0200 |
| commit | 2875f825fd5a29d94bbfd78b1019ebdedd8d2444 (patch) | |
| tree | 46b6575eb39e582e87cb8baebbb8e60aa85aaceb /src/ci/docker/scripts | |
| parent | cd47ddf24da14a27956cbf715b05589e11fdcf7a (diff) | |
| download | rust-2875f825fd5a29d94bbfd78b1019ebdedd8d2444.tar.gz rust-2875f825fd5a29d94bbfd78b1019ebdedd8d2444.zip | |
Remove musl/libunwind patch for i686
The i686 problem was fixed upstream: https://github.com/llvm-mirror/libunwind/commit/aa805e415f19f50ebc6f5e1e1e4bf9bb7f61816b
Diffstat (limited to 'src/ci/docker/scripts')
| -rw-r--r-- | src/ci/docker/scripts/musl.sh | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/src/ci/docker/scripts/musl.sh b/src/ci/docker/scripts/musl.sh index d6c1f7de759..fb0bd06ce30 100644 --- a/src/ci/docker/scripts/musl.sh +++ b/src/ci/docker/scripts/musl.sh @@ -57,37 +57,6 @@ LLVM=60 if [ ! -d libunwind-release_$LLVM ]; then curl -L https://github.com/llvm-mirror/llvm/archive/release_$LLVM.tar.gz | tar xzf - curl -L https://github.com/llvm-mirror/libunwind/archive/release_$LLVM.tar.gz | tar xzf - - # Whoa what's this mysterious patch we're applying to libunwind! Why are we - # swapping the values of ESP/EBP in libunwind?! - # - # Discovered in #35599 it turns out that the vanilla build of libunwind is not - # suitable for unwinding i686 musl. After some investigation it ended up - # looking like the register values for ESP/EBP were indeed incorrect (swapped) - # in the source. Similar commits in libunwind (r280099 and r282589) have noticed - # this for other platforms, and we just need to realize it for musl linux as - # well. - # - # More technical info can be found at #35599 - cd libunwind-release_$LLVM - patch -Np1 << EOF -diff --git a/include/libunwind.h b/include/libunwind.h -index c5b9633..1360eb2 100644 ---- a/include/libunwind.h -+++ b/include/libunwind.h -@@ -151,8 +151,8 @@ enum { - UNW_X86_ECX = 1, - UNW_X86_EDX = 2, - UNW_X86_EBX = 3, -- UNW_X86_EBP = 4, -- UNW_X86_ESP = 5, -+ UNW_X86_ESP = 4, -+ UNW_X86_EBP = 5, - UNW_X86_ESI = 6, - UNW_X86_EDI = 7 - }; -fi -EOF - cd .. fi mkdir libunwind-build |
