Merge pull request JuliaLang#14774 from JuliaLang/yyc/libunwind-arm

Add patches for libunwind on arm and aarch64
jiahao · Jan 25, 2016 · be0951e · be0951e
2 parents f11d389 + d55c7ba
commit be0951e
Show file tree

Hide file tree

Showing 3 changed files with 55,965 additions and 1 deletion.
diff --git a/deps/Makefile b/deps/Makefile
@@ -1708,7 +1708,10 @@ $(SRCDIR)/srccache/libunwind-$(UNWIND_VER).tar.gz: | $(SRCDIR)/srccache
 $(SRCDIR)/srccache/libunwind-$(UNWIND_VER)/configure: $(SRCDIR)/srccache/libunwind-$(UNWIND_VER).tar.gz
  $(JLCHECKSUM) $<
  cd $(dir $<) && $(TAR) xfz $<
- cd $(dir $<)/libunwind-$(UNWIND_VER) && patch -p1 < $(SRCDIR)/libunwind.patch
+ cd $(dir $<)/libunwind-$(UNWIND_VER) && \
+ patch -p1 < $(SRCDIR)/libunwind.patch && \
+ patch -p1 < $(SRCDIR)/libunwind-001-invalid-dwarf-opcodes-can-cause-references-beyond.patch && \
+ patch -p1 < $(SRCDIR)/libunwind-aarch64.patch
  touch -c $@
 $(BUILDDIR)/libunwind-$(UNWIND_VER)/config.status: $(SRCDIR)/srccache/libunwind-$(UNWIND_VER)/configure
  mkdir -p $(dir $@)

diff --git a/deps/libunwind-001-invalid-dwarf-opcodes-can-cause-references-beyond.patch b/deps/libunwind-001-invalid-dwarf-opcodes-can-cause-references-beyond.patch
@@ -0,0 +1,11 @@
+--- a/include/dwarf_i.h
++++ b/include/dwarf_i.h
+@@ -20,7 +20,7 @@
+ extern const uint8_t dwarf_to_unw_regnum_map[DWARF_REGNUM_MAP_LENGTH];
+ /* REG is evaluated multiple times; it better be side-effects free! */
+ # define dwarf_to_unw_regnum(reg) \
+- (((reg) <= DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0)
++ (((reg) < DWARF_REGNUM_MAP_LENGTH) ? dwarf_to_unw_regnum_map[reg] : 0)
+ #endif
+
+ #ifdef UNW_LOCAL_ONLY