From nobody Tue Jul 11 23:12:45 2023 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 4R0xVQ0QRXz2tmnX; Tue, 11 Jul 2023 23:12:46 +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 4R0xVP6WCpz4X26; Tue, 11 Jul 2023 23:12:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689117166; 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=fryw6aKZpYgFxAjTj5OiDCelwrVvcYYPVaSazREsDEo=; b=hGLu89Ur3vxTWwHAu1mZBUyUQKsAWpcSNEtB6dBf+DswLPafUDIZNv52QaGGT9A/nm97g1 H4TEM/AeoOHoKe65Jy00DR5yQr2EsWsXxxc0VKisFmrkFYwU4RE2Y7AaM7/l8zfd9RI9EH 3HNMpI2/16TpbethLTGxHVBnsd38FrStJh8DYBlf7xVkby0O6bhp3mf79w9IRIGcaahGmy l4pXKHUfI+tO5FPCaRBF1SJpSCp3YjJdV03lt35jFFgxil9uuAwSSIqwY9kOsG4iQnl3bw bxifw/lzOLj5CiV7t3IQAkzmt/ri1KwlDAv2Xx6FUfOktMC02TfKyB4yC1gZBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689117166; 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=fryw6aKZpYgFxAjTj5OiDCelwrVvcYYPVaSazREsDEo=; b=vgUablaCT6tIcwAAjAvLS4qHY+6V3k4lHlUXTw/htIRC+md6SLe7ItcljRTnor/7R2Qp6T otA06GSkjsRAJdS3yjPQK/RV835DOKg4Rdo6OPr1CZeGEnCyDWDDk5v97SycZ09uIJvbxc cosK24SUpONKEOdom5RB/kL1h7BY20Gj5L8jQ3yNgIbWI4PAY0O6j8oWMLP56I7XJHC2i3 CZPCSzNQ+FkY6pjjZeAfyWcOEwDeTpcyZTevUX4EI6yU2iuOmPCo7Sdc5le05KzfEaFCYK yn4nmaN5q64e6M/EYdg6xXQYEy7psmxZNM3V82YqOrL8nPiIMLowNMKRhKQRKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689117166; a=rsa-sha256; cv=none; b=pYyTvptTEKNZQTx5g7t4p9Hbwx0d4oqarJu7+AM90KI9hM10RTkfySNcr9LpMV3N9oe1Py G9nr12bFEdXGVI/8wD1Q1ssAppBUTZmUe7qi/jrKV7Cl+nlhPJF71HrOFQKphOkMsm2MHs CSyCcsO0nhxrht+bfpmY8/XwjwmYh/w2dKtQpZeD0WFKSmF8gQT/AJbIbujUea0vo6jg73 tZbDDyD1hCYEAarJDjGgBFfMJjwL8YWpAsrP51q8KfhFt16WFxoz24JPM00DM3gqPKXUxN IIBA73bilsYauL/2HGiQ5O4c9M6gpDeUuhQQP67L9vN2s7msZ1Ij0eP+9DVoag== 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 4R0xVP59Xbzlx4; Tue, 11 Jul 2023 23:12:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36BNCjHi019514; Tue, 11 Jul 2023 23:12:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36BNCj6H019513; Tue, 11 Jul 2023 23:12:45 GMT (envelope-from git) Date: Tue, 11 Jul 2023 23:12:45 GMT Message-Id: <202307112312.36BNCj6H019513@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brooks Davis Subject: git: 3509504bd820 - main - devel/llvm16: change clang to allow -m32 on arm64 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: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3509504bd820a16b91ee3ac6818aef8e7894fb2e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=3509504bd820a16b91ee3ac6818aef8e7894fb2e commit 3509504bd820a16b91ee3ac6818aef8e7894fb2e Author: Brooks Davis AuthorDate: 2023-07-11 23:11:40 +0000 Commit: Brooks Davis CommitDate: 2023-07-11 23:11:40 +0000 devel/llvm16: change clang to allow -m32 on arm64 This is a backport from upstream and will be merged to FreeBSD head soon. See D40943 for more info. Sponsored by: DARPA --- devel/llvm16/Makefile | 2 +- devel/llvm16/files/patch-backport-3450272fc2 | 33 ++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/devel/llvm16/Makefile b/devel/llvm16/Makefile index 11ac69fbb456..7a70876d13e7 100644 --- a/devel/llvm16/Makefile +++ b/devel/llvm16/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 16.0.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel lang MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \ https://${PRE_}releases.llvm.org/${LLVM_RELEASE}${RCDIR}/ diff --git a/devel/llvm16/files/patch-backport-3450272fc2 b/devel/llvm16/files/patch-backport-3450272fc2 new file mode 100644 index 000000000000..1af8bf9700a0 --- /dev/null +++ b/devel/llvm16/files/patch-backport-3450272fc2 @@ -0,0 +1,33 @@ +commit 3450272fc281979388bb845a9fffb59b42cc2e7e +Author: Jessica Clarke +Date: Mon Jul 10 01:40:58 2023 +0100 + + [Driver][FreeBSD] Generalise lib32 handling to support arm + + The current code maintains its own list of 32-bit architectures for + which there is a 64-bit FreeBSD architecture that supports it for lib32. + This is unnecessary (if it's not supported, the directory just won't + exist), and means that, when FreeBSD gains lib32 support for a new + architecture, you need an updated toolchain that knows about it. + Instead we can check for any 32-bit architecture and have forwards + compatibility. + + This is motivated by FreeBSD adding support for building arm lib32 + libraries on aarch64. + + Co-authored-by: Mike Karels + +diff --git clang/lib/Driver/ToolChains/FreeBSD.cpp clang/lib/Driver/ToolChains/FreeBSD.cpp +index ac336598a78c..84e257741702 100644 +--- clang/lib/Driver/ToolChains/FreeBSD.cpp ++++ clang/lib/Driver/ToolChains/FreeBSD.cpp +@@ -376,8 +376,7 @@ FreeBSD::FreeBSD(const Driver &D, const llvm::Triple &Triple, + + // When targeting 32-bit platforms, look for '/usr/lib32/crt1.o' and fall + // back to '/usr/lib' if it doesn't exist. +- if ((Triple.getArch() == llvm::Triple::x86 || Triple.isMIPS32() || +- Triple.isPPC32()) && ++ if (Triple.isArch32Bit() && + D.getVFS().exists(concat(getDriver().SysRoot, "/usr/lib32/crt1.o"))) + getFilePaths().push_back(concat(getDriver().SysRoot, "/usr/lib32")); + else