diff options
Diffstat (limited to 'main/libunwind')
| -rw-r--r-- | main/libunwind/10-disable-tests.patch | 14 | ||||
| -rw-r--r-- | main/libunwind/APKBUILD | 20 | ||||
| -rw-r--r-- | main/libunwind/aarch64.patch | 48 |
3 files changed, 58 insertions, 24 deletions
diff --git a/main/libunwind/10-disable-tests.patch b/main/libunwind/10-disable-tests.patch deleted file mode 100644 index d353cb1e9d..0000000000 --- a/main/libunwind/10-disable-tests.patch +++ /dev/null @@ -1,14 +0,0 @@ -These tests are known to fail, so disable them. It's not problem just on -Alpine, Julia also disabled libunwind tests in their Makefile. - ---- a/Makefile.in -+++ b/Makefile.in -@@ -218,7 +218,7 @@ - ETAGS = etags - CTAGS = ctags - CSCOPE = cscope --DIST_SUBDIRS = src tests doc -+DIST_SUBDIRS = src doc - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - distdir = $(PACKAGE)-$(VERSION) - top_distdir = $(distdir) diff --git a/main/libunwind/APKBUILD b/main/libunwind/APKBUILD index e969b7fcf3..2df6cbd165 100644 --- a/main/libunwind/APKBUILD +++ b/main/libunwind/APKBUILD @@ -1,19 +1,19 @@ # Contributor: Ben Pye <ben@curlybracket.co.uk> # Maintainer: Ben Pye <ben@curlybracket.co.uk> pkgname=libunwind -pkgver=1.2_rc1 +pkgver=1.2 _pkgver=${pkgver/_/-} pkgrel=0 pkgdesc="Portable and efficient C programming interface (API) to determine the call-chain of a program" url="http://www.nongnu.org/libunwind/" -arch="x86_64 armhf" +arch="x86_64 armhf aarch64" license="MIT" depends="" depends_dev="libexecinfo-dev" makedepends="$depends_dev autoconf automake libtool linux-headers" subpackages="$pkgname-dev $pkgname-doc" source="http://download.savannah.gnu.org/releases/libunwind/libunwind-$_pkgver.tar.gz - 10-disable-tests.patch + aarch64.patch force-enable-man.patch" builddir="$srcdir/$pkgname-$_pkgver" @@ -21,12 +21,12 @@ prepare() { cd "$builddir" default_prepare || return 1 update_config_sub || return 1 + autoreconf -f -i || return 1 } build() { cd "$builddir" - ./autogen.sh || return 1 LDFLAGS="-lexecinfo" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -43,12 +43,12 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -md5sums="9ae4db46a273444b046ca3bd52dbdf1f libunwind-1.2-rc1.tar.gz -1d0372df3e69f0356235097137576e46 10-disable-tests.patch +md5sums="eefcb5d7f78fdc8f1ed172a26ea4202f libunwind-1.2.tar.gz +1bac77cb19791f854a20097cb0d438b9 aarch64.patch 59d14a816557c7abb3386696e07ba4c5 force-enable-man.patch" -sha256sums="d222f186b6bc60f49dac5030516ec35a7ed0ccca675551d6cf81008112116abc libunwind-1.2-rc1.tar.gz -03f76f7ee23b7b97e33b8d19a0f7b3cb397ab83623c9d495ee8e038907081db6 10-disable-tests.patch +sha256sums="1de38ffbdc88bd694d10081865871cd2bfbb02ad8ef9e1606aee18d65532b992 libunwind-1.2.tar.gz +6d25209725160c0e313c0a02e7c91bd6f99f6851543ddd7b37d0098a78083f0e aarch64.patch ae56606aafa1b8954f8a205dc10d5e4c41f0976f0fe70209cf56582283fddd6e force-enable-man.patch" -sha512sums="810cdcf9e1e9a33eb286a6527c2d4bfc507313c596df9cdeb46b1c7b7343ac784fec3ed7c6aa135fc25dbf3e2cd8c99d1fa51e265b63614b51fd37bd84000b08 libunwind-1.2-rc1.tar.gz -b217dff3ccc3d4b6665ee5d888872ac57a8f15499f9532b1c78f9faca725fae8da975dcf9597964637ebbc270d901232b76c78c556d7ebd62cce6b32211d1401 10-disable-tests.patch +sha512sums="985d0817944e3cafd99aaa5642862d878972e0851f7954289247e808c9319f399ca29342395f0571cb6568a1104a82bd92d585936f2ca888dda37ac796fde0d4 libunwind-1.2.tar.gz +e65c1929e51237a993660d17b5e2206dc95a133ef847f070558c2b5011a0d38a232dd3a5683f4ed255d0cc6a55629be7517bd2a04f8b9515d3c0618fb5b47071 aarch64.patch 7c2b9f48b74464c8c27367bfb0ede317bfbc5fc392c0d1371a9a82ae518d3799c019f6e258ec2262c4117c6fb936c40b7cb9f2bfebddb3ea4efbbcbcc4268822 force-enable-man.patch" diff --git a/main/libunwind/aarch64.patch b/main/libunwind/aarch64.patch new file mode 100644 index 0000000000..18b81c3eaf --- /dev/null +++ b/main/libunwind/aarch64.patch @@ -0,0 +1,48 @@ +From cf6382643efd133e617c2cf1dba7e53868ccd690 Mon Sep 17 00:00:00 2001 +From: Christopher Ferris <cferris@google.com> +Date: Tue, 15 Apr 2014 11:12:03 -0700 +Subject: [PATCH] Add aarch64 getcontext functionality. + +Change-Id: I32912a85c0fd02bb5e45a9eb7deb2410ded352a9 +--- + include/libunwind-aarch64.h | 27 +++++++++++++++++++++++++-- + 1 file changed, 25 insertions(+), 2 deletions(-) + +diff --git a/include/libunwind-aarch64.h b/include/libunwind-aarch64.h +index cd01e57..fe9e83d 100644 +--- a/include/libunwind-aarch64.h ++++ b/include/libunwind-aarch64.h +@@ -175,8 +175,31 @@ typedef ucontext_t unw_tdep_context_t; + #include "libunwind-common.h" + #include "libunwind-dynamic.h" + +-#define unw_tdep_getcontext(uc) (getcontext (uc), 0) +-#define unw_tdep_is_fpreg UNW_ARCH_OBJ(is_fpreg) ++#define unw_tdep_getcontext(uc) (({ \ ++ unw_tdep_context_t *unw_ctx = (uc); \ ++ register uint64_t *unw_base asm ("x0") = (uint64_t*) unw_ctx->uc_mcontext.regs; \ ++ __asm__ __volatile__ ( \ ++ "stp x0, x1, [%[base], #0]\n" \ ++ "stp x2, x3, [%[base], #16]\n" \ ++ "stp x4, x5, [%[base], #32]\n" \ ++ "stp x6, x7, [%[base], #48]\n" \ ++ "stp x8, x9, [%[base], #64]\n" \ ++ "stp x10, x11, [%[base], #80]\n" \ ++ "stp x12, x13, [%[base], #96]\n" \ ++ "stp x14, x13, [%[base], #112]\n" \ ++ "stp x16, x17, [%[base], #128]\n" \ ++ "stp x18, x19, [%[base], #144]\n" \ ++ "stp x20, x21, [%[base], #160]\n" \ ++ "stp x22, x23, [%[base], #176]\n" \ ++ "stp x24, x25, [%[base], #192]\n" \ ++ "stp x26, x27, [%[base], #208]\n" \ ++ "stp x28, x29, [%[base], #224]\n" \ ++ "str x30, [%[base], #240]\n" \ ++ "mov x1, sp\n" \ ++ "stp x1, x30, [%[base], #248]\n" \ ++ : [base] "+r" (unw_base) : : "x1", "memory"); \ ++ }), 0) ++#define unw_tdep_is_fpreg UNW_ARCH_OBJ(is_fpreg) + + extern int unw_tdep_is_fpreg (int); + |