From nobody Sun Jul 31 17:19:00 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4LwnzS6fqLz4Xmtv; Sun, 31 Jul 2022 17:19:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LwnzS65fFz44Wj; Sun, 31 Jul 2022 17:19:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659287940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DeHuKTsY2Gwn2ujWD/9a+HtI+VCCQqGip0Ze2Gzk+a8=; b=nim8WSpqjrUZN3UYHg7QdZrtcjg/BNiQhkHFauRpkTkBJvdXIs3Vpzva9CDwJEXjrlGZXt sO2ZhIYZ+1jXsBJhU9DX9FeODEjOUzZjjH+KRbax/8aEZ8C+QFBFJ86Wx9JCGYt/PnT+4q rJEvIs1a3WD0DKFd858xHn2DhPMmns7nE9wgj5VWFb0Hc7pFj4kMNFgPfKnAgcLxADgZap AFLQFRzlyrVtvGIgMMKkR9ECrQgdfKwr8sDOC/ohY4rtPcZf2PUWD/sfjM4P2yzHXVX3qR eZsKzCGZnDLsBKrqfMo1mIO4dl0x7vUDVdmFXOJB7z70zzrn0tOKgvGvx8pYIw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4LwnzS576Nz11rh; Sun, 31 Jul 2022 17:19:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26VHJ0tC017661; Sun, 31 Jul 2022 17:19:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26VHJ0Cd017660; Sun, 31 Jul 2022 17:19:00 GMT (envelope-from git) Date: Sun, 31 Jul 2022 17:19:00 GMT Message-Id: <202207311719.26VHJ0Cd017660@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 3c10c4430460 - main - devel/libunwind: fix build with clang 15 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3c10c44304608e72d2d23f6a35998b21b2e195ee Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659287940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DeHuKTsY2Gwn2ujWD/9a+HtI+VCCQqGip0Ze2Gzk+a8=; b=mXDebxoW2wCclZdc1eRbXZjp66Vvr4ib4F5vHWe/m28RXRcjNmi68qX+zXf5p7n3VYgVMo 7CgsuVESm+qh95qEZqAKWTPt0K3Sc1ETt9/qSncobVMpHnP56yvKKhrP7a0fBlUvXpEyt1 WhPVhacaIzEKv4v2MERhiZYGcJ+ohJJFhcjsWj+lEeQTwryIiqs3PJzUoZbv2u/S0izwKR GelZaqFAVgf68T+opMmeLROOqX/UlXSkre7Jd9yKdtcUnbplNLoa00tTTz3aXbFNWlhfyS Ww3IwbY6mIpEd1A+LJ+GNF4M2HEbsb+Wx3lqk+zmxcnY1yK3Lg2NsfLlalyoJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659287940; a=rsa-sha256; cv=none; b=hF3XI/bRLhNA05Jj6bgfEHTbgbRbk+4/SXarSJLF+AoOdWtxjkcPqwLF0gt3e1Ot430TMk jcS5/Jlrd4BNKP4P+xt/l27eoaJ2ETNENX/s7ckOyTfxH3rWyZIjdQ6XhqAEqfWv2r9hdv qNUzZJ4PQWbAD5MjJKpMQeFtndYiA9OfXjKXO7/P4occoZN9TAjsrOuNEYCrU6Wu4+LxTx 6cVOrkPxlomBt65AwT1givRJF4vHmMcEvFzUdMo7suUqr/KE0L0IQuVP2YwVGWsClKtDyg B+fAkr3JfpfVVLXdDjRObm2eoF4L92ktHZWpr8znhZ2pmqFXRG4P4BONR0jB9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=3c10c44304608e72d2d23f6a35998b21b2e195ee commit 3c10c44304608e72d2d23f6a35998b21b2e195ee Author: Dimitry Andric AuthorDate: 2022-07-30 13:54:37 +0000 Commit: Dimitry Andric 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