Skip to content

Commit b551291

Browse files
committed
Add libunwind patch from Pyston
1 parent 37285f5 commit b551291

File tree

2 files changed

+23
-0
lines changed

2 files changed

+23
-0
lines changed
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
From e1d7c78d95e4b73a311f10149d0a54547d307d5d Mon Sep 17 00:00:00 2001
2+
From: Kevin Modzelewski <[email protected]>
3+
Date: Tue, 22 Apr 2014 15:50:40 -0700
4+
Subject: [PATCH] Change the RBP-validation heuristic to allow size-0 call frames
5+
6+
---
7+
diff --git a/src/x86_64/Gstep.c b/src/x86_64/Gstep.c
8+
index 9fa0967..809d60b 100644
9+
--- a/src/x86_64/Gstep.c
10+
+++ b/src/x86_64/Gstep.c
11+
@@ -173,7 +173,7 @@ unw_step (unw_cursor_t *cursor)
12+
anything about new RBP (rbp1) since it may not be a frame
13+
pointer in the frame above. Just check we get the value. */
14+
if (ret < 0
15+
- || rbp <= c->dwarf.cfa
16+
+ || rbp < c->dwarf.cfa
17+
|| (rbp - c->dwarf.cfa) > 0x4000)
18+
{
19+
rip_loc = DWARF_NULL_LOC;
20+
--
21+
1.7.4.1
22+

deps/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,6 +1303,7 @@ libunwind-$(UNWIND_VER).tar.gz:
13031303
$(JLDOWNLOAD) $@ http://download.savannah.gnu.org/releases/libunwind/$@
13041304
libunwind-$(UNWIND_VER)/configure: libunwind-$(UNWIND_VER).tar.gz
13051305
$(TAR) xfz $<
1306+
cd libunwind-$(UNWIND_VER) && patch -p1 < ../0001-Change-the-RBP-validation-heuristic-to-allow-size-0-.patch
13061307
touch -c $@
13071308
libunwind-$(UNWIND_VER)/config.status: libunwind-$(UNWIND_VER)/configure
13081309
cd libunwind-$(UNWIND_VER) && \

0 commit comments

Comments
 (0)