moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

llvm-libunwind: update to 9.0.0 + fix ppc32

Browse source
This commit is contained in:
q66 2019-09-23 00:38:51 +02:00 • committed by Helmut Pozimski
parent b49c9e51c1
commit 172d4b8f5a
2 changed files with 67 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

63
srcpkgs/llvm-libunwind/patches/ppc32.patch Normal file
View file

@ -0,0 +1,63 @@
This fixes build at least with gcc9 which does not define `__ppc__`.
--- include/__libunwind_config.h
+++ include/__libunwind_config.h
@@ -49,7 +49,7 @@
# define _LIBUNWIND_CONTEXT_SIZE 167
# define _LIBUNWIND_CURSOR_SIZE 179
# define _LIBUNWIND_HIGHEST_DWARF_REGISTER _LIBUNWIND_HIGHEST_DWARF_REGISTER_PPC64
-# elif defined(__ppc__)
+# elif defined(__powerpc__)
# define _LIBUNWIND_TARGET_PPC 1
# define _LIBUNWIND_CONTEXT_SIZE 117
# define _LIBUNWIND_CURSOR_SIZE 124
--- src/UnwindRegistersRestore.S
+++ src/UnwindRegistersRestore.S
@@ -392,7 +392,7 @@ Lnovec:
PPC64_LR(3)
bctr
-#elif defined(__ppc__)
+#elif defined(__powerpc__)
DEFINE_LIBUNWIND_FUNCTION(_ZN9libunwind13Registers_ppc6jumptoEv)
//
--- src/UnwindRegistersSave.S
+++ src/UnwindRegistersSave.S
@@ -554,7 +554,7 @@ DEFINE_LIBUNWIND_FUNCTION(__unw_getcontext)
blr
-#elif defined(__ppc__)
+#elif defined(__powerpc__)
//
// extern int unw_getcontext(unw_context_t* thread_state)
--- src/config.h
+++ src/config.h
@@ -95,12 +95,12 @@
#define _LIBUNWIND_BUILD_SJLJ_APIS
#endif
-#if defined(__i386__) || defined(__x86_64__) || defined(__ppc__) || defined(__ppc64__) || defined(__powerpc64__)
+#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc__) || defined(__powerpc64__)
#define _LIBUNWIND_SUPPORT_FRAME_APIS
#endif
#if defined(__i386__) || defined(__x86_64__) || \
- defined(__ppc__) || defined(__ppc64__) || defined(__powerpc64__) || \
+ defined(__powerpc__) || defined(__powerpc64__) || \
(!defined(__APPLE__) && defined(__arm__)) || \
(defined(__arm64__) || defined(__aarch64__)) || \
defined(__mips__)
--- src/libunwind.cpp
+++ src/libunwind.cpp
@@ -42,7 +42,7 @@ _LIBUNWIND_HIDDEN int __unw_init_local(unw_cursor_t *cursor,
# define REGISTER_KIND Registers_x86_64
#elif defined(__powerpc64__)
# define REGISTER_KIND Registers_ppc64
-#elif defined(__ppc__)
+#elif defined(__powerpc__)
# define REGISTER_KIND Registers_ppc
#elif defined(__aarch64__)
# define REGISTER_KIND Registers_arm64

8
srcpkgs/llvm-libunwind/template
View file

@ -1,18 +1,18 @@
# Template file for 'llvm-libunwind' # Template file for 'llvm-libunwind'
pkgname=llvm-libunwind pkgname=llvm-libunwind
version=7.0.1 version=9.0.0
revision=1 revision=1
build_style=cmake build_style=cmake
wrksrc="libunwind-${version}.src" wrksrc="libunwind-${version}.src"
hostmakedepends="llvm7" hostmakedepends="llvm9"
makedepends="llvm7" makedepends="llvm9"
make_build_args="VERBOSE=1" make_build_args="VERBOSE=1"
short_desc="LLVM version of libunwind library" short_desc="LLVM version of libunwind library"
maintainer="Orphaned <orphan@voidlinux.org>" maintainer="Orphaned <orphan@voidlinux.org>"
license="NCSA, MIT" license="NCSA, MIT"
homepage="https://llvm.org" homepage="https://llvm.org"
distfiles="https://www.llvm.org/releases/${version}/libunwind-${version}.src.tar.xz" distfiles="https://www.llvm.org/releases/${version}/libunwind-${version}.src.tar.xz"
checksum=89c852991dfd9279dbca9d5ac10b53c67ad7d0f54bbab7156e9f057a978b5912 checksum=976a8d09e1424fb843210eecec00a506b956e6c31adda3b0d199e945be0d0db2
post_install() { post_install() {
vmkdir usr/include vmkdir usr/include