From nobody Thu Jul 20 19:55:45 2023 X-Original-To: dev-commits-ports-branches@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 4R6Nhx4Ngqz4ntlw; Thu, 20 Jul 2023 19:55:45 +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 4R6Nhx3rLkz4Pqv; Thu, 20 Jul 2023 19:55:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689882945; 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=2mA8bi+l+A+bMq64owYE5MrHuS4mwZeNzpiBLmZFIJI=; b=VzgVtXCpr2MyI/NrExzly4zOXWbfjEY7uCz7R4KRg1+6eDzgWnfTbtJr5FY1AzPZTJa4VE PnPjzmQrHNdL2459YqofGoyl1yRpnUoH2jxasq62opmLuFXZPFaZ5NMOX/saVMjax46PMN R9d9NDj8G1QiGk6Fd/iAYZg1jvqrPW/5LdOKi1HCJPVl1fz9GXuRKlGtUoIDEJJjVT283v xK9gaJM4vmXpKCKa0CSyHWvJ4BmC6sVMP4jfbSWQQK6mLtVyRRxrBCF3RH4oR66QLOy4/d 9TRm9dR5/AW+5Vywg3TUuObJr5ZJ5bSE31wJhnqljCfqldBgaEMFndUuauQPVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689882945; 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=2mA8bi+l+A+bMq64owYE5MrHuS4mwZeNzpiBLmZFIJI=; b=IogHZG6jr3afY7eip5isHOtr7GpCT6smEYzk7IN4o0xS+cmXx9yU34vwVBiHtT/4N7DvaW Porip2xFa/bpZJParV+Y2AkFgjUX8Vmy2uyRlXfB0pKt/Rmaf3LyUW2yuo/skMvdttxATp UW0AihVvyOX396jZ1F0175xhiuDcEOpQYvNc1f5N6kdMaiSZni4STRYMnfagzewTrsioj4 zRrdJR5ZStXPjFnynhq5180mDluAk+cVXJN2hVmCaaM2sVbdOf3gGKG3nriIeoUTzuQ32y PcDnSdqLecG2POKg+xlz0LtR/2WrRtllKFNJykLRLPKZ8LGg9PlzFJgYsZ0Adw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689882945; a=rsa-sha256; cv=none; b=hSBZ0ZMU8xssWExl0azvdHzkkJrPOdMhnC1ewRxd2M6pUVCJ9pTs03egjUPC1qRKqjxPi9 jgLEihrOUIxFM2bcDGoxzw3NlDkEVrVVogs5Zfuqh2EaLt103HnWc/8LVd5kkUNhTAhHSX mAEUUiiO5QtASTgoryZhGLEQoS2IcjPY6pymldWABQMPnL9hXYx8SsLKJvfBeoJewRNYCd ICSS+vISMSLHPqhvdYEcMnpvGOxAmzILmo9FWjC2wdXDC/ecNzFpKCZ8dUUqge7B/D2ECh yCsKRCKFIcrk2GtwzVpd4Y9r1TMfEHNcz+jY7ckJlkpR4uc3XFwav+Q+5HxD+A== 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 4R6Nhx2plmzk6w; Thu, 20 Jul 2023 19:55: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 36KJtjTG053004; Thu, 20 Jul 2023 19:55:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36KJtjmq053003; Thu, 20 Jul 2023 19:55:45 GMT (envelope-from git) Date: Thu, 20 Jul 2023 19:55:45 GMT Message-Id: <202307201955.36KJtjmq053003@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Brooks Davis Subject: git: ad2ac7868943 - 2023Q3 - devel/llvm15: change clang to allow -m32 on arm64 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2023Q3 X-Git-Reftype: branch X-Git-Commit: ad2ac7868943c95981045994c8c25442c4af8fbb Auto-Submitted: auto-generated The branch 2023Q3 has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=ad2ac7868943c95981045994c8c25442c4af8fbb commit ad2ac7868943c95981045994c8c25442c4af8fbb Author: Brooks Davis AuthorDate: 2023-07-12 17:34:59 +0000 Commit: Brooks Davis CommitDate: 2023-07-20 18:33:44 +0000 devel/llvm15: 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 (cherry picked from commit c4e3653e713bdeec98237486ff3fc21b70645d0e) --- devel/llvm15/Makefile | 2 +- devel/llvm15/files/patch-backport-3450272fc2 | 33 ++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/devel/llvm15/Makefile b/devel/llvm15/Makefile index 91bdd77f3941..055eda28506c 100644 --- a/devel/llvm15/Makefile +++ b/devel/llvm15/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 15.0.7 -PORTREVISION= 4 +PORTREVISION= 5 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/llvm15/files/patch-backport-3450272fc2 b/devel/llvm15/files/patch-backport-3450272fc2 new file mode 100644 index 000000000000..1af8bf9700a0 --- /dev/null +++ b/devel/llvm15/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