diff options
| -rw-r--r-- | package/libunwind/Makefile | 4 | ||||
| -rw-r--r-- | package/libunwind/patches/patch-Makefile_in | 20 | ||||
| -rw-r--r-- | package/libunwind/patches/patch-src_x86_Gos-linux_c | 47 |
3 files changed, 2 insertions, 69 deletions
diff --git a/package/libunwind/Makefile b/package/libunwind/Makefile index f369fc744..2d26b81ad 100644 --- a/package/libunwind/Makefile +++ b/package/libunwind/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libunwind -PKG_VERSION:= 1.2 +PKG_VERSION:= 1.2.1 PKG_RELEASE:= 1 -PKG_HASH:= 1de38ffbdc88bd694d10081865871cd2bfbb02ad8ef9e1606aee18d65532b992 +PKG_HASH:= 3f3ecb90e28cbe53fba7a4a27ccce7aad188d3210bb1964a923a731a27a75acb PKG_DESCR:= determine the call-chain of a program PKG_SECTION:= libs/misc PKG_URL:= https://savannah.nongnu.org/projects/libunwind/ diff --git a/package/libunwind/patches/patch-Makefile_in b/package/libunwind/patches/patch-Makefile_in deleted file mode 100644 index 46c2d9d02..000000000 --- a/package/libunwind/patches/patch-Makefile_in +++ /dev/null @@ -1,20 +0,0 @@ ---- libunwind-1.2.orig/Makefile.in 2017-01-13 17:00:58.000000000 +0100 -+++ libunwind-1.2/Makefile.in 2017-04-17 19:28:43.772508581 +0200 -@@ -124,7 +124,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE - distdir dist dist-all distcheck - ETAGS = etags - CTAGS = ctags --DIST_SUBDIRS = src tests doc -+DIST_SUBDIRS = src doc - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - distdir = $(PACKAGE)-$(VERSION) - top_distdir = $(distdir) -@@ -306,7 +306,7 @@ include_HEADERS = include/libunwind-dyna - $(am__append_7) $(am__append_8) $(am__append_9) \ - $(am__append_10) $(am__append_11) $(am__append_12) - nodist_include_HEADERS = include/libunwind-common.h --SUBDIRS = src tests $(am__append_13) -+SUBDIRS = src $(am__append_13) - noinst_HEADERS = include/dwarf.h include/dwarf_i.h include/dwarf-eh.h \ - include/compiler.h include/libunwind_i.h include/mempool.h \ - include/remote.h \ diff --git a/package/libunwind/patches/patch-src_x86_Gos-linux_c b/package/libunwind/patches/patch-src_x86_Gos-linux_c deleted file mode 100644 index f5f3e53c5..000000000 --- a/package/libunwind/patches/patch-src_x86_Gos-linux_c +++ /dev/null @@ -1,47 +0,0 @@ ---- libunwind-1.2.orig/src/x86/Gos-linux.c 2016-11-18 04:28:29.000000000 +0100 -+++ libunwind-1.2/src/x86/Gos-linux.c 2017-04-17 18:57:50.832552016 +0200 -@@ -26,6 +26,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE - #include "unwind_i.h" - #include "offsets.h" - -+#include <sys/syscall.h> -+ - PROTECTED int - unw_is_signal_frame (unw_cursor_t *cursor) - { -@@ -283,26 +285,16 @@ HIDDEN int - x86_local_resume (unw_addr_space_t as, unw_cursor_t *cursor, void *arg) - { - struct cursor *c = (struct cursor *) cursor; -- ucontext_t *uc = c->uc; -- -- /* Ensure c->pi is up-to-date. On x86, it's relatively common to be -- missing DWARF unwind info. We don't want to fail in that case, -- because the frame-chain still would let us do a backtrace at -- least. */ -- dwarf_make_proc_info (&c->dwarf); -- -- if (unlikely (c->sigcontext_format != X86_SCF_NONE)) -- { -- struct sigcontext *sc = (struct sigcontext *) c->sigcontext_addr; -+ struct sigcontext *sc = (struct sigcontext *) c->sigcontext_addr; - -- Debug (8, "resuming at ip=%x via sigreturn(%p)\n", c->dwarf.ip, sc); -- sigreturn (sc); -- } -- else -- { -- Debug (8, "resuming at ip=%x via setcontext()\n", c->dwarf.ip); -- setcontext (uc); -- } -+ Debug (8, "resuming at ip=%llx via sigreturn(%p)\n", -+ (unsigned long long) c->dwarf.ip, sc); -+ __asm__ __volatile__ ( -+ "int $0x80" -+ : "=r" (sc) -+ : "0"(SYS_rt_sigreturn) -+ : "memory" -+ ); - return -UNW_EINVAL; - } - #endif |