From nobody Wed Jul 12 19:01:37 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 4R1Rt93zvgz2tlLR; Wed, 12 Jul 2023 19:01:37 +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 4R1Rt93bMnz3KYw; Wed, 12 Jul 2023 19:01:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689188497; 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=2NXYGtqbn8eCoYpmkOL62sCli3vXp6xcmcg6+Jqxr6Q=; b=kgpWhmOj3s7l6OzjmZq3tZUzyeq5yNaFa/+hesnR3BUzOTO/DXH8wdmD88s/t+SXwXFGR8 UsYoDqWEF2akqCbJKlVONoB+maU7z9oG8JDU/8wjHPeXj0sqYBkl/GvreQ3+3zcAxcqzGH zWjcui2ZexvkXLlOrLANZfXsBtl/gOT+n1at16CxU4duLKSsKy79yqEpcRK4Ph78ILY/M0 p3EGhBszaVd5eeyRfy4cd/zg8Q7Nvm7BEQsx5f3aPJi+L1T4FhfHIqROWAcDqOGM2HYz7C AYg1VurxpxBVPKRnrAGlzQDh7hRpRQ1ha6ACzL3oo18pR2H0cIBnWQo28cDVKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689188497; 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=2NXYGtqbn8eCoYpmkOL62sCli3vXp6xcmcg6+Jqxr6Q=; b=bV9fqz+zhZ0SoYfNfQDJ01bn8iE1ytovyXf5NOwsGMMbE6abK3SXSIT6DgkGCgktrpkIvN mShGDIF40549LNzcvMRn3FdrPWYSNixdPKIc+Sp3Xsl0JAhgLc3XOyg0ovq+NtfW+5QTu3 mQzjcOc1V3e6qCzPRxjRyZVk7uIYlGLSeYxWjbrd+AvawhLChunayKd54opqJEoveUO+cq YaBCXtOUhGYQKUcl7LKBUnoZdyB2HngtQajF544iW38pk0XkVBgEzt8bStLEiwCERkytgp s+HozKQ7wB3u/Pwhrcex5Plo5jTTiLydY8zmK9cvH1ni7TuCzQ6MWpUF1IVd0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689188497; a=rsa-sha256; cv=none; b=Lo6Ynlfkf6AqOOWtfLp3uJFDwQ7Wik0M/lbrj12jdTGSIhrHFvytsp3/e5rLycxIiBkuXt WR8UCm9g0ie3UNH1sdWFsuxdkghUTBjaglJ+UJCY5lnXdfgpYQMeWW2b4e+C1S1t6IpP2D 7z2yJYZnMtBES9AmRtZX/SHzFoBT/fhCDaVcQ5SU+rYKUP7jYT6JpB2Z5nHxFbZLY6ZLMh Cw9G6ay/suzTpn3phgWJK2AtXVH8TA2MoNGaqbi1JQlpcaTBpQUf3Chmcd8TwcVzc9vjF1 FkhVCt058+3i0vdz5cX5+F0ITb/a6luKOew1f2X9iPD+ev3r1KKgLjW6mWKbtg== 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 4R1Rt92h0JzLDX; Wed, 12 Jul 2023 19:01:37 +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 36CJ1b3S085958; Wed, 12 Jul 2023 19:01:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36CJ1bWH085957; Wed, 12 Jul 2023 19:01:37 GMT (envelope-from git) Date: Wed, 12 Jul 2023 19:01:37 GMT Message-Id: <202307121901.36CJ1bWH085957@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: c4e3653e713b - main - devel/llvm15: 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: c4e3653e713bdeec98237486ff3fc21b70645d0e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=c4e3653e713bdeec98237486ff3fc21b70645d0e commit c4e3653e713bdeec98237486ff3fc21b70645d0e Author: Brooks Davis AuthorDate: 2023-07-12 17:34:59 +0000 Commit: Brooks Davis CommitDate: 2023-07-12 19:00:55 +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 --- 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