devel/libunwind: update to 1.8.0

PR:	276346

Approved by:	sunpoet (maintainer timeout)
Co-authored-by:	Gleb Popov <arrowd@FreeBSD.org>

Pull Request:	https://github.com/freebsd/freebsd-ports/pull/215
This commit is contained in:
awoonya 2024-01-15 22:56:27 +03:00 committed by Gleb Popov
parent 4e194501e6
commit 1c7a06b4e3
7 changed files with 12 additions and 74 deletions

View file

@ -1,6 +1,5 @@
PORTNAME= libunwind
PORTVERSION= 20230730 # This is the release date on https://github.com/libunwind/libunwind/releases
PORTREVISION= 1
PORTVERSION= 20240112 # This is the release date on https://github.com/libunwind/libunwind/releases
CATEGORIES= devel
MASTER_SITES= https://github.com/libunwind/libunwind/releases/download/v${LIBUNWIND_VERSION}/
DISTNAME= ${PORTNAME}-${LIBUNWIND_VERSION}
@ -29,7 +28,7 @@ PLIST_SUB= ARCH=${ARCH:S|amd64|x86_64|:C|armv.|arm|:S|i386|x86|:C|powerpc64.*|pp
CPE_VENDOR= libunwind_project
LIBUNWIND_VERSION= 1.7.2
LIBUNWIND_VERSION= 1.8.0
.include <bsd.port.options.mk>

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1697307744
SHA256 (libunwind-1.7.2.tar.gz) = a18a6a24307443a8ace7a8acc2ce79fbbe6826cd0edf98d6326d0225d6a5d6e6
SIZE (libunwind-1.7.2.tar.gz) = 912590
TIMESTAMP = 1705346537
SHA256 (libunwind-1.8.0.tar.gz) = b6b3df40a0970c8f2865fb39aa2af7b5d6f12ad6c5774e266ccca4d6b8b72268
SIZE (libunwind-1.8.0.tar.gz) = 949829

View file

@ -1,29 +0,0 @@
Obtained from: https://github.com/libunwind/libunwind/commit/99fb31d5f05ff6c96ca3a9350c792618fab23f2d
--- src/ptrace/_UPT_access_fpreg.c.orig 2021-11-26 16:58:55 UTC
+++ src/ptrace/_UPT_access_fpreg.c
@@ -104,7 +104,11 @@ _UPT_access_fpreg (unw_addr_space_t as, unw_regnum_t r
#elif defined(__i386__)
memcpy(&fpreg.fpr_acc[reg], val, sizeof(unw_fpreg_t));
#elif defined(__arm__)
+# if __FreeBSD_version >= 1400079
+ memcpy(&fpreg.fpr_r[reg], val, sizeof(unw_fpreg_t));
+# else
memcpy(&fpreg.fpr[reg], val, sizeof(unw_fpreg_t));
+# endif
#elif defined(__aarch64__)
memcpy(&fpreg.fp_q[reg], val, sizeof(unw_fpreg_t));
#elif defined(__powerpc64__)
@@ -120,7 +124,11 @@ _UPT_access_fpreg (unw_addr_space_t as, unw_regnum_t r
#elif defined(__i386__)
memcpy(val, &fpreg.fpr_acc[reg], sizeof(unw_fpreg_t));
#elif defined(__arm__)
- memcpy(val, &fpreg.fpr[reg], sizeof(unw_fpreg_t));
+# if __FreeBSD_version >= 1400079
+ memcpy(&fpreg.fpr_r[reg], val, sizeof(unw_fpreg_t));
+# else
+ memcpy(&fpreg.fpr[reg], val, sizeof(unw_fpreg_t));
+# endif
#elif defined(__aarch64__)
memcpy(val, &fpreg.fp_q[reg], sizeof(unw_fpreg_t));
#elif defined(__powerpc64__)

View file

@ -1,13 +0,0 @@
Reference: https://github.com/libunwind/libunwind/pull/645
https://github.com/libunwind/libunwind/commit/24dc3b0880695137a48c2ad0244900f9bb8416eb
--- src/x86/Gos-freebsd.c.orig 2023-07-30 11:32:29 UTC
+++ src/x86/Gos-freebsd.c
@@ -111,6 +111,7 @@ x86_handle_signal_frame (unw_cursor_t *cursor)
struct sigframe *sf;
uintptr_t uc_addr;
struct dwarf_loc esp_loc;
+ int i;
sf = (struct sigframe *)c->dwarf.cfa;
uc_addr = (uintptr_t)&(sf->sf_uc);

View file

@ -1,13 +0,0 @@
--- include/tdep-x86_64/libunwind_i.h.orig 2021-11-26 16:58:55 UTC
+++ include/tdep-x86_64/libunwind_i.h
@@ -288,9 +288,9 @@ extern void tdep_reuse_frame (struct dwarf_cursor *c,
extern int tdep_cache_frame (struct dwarf_cursor *c);
extern void tdep_reuse_frame (struct dwarf_cursor *c,
int frame);
+#endif
extern void tdep_stash_frame (struct dwarf_cursor *c,
struct dwarf_reg_state *rs);
-#endif
extern int tdep_getcontext_trace (unw_tdep_context_t *);
extern int tdep_trace (unw_cursor_t *cursor, void **addresses, int *n);

View file

@ -1,11 +0,0 @@
--- src/setjmp/siglongjmp.c.orig 2020-11-10 16:14:18 UTC
+++ src/setjmp/siglongjmp.c
@@ -108,7 +108,7 @@ siglongjmp (sigjmp_buf env, int val)
&& unw_set_reg (&c, UNW_REG_EH + 3, wp[JB_MASK + 1]) < 0))
abort ();
#elif defined(__FreeBSD__)
- if (unw_set_reg (&c, UNW_REG_EH + 2, &wp[JB_MASK]) < 0)
+ if (unw_set_reg (&c, UNW_REG_EH + 2, wp[JB_MASK]) < 0)
abort();
#else
#error Port me

View file

@ -7,7 +7,7 @@ include/libunwind.h
lib/libunwind-%%ARCH%%.a
lib/libunwind-%%ARCH%%.so
lib/libunwind-%%ARCH%%.so.8
lib/libunwind-%%ARCH%%.so.8.0.1
lib/libunwind-%%ARCH%%.so.8.1.0
%%COREDUMP%%lib/libunwind-coredump.a
%%COREDUMP%%lib/libunwind-coredump.so
%%COREDUMP%%lib/libunwind-coredump.so.0
@ -25,7 +25,7 @@ lib/libunwind-setjmp.so.0.0.0
lib/libunwind.a
lib/libunwind.so
lib/libunwind.so.8
lib/libunwind.so.8.0.1
lib/libunwind.so.8.1.0
%%COREDUMP%%libdata/pkgconfig/libunwind-coredump.pc
libdata/pkgconfig/libunwind-generic.pc
libdata/pkgconfig/libunwind-ptrace.pc
@ -33,8 +33,10 @@ libdata/pkgconfig/libunwind-setjmp.pc
libdata/pkgconfig/libunwind.pc
share/man/man3/_U_dyn_cancel.3.gz
share/man/man3/_U_dyn_register.3.gz
share/man/man3/libunwind-coredump.3.gz
share/man/man3/libunwind-dynamic.3.gz
share/man/man3/libunwind-ia64.3.gz
share/man/man3/libunwind-nto.3.gz
share/man/man3/libunwind-ptrace.3.gz
share/man/man3/libunwind-setjmp.3.gz
share/man/man3/libunwind.3.gz
@ -44,6 +46,8 @@ share/man/man3/unw_create_addr_space.3.gz
share/man/man3/unw_destroy_addr_space.3.gz
share/man/man3/unw_flush_cache.3.gz
share/man/man3/unw_get_accessors.3.gz
share/man/man3/unw_get_elf_filename.3.gz
share/man/man3/unw_get_elf_filename_by_ip.3.gz
share/man/man3/unw_get_fpreg.3.gz
share/man/man3/unw_get_proc_info.3.gz
share/man/man3/unw_get_proc_info_by_ip.3.gz
@ -63,6 +67,7 @@ share/man/man3/unw_resume.3.gz
share/man/man3/unw_set_cache_size.3.gz
share/man/man3/unw_set_caching_policy.3.gz
share/man/man3/unw_set_fpreg.3.gz
share/man/man3/unw_set_iterate_phdr_function.3.gz
share/man/man3/unw_set_reg.3.gz
share/man/man3/unw_step.3.gz
share/man/man3/unw_strerror.3.gz