Unbreak libunwind

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Unbreak libunwind
From: pin <voidpin%protonmail.com@localhost>
Date: Thu, 07 Jul 2022 06:10:50 +0000
Module Name:	pkgsrc-wip
Committed By:	pin <voidpin%protonmail.com@localhost>
Pushed By:	pin
Date:		Thu Jul 7 08:10:50 2022 +0200
Changeset:	aa165505bcb12609573c6a227ea98f263e749d91

Modified Files:
	libunwind/PLIST
	libunwind/distinfo
Removed Files:
	libunwind/TODO
	libunwind/patches/patch-include_____libunwind__config.h
	libunwind/patches/patch-src_UnwindRegistersRestore.S
	libunwind/patches/patch-src_UnwindRegistersSave.S
	libunwind/patches/patch-src_config.h
	libunwind/patches/patch-src_libunwind.cpp

Log Message:
Unbreak libunwind

All patches merged upstream.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=aa165505bcb12609573c6a227ea98f263e749d91

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libunwind/PLIST                                         |  5 ++++-
 libunwind/TODO                                          |  1 -
 libunwind/distinfo                                      |  5 -----
 libunwind/patches/patch-include_____libunwind__config.h | 15 ---------------
 libunwind/patches/patch-src_UnwindRegistersRestore.S    | 15 ---------------
 libunwind/patches/patch-src_UnwindRegistersSave.S       | 15 ---------------
 libunwind/patches/patch-src_config.h                    | 15 ---------------
 libunwind/patches/patch-src_libunwind.cpp               | 15 ---------------
 8 files changed, 4 insertions(+), 82 deletions(-)

diffs:
diff --git a/libunwind/PLIST b/libunwind/PLIST
index dd53c19913..cf655ffef3 100644
--- a/libunwind/PLIST
+++ b/libunwind/PLIST
@@ -1,8 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2017/03/17 22:38:18 adam Exp $
+@comment $NetBSD$
+include/CMakeLists.txt
 include/__libunwind_config.h
 include/libunwind.h
 include/mach-o/compact_unwind_encoding.h
 include/unwind.h
+include/unwind_arm_ehabi.h
+include/unwind_itanium.h
 lib/libunwind.a
 lib/libunwind.so
 lib/libunwind.so.1
diff --git a/libunwind/TODO b/libunwind/TODO
deleted file mode 100644
index fe5ff49ad8..0000000000
--- a/libunwind/TODO
+++ /dev/null
@@ -1 +0,0 @@
-make patches apply
diff --git a/libunwind/distinfo b/libunwind/distinfo
index b92a965412..e946290fe5 100644
--- a/libunwind/distinfo
+++ b/libunwind/distinfo
@@ -9,8 +9,3 @@ Size (libunwind-14.0.6.src.tar.xz) = 108680 bytes
 BLAKE2s (llvm-14.0.6.src.tar.xz) = 2d44946453add45426569fd4187654f83881341c5c0109e4ffacc60e8f73af60
 SHA512 (llvm-14.0.6.src.tar.xz) = 6461bdde27aac17fa44c3e99a85ec47ffb181d0d4e5c3ef1c4286a59583e3b0c51af3c8081a300f45b99524340773a3011380059e3b3a571c3b0a8733e96fc1d
 Size (llvm-14.0.6.src.tar.xz) = 49660136 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/libunwind/patches/patch-include_____libunwind__config.h b/libunwind/patches/patch-include_____libunwind__config.h
deleted file mode 100644
index 9bca857a12..0000000000
--- a/libunwind/patches/patch-include_____libunwind__config.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-include_____libunwind__config.h,v 1.1 2020/10/18 17:06:35 he 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/libunwind/patches/patch-src_UnwindRegistersRestore.S b/libunwind/patches/patch-src_UnwindRegistersRestore.S
deleted file mode 100644
index 38e49a332e..0000000000
--- a/libunwind/patches/patch-src_UnwindRegistersRestore.S
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_UnwindRegistersRestore.S,v 1.1 2020/10/18 17:06:35 he 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/libunwind/patches/patch-src_UnwindRegistersSave.S b/libunwind/patches/patch-src_UnwindRegistersSave.S
deleted file mode 100644
index e0f8417793..0000000000
--- a/libunwind/patches/patch-src_UnwindRegistersSave.S
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_UnwindRegistersSave.S,v 1.1 2020/10/18 17:06:35 he 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/libunwind/patches/patch-src_config.h b/libunwind/patches/patch-src_config.h
deleted file mode 100644
index 197c5039b9..0000000000
--- a/libunwind/patches/patch-src_config.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_config.h,v 1.1 2020/10/18 17:06:35 he 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/libunwind/patches/patch-src_libunwind.cpp b/libunwind/patches/patch-src_libunwind.cpp
deleted file mode 100644
index d169f1712c..0000000000
--- a/libunwind/patches/patch-src_libunwind.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_libunwind.cpp,v 1.1 2020/10/18 17:06:35 he 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
Prev by Date: Re: signify: fix linking libs on Solaris after last change
Next by Date: indented using pkglint, patch checksums refreshed
Previous by Thread: signify: fix linking libs on Solaris after last change
Next by Thread: indented using pkglint, patch checksums refreshed
Indexes:
Home | Main Index | Thread Index | Old Index