Skip to content

Commit 2875f82

Browse files
committed
Remove musl/libunwind patch for i686
The i686 problem was fixed upstream: llvm-mirror/libunwind@aa805e4
1 parent cd47ddf commit 2875f82

File tree

1 file changed

+0
-31
lines changed

1 file changed

+0
-31
lines changed

src/ci/docker/scripts/musl.sh

-31
Original file line numberDiff line numberDiff line change
@@ -57,37 +57,6 @@ LLVM=60
5757
if [ ! -d libunwind-release_$LLVM ]; then
5858
curl -L https://github.com/llvm-mirror/llvm/archive/release_$LLVM.tar.gz | tar xzf -
5959
curl -L https://github.com/llvm-mirror/libunwind/archive/release_$LLVM.tar.gz | tar xzf -
60-
# Whoa what's this mysterious patch we're applying to libunwind! Why are we
61-
# swapping the values of ESP/EBP in libunwind?!
62-
#
63-
# Discovered in #35599 it turns out that the vanilla build of libunwind is not
64-
# suitable for unwinding i686 musl. After some investigation it ended up
65-
# looking like the register values for ESP/EBP were indeed incorrect (swapped)
66-
# in the source. Similar commits in libunwind (r280099 and r282589) have noticed
67-
# this for other platforms, and we just need to realize it for musl linux as
68-
# well.
69-
#
70-
# More technical info can be found at #35599
71-
cd libunwind-release_$LLVM
72-
patch -Np1 << EOF
73-
diff --git a/include/libunwind.h b/include/libunwind.h
74-
index c5b9633..1360eb2 100644
75-
--- a/include/libunwind.h
76-
+++ b/include/libunwind.h
77-
@@ -151,8 +151,8 @@ enum {
78-
UNW_X86_ECX = 1,
79-
UNW_X86_EDX = 2,
80-
UNW_X86_EBX = 3,
81-
- UNW_X86_EBP = 4,
82-
- UNW_X86_ESP = 5,
83-
+ UNW_X86_ESP = 4,
84-
+ UNW_X86_EBP = 5,
85-
UNW_X86_ESI = 6,
86-
UNW_X86_EDI = 7
87-
};
88-
fi
89-
EOF
90-
cd ..
9160
fi
9261

9362
mkdir libunwind-build

0 commit comments

Comments
 (0)