From nobody Sun Dec 18 17:43:49 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 4NZqvV3bqHz1GmVW; Sun, 18 Dec 2022 17:43:50 +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 4NZqvV1W3Qz4JMR; Sun, 18 Dec 2022 17:43:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671385430; 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=xaeQgOm/MjSsNKmqb7t9coVH4jgINZ9bV6E5ON3RAjU=; b=tLjqpMevk3G5vvPi97nVmXc+cC8r8OsPrgi9IKeqqi9+ahiTdBmyr1Gfv5Pc2xnhDYPwNN xOPd+sRq5r6gb6j/Ha6uop/YqOPVp1z7qWqnSPTECtG9Hcc6rJWGzs0C4ozeiRKsWLBO9H dNK2iK+Qq5OYY4+D1YvdY7bCQg/arXiiDRgStBOoVM2XoVwMFD6ougIRcg7w6ThpNgt1E7 OjOqqy3mfJMDdBnZXji5jZC/fa8A5eS7dAwoMzgM+rq1BwJ8EXdTmlHvX1pAJH4DsUtNC3 9hPrqGKPQjcaCUCMmigNygjXPpiKAzXaqOGV6yLkg6TYxpPGD7lA7nftB7vMrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671385430; 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=xaeQgOm/MjSsNKmqb7t9coVH4jgINZ9bV6E5ON3RAjU=; b=Nl17k+b9a/DulAK76g1qM/7vWtUcIL4ySLw1iYyWfpEjuoFcV/XwezgfgCZdyB6LAErEFe snwVi1Tjc0NddnWG1d/UFYaL0G+xH8iLXkZAdQalwkqRa2d9NPjQ5u/o5nNGp3lbdxG7kw zc+7r2sDyRWYWzidcl4n75vOwx+t535uQ9eX15gPdsGB1L+2nGhOtMRZVe/wsVSQ250m/b JEX1pZCPbu8ucwzhDMwrGaZousJjzie8z+KivJ3/lqi0+1Ay65MfufxkC4ipHuS7zu92EU sWk5JXTkt+6iic5Lj9CzosJcCEw/w0+nIacpYwwk5yJdgxGy/1Qnd61jlSwckw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671385430; a=rsa-sha256; cv=none; b=nHiYwPvERZBO0oIH1gmWMLGalOJY70rTV+plunInW2FdHnlA1mD53uRkeitY1rx16e1vyy CzB9Gq2NgMO4IZraX9DVqzTSoM72B/RVLXPA06JwSGJlZ2HiR4u9emDPl+TIA8B/yoWbT7 CLyqr5GSTpgoanvw1Tx9w1RSiWeKreCMdedrbHSsYWe7K9N+xPk7tf/qggf5ds+uG3MApM g1TM0+V+OWy2WGXpwS9el2kQQsLO99yRIN6D/gUdZiGkiT/QHB7cwPBIOJm2c8ekPdMl2g 0TV6hOCLp9/L6R4QTtWhYixV1vKPydo/qcPCTSiOIm5LxJnzL0V80dUZ6ZAFCw== 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 4NZqvV0P2WzPfh; Sun, 18 Dec 2022 17:43:50 +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 2BIHhnof006442; Sun, 18 Dec 2022 17:43:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BIHhnRq006440; Sun, 18 Dec 2022 17:43:49 GMT (envelope-from git) Date: Sun, 18 Dec 2022 17:43:49 GMT Message-Id: <202212181743.2BIHhnRq006440@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: b5a6298f4d46 - main - lang/mono: 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: b5a6298f4d4643abb129962934fcefc4a832eb80 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=b5a6298f4d4643abb129962934fcefc4a832eb80 commit b5a6298f4d4643abb129962934fcefc4a832eb80 Author: Dimitry Andric AuthorDate: 2022-12-11 22:12:36 +0000 Commit: Dimitry Andric CommitDate: 2022-12-18 17:33:30 +0000 lang/mono: fix build with clang 15 During an exp-run for llvm 15 (see bug 265425), it turned out that lang/mono failed to build with clang 15, on i386: mini-runtime.c:806:24: error: incompatible pointer to integer conversion assigning to 'guint32' (aka 'unsigned int') from 'MonoLMF *' (aka 'struct MonoLMF *') [-Wint-conversion] ext->lmf.previous_lmf = *lmf_addr; ^ ~~~~~~~~~ mini-runtime.c:808:24: error: incompatible pointer to integer conversion assigning to 'guint32' (aka 'unsigned int') from 'gpointer' (aka 'void *') [-Wint-conversion] ext->lmf.previous_lmf = (gpointer)(((gssize)ext->lmf.previous_lmf) | 2); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ As noted, this is because on i386 the previous_lmf field is declared as guint32, while other architectures use gpointer. Upstream changed the field to gpointer in , which got merged into main in . PR: 268321 Approved by: portmgr (tcberner) MFH: 2022Q4 --- lang/mono/files/patch-mono_mini_mini-x86.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lang/mono/files/patch-mono_mini_mini-x86.h b/lang/mono/files/patch-mono_mini_mini-x86.h new file mode 100644 index 000000000000..d804a58edb74 --- /dev/null +++ b/lang/mono/files/patch-mono_mini_mini-x86.h @@ -0,0 +1,11 @@ +--- mono/mini/mini-x86.h.orig 2018-08-24 15:17:13 UTC ++++ mono/mini/mini-x86.h +@@ -139,7 +139,7 @@ struct MonoLMF { + * If the second lowest bit is set to 1, then this is a MonoLMFExt structure, and + * the other fields are not valid. + */ +- guint32 previous_lmf; ++ gpointer previous_lmf; + gpointer lmf_addr; + /* Only set in trampoline LMF frames */ + MonoMethod *method;