Pullup ticket #6343 - requested by he

lang/libunwind: PowerPC build fix

Revisions pulled up:
- lang/libunwind/Makefile                                       1.23-1.24
- lang/libunwind/distinfo                                       1.19
- lang/libunwind/patches/patch-include_____libunwind__config.h  1.1
- lang/libunwind/patches/patch-src_UnwindRegistersRestore.S     1.1
- lang/libunwind/patches/patch-src_UnwindRegistersSave.S        1.1
- lang/libunwind/patches/patch-src_config.h                     1.1
- lang/libunwind/patches/patch-src_libunwind.cpp                1.1

---
   Module Name:	pkgsrc
   Committed By:	he
   Date:		Sun Oct 18 17:06:35 UTC 2020

   Modified Files:
   	pkgsrc/lang/libunwind: Makefile distinfo
   Added Files:
   	pkgsrc/lang/libunwind/patches: patch-include_____libunwind__config.h
   	    patch-src_UnwindRegistersRestore.S patch-src_UnwindRegistersSave.S
   	    patch-src_config.h patch-src_libunwind.cpp

   Log Message:
   Make this build on NetBSD/macppc 9.0, where gcc doesn't predefine
   __ppc__, only __powerpc__, so compensate.
   PKGREVISION bumped.

---
   Module Name:    pkgsrc
   Committed By:   jperkin
   Date:           Tue Oct 20 06:34:23 UTC 2020

   Modified Files:
           pkgsrc/lang/libunwind: Makefile

   Log Message:
   libunwind: Remove patch .orig file, fix install.

7 files changed, 84 insertions, 2 deletions

diff --git a/lang/libunwind/Makefile b/lang/libunwind/Makefile
index be77fdacda2..88875888324 100644
--- a/lang/libunwind/Makefile
+++ b/lang/libunwind/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.22 2019/12/29 15:31:23 adam Exp $
+# $NetBSD: Makefile,v 1.22.6.1 2020/10/29 08:00:30 bsiegert Exp $
 
 .include "../../lang/llvm/version.mk"
 
 DISTNAME=	libunwind-${LLVM_VERSION}.src
 PKGNAME=	${DISTNAME:S/.src//}
+PKGREVISION=	1
 CATEGORIES=	lang devel
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -31,6 +32,7 @@ post-extract:
 	${MKDIR} ${WRKDIR}/build
 
 post-install:
+	${RM} -f ${WRKSRC}/include/__libunwind_config.h.orig
 	cd ${WRKSRC}/include && ${PAX} -rw . ${DESTDIR}${PREFIX}/include
 
 BUILDLINK_DEPMETHOD.llvm=	build
diff --git a/lang/libunwind/distinfo b/lang/libunwind/distinfo
index 4f3b79435fe..3b1eedb76f4 100644
--- a/lang/libunwind/distinfo
+++ b/lang/libunwind/distinfo
@@ -1,6 +1,11 @@
-$NetBSD: distinfo,v 1.18 2020/07/26 19:20:13 adam Exp $
+$NetBSD: distinfo,v 1.18.2.1 2020/10/29 08:00:30 bsiegert Exp $
 
 SHA1 (libunwind-10.0.1.src.tar.xz) = f5c9398aedd1a41c7667208abdabc9274b7a19ae
 RMD160 (libunwind-10.0.1.src.tar.xz) = 9602856d899cf8681c7baabbb17765fa07849093
 SHA512 (libunwind-10.0.1.src.tar.xz) = 8d717ba951ca25ca133a5d204cd7cca693402003a5a91cd2bc2bb0427486ccd37beac45aa54a6e7830c5358ecb64d1d674f7522e3192be7f9dba8384ad757f26
 Size (libunwind-10.0.1.src.tar.xz) = 92724 bytes
+SHA1 (patch-include_____libunwind__config.h) = b1727e79e7a00e4e5c412584dcfc357a696e2d6a
+SHA1 (patch-src_UnwindRegistersRestore.S) = bd8aa0754a87315efbe6cedcb81febcb32c8a020
+SHA1 (patch-src_UnwindRegistersSave.S) = 6c976325c8d871550d75fa51047e6a0b92f00f52
+SHA1 (patch-src_config.h) = c41a01427316ce7713a5b357a3a7a76a71ad8e6f
+SHA1 (patch-src_libunwind.cpp) = 6da6a2ac31364113e9b1f3e9377669dbc56cfa2a
diff --git a/lang/libunwind/patches/patch-include_____libunwind__config.h b/lang/libunwind/patches/patch-include_____libunwind__config.h
new file mode 100644
index 00000000000..aa5a1d6c0a8
--- /dev/null
+++ b/lang/libunwind/patches/patch-include_____libunwind__config.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-include_____libunwind__config.h,v 1.1.2.2 2020/10/29 08:00:30 bsiegert Exp $
+
+Gcc doesn't define __ppc__, but defines __powerpc__ on NetBSD/powerpc.
+
+--- include/__libunwind_config.h.orig	2020-07-07 16:21:37.000000000 +0000
++++ include/__libunwind_config.h
+@@ -50,7 +50,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(__ppc__) || defined(__powerpc__)
+ #  define _LIBUNWIND_TARGET_PPC 1
+ #  define _LIBUNWIND_CONTEXT_SIZE 117
+ #  define _LIBUNWIND_CURSOR_SIZE 124
diff --git a/lang/libunwind/patches/patch-src_UnwindRegistersRestore.S b/lang/libunwind/patches/patch-src_UnwindRegistersRestore.S
new file mode 100644
index 00000000000..5b4c43fb905
--- /dev/null
+++ b/lang/libunwind/patches/patch-src_UnwindRegistersRestore.S
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_UnwindRegistersRestore.S,v 1.1.2.2 2020/10/29 08:00:30 bsiegert Exp $
+
+Gcc doesn't define __ppc__, but defines __powerpc__ on NetBSD/powerpc.
+
+--- src/UnwindRegistersRestore.S.orig	2020-07-07 16:21:37.000000000 +0000
++++ src/UnwindRegistersRestore.S
+@@ -392,7 +392,7 @@ Lnovec:
+   PPC64_LR(3)
+   bctr
+ 
+-#elif defined(__ppc__)
++#elif defined(__ppc__) || defined(__powerpc__)
+ 
+ DEFINE_LIBUNWIND_FUNCTION(_ZN9libunwind13Registers_ppc6jumptoEv)
+ //
diff --git a/lang/libunwind/patches/patch-src_UnwindRegistersSave.S b/lang/libunwind/patches/patch-src_UnwindRegistersSave.S
new file mode 100644
index 00000000000..d609d3739c8
--- /dev/null
+++ b/lang/libunwind/patches/patch-src_UnwindRegistersSave.S
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_UnwindRegistersSave.S,v 1.1.2.2 2020/10/29 08:00:30 bsiegert Exp $
+
+Gcc doesn't define __ppc__, but defines __powerpc__ on NetBSD/powerpc.
+
+--- src/UnwindRegistersSave.S.orig	2020-07-07 16:21:37.000000000 +0000
++++ src/UnwindRegistersSave.S
+@@ -554,7 +554,7 @@ DEFINE_LIBUNWIND_FUNCTION(__unw_getconte
+   blr
+ 
+ 
+-#elif defined(__ppc__)
++#elif defined(__ppc__) || defined(__powerpc__)
+ 
+ //
+ // extern int unw_getcontext(unw_context_t* thread_state)
diff --git a/lang/libunwind/patches/patch-src_config.h b/lang/libunwind/patches/patch-src_config.h
new file mode 100644
index 00000000000..cd8d62f679b
--- /dev/null
+++ b/lang/libunwind/patches/patch-src_config.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_config.h,v 1.1.2.2 2020/10/29 08:00:30 bsiegert Exp $
+
+Gcc doesn't define __ppc__, but defines __powerpc__ on NetBSD/powerpc.
+
+--- src/config.h.orig	2020-07-07 16:21:37.000000000 +0000
++++ src/config.h
+@@ -95,7 +95,7 @@
+ #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(__ppc__) || defined(__ppc64__) || defined(__powerpc64__) || defined(__powerpc__)
+ #define _LIBUNWIND_SUPPORT_FRAME_APIS
+ #endif
+ 
diff --git a/lang/libunwind/patches/patch-src_libunwind.cpp b/lang/libunwind/patches/patch-src_libunwind.cpp
new file mode 100644
index 00000000000..c444ec2fdda
--- /dev/null
+++ b/lang/libunwind/patches/patch-src_libunwind.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_libunwind.cpp,v 1.1.2.2 2020/10/29 08:00:30 bsiegert Exp $
+
+Gcc doesn't define __ppc__, but defines __powerpc__ on NetBSD/powerpc.
+
+--- src/libunwind.cpp.orig	2020-07-07 16:21:37.000000000 +0000
++++ src/libunwind.cpp
+@@ -42,7 +42,7 @@ _LIBUNWIND_HIDDEN int __unw_init_local(u
+ # define REGISTER_KIND Registers_x86_64
+ #elif defined(__powerpc64__)
+ # define REGISTER_KIND Registers_ppc64
+-#elif defined(__ppc__)
++#elif defined(__ppc__) || defined(__powerpc__)
+ # define REGISTER_KIND Registers_ppc
+ #elif defined(__aarch64__)
+ # define REGISTER_KIND Registers_arm64