Date: Sun, 31 Jul 2022 17:19:00 GMT From: Dimitry Andric <dim@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 3c10c4430460 - main - devel/libunwind: fix build with clang 15 Message-ID: <202207311719.26VHJ0Cd017660@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=3c10c44304608e72d2d23f6a35998b21b2e195ee commit 3c10c44304608e72d2d23f6a35998b21b2e195ee Author: Dimitry Andric <dim@FreeBSD.org> AuthorDate: 2022-07-30 13:54:37 +0000 Commit: Dimitry Andric <dim@FreeBSD.org> CommitDate: 2022-07-31 17:18:48 +0000 devel/libunwind: fix build with clang 15 Building libunwind with clang results in multiple errors: setjmp/siglongjmp.c:111:48: error: incompatible pointer to integer conversion passing 'unw_word_t *' (aka 'unsigned long *') to parameter of type 'unw_word_t' (aka 'unsigned long'); remove & [-Wint-conversion] if (unw_set_reg (&c, UNW_REG_EH + 2, &wp[JB_MASK]) < 0) ^~~~~~~~~~~~ ../include/libunwind-common.h:283:56: note: passing argument to parameter here extern int unw_set_reg (unw_cursor_t *, int, unw_word_t); ^ dwarf/Gparser.c:901:5: error: call to undeclared function '_Ux86_64_stash_frame'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] tdep_stash_frame (c, rs); ^ ../include/tdep-x86_64/libunwind_i.h:246:41: note: expanded from macro 'tdep_stash_frame' #define tdep_stash_frame UNW_OBJ(stash_frame) ^ The first error is because the syntax is indeed wrong, the '&' should be removed. The second error is because tdep_stash_frame() is only declared for Linux in libunwind_i.h, but it is used in Gparser.c. Declare it unconditionally to fix the problem. PR: 265519 Approved by: sunpoet (maintainer) MFH: 2022Q3 --- .../files/patch-include_tdep-x86__64_libunwind__i.h | 13 +++++++++++++ devel/libunwind/files/patch-src_setjmp_siglongjmp.c | 11 +++++++++++ 2 files changed, 24 insertions(+) diff --git a/devel/libunwind/files/patch-include_tdep-x86__64_libunwind__i.h b/devel/libunwind/files/patch-include_tdep-x86__64_libunwind__i.h new file mode 100644 index 000000000000..51d4a15c8757 --- /dev/null +++ b/devel/libunwind/files/patch-include_tdep-x86__64_libunwind__i.h @@ -0,0 +1,13 @@ +--- 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); diff --git a/devel/libunwind/files/patch-src_setjmp_siglongjmp.c b/devel/libunwind/files/patch-src_setjmp_siglongjmp.c new file mode 100644 index 000000000000..61728ff11f02 --- /dev/null +++ b/devel/libunwind/files/patch-src_setjmp_siglongjmp.c @@ -0,0 +1,11 @@ +--- 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202207311719.26VHJ0Cd017660>