From nobody Tue Aug 27 19:23:37 2024 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 4WtcsP4LB9z5JmKw; Tue, 27 Aug 2024 19:23: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WtcsP3s2Qz4lHB; Tue, 27 Aug 2024 19:23:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724786617; 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=VR5MoVoOPCtyyTrEOOm0tS1DHCH8CHKNnXaIXa7WhvY=; b=AATToQbZJCEp3dEroEFhtODS1Jq6UkXxWF88R+JwWLbjYNEqO5ovGzlA3ItgzIc4iHV1sj N8WhK1IyJOWb/Vtq1sAFLthX5OweCAOqz7cTYIahVKh2aPnrCE+JSCCyzvegF8xWwZ7NXR RVOn35g60SBteXEH7qEgKZC8xGN8p6NAultMV+xilDth9b1Mio5QVNVE/t0xUEFkr4ryb2 txUqle1IKAm1T0Fc0fLBgu5xB5/2Y8BP5l0QpyQQGVLEkRyZ75+Mf9ghMa4MSH1KKahggL UYi/rWV9Oj9PXD+pDtuBbOnbjvVa+Pn4+EuPGsTuTo7ZeuEhMkjR5h6L6B2Fmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724786617; a=rsa-sha256; cv=none; b=dQQHakHQufa34OUmcFKOHy9cO47BR1S2o3LaIBh81EFmjsxAE6fNViVGJlNC9Occr/Itlq lUR0O6A3v+GipWdHbCWz7ZI3AJHViAawW27KQ168CcwJOIsQrMSLg+h46zqzk4VvWRXt7o nEVCdSPBceTw73iNCVl5MHU0GVx/9MJ6t22wZwvRCpHFMA6THu/MepXtVMfti7fYK11UTG Nu1Qk2kEJ87rML6oip8lEfQXEyhzBOO+pL+wF/cHVYH1Sg6jSlKgcpmb9aIQjdIJh4dxYB w1MwUimIz61+5StIdzfA9BUdbY5lwIlrF4GlK/kjEyexWMkqrzGILTuDErrcjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724786617; 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=VR5MoVoOPCtyyTrEOOm0tS1DHCH8CHKNnXaIXa7WhvY=; b=OE5Hz5JfMqPXmSWLYWhnqmbkKuc3xczHXof3CztollBGtCXHsKByYF6yRIN0raMPZKwLDW nMXhA0vlch0g/ryTeCz+9Zo+LqFbiyGNuNGuBnfUcbv5ZlfaYcnlA+Jv17Me++3k1w3mK1 9FdW0Aj7rH2idhJUa/6jqrDkV4zsbp2HolLAm1OUHrnY8iJmy21lJX64tE8mDRnOzXekld YHMgnm61UkvAFqK6E5ZZtgkKfVHupMl7dTYjcTIvUhX9a63SeIDi2E3hwDrHaYXpjuUqdg QC9kRC7YFuhYmb4dmDPINaydRH9KwIwaik4ZSnW1z49UB9aNDqEay82Jm0OWdA== 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 4WtcsP3SMRz12tp; Tue, 27 Aug 2024 19:23:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47RJNbqW029296; Tue, 27 Aug 2024 19:23:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47RJNbwH029293; Tue, 27 Aug 2024 19:23:37 GMT (envelope-from git) Date: Tue, 27 Aug 2024 19:23:37 GMT Message-Id: <202408271923.47RJNbwH029293@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: 58dba5b8212f - main - devel/llvm19: prune build on 32-bit archs 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: 58dba5b8212fd4dc77e07f58810ae959ae29fc6e Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=58dba5b8212fd4dc77e07f58810ae959ae29fc6e commit 58dba5b8212fd4dc77e07f58810ae959ae29fc6e Author: Brooks Davis AuthorDate: 2024-08-27 19:23:23 +0000 Commit: Brooks Davis CommitDate: 2024-08-27 19:23:23 +0000 devel/llvm19: prune build on 32-bit archs Given trends in compiler resource use, it is incresingly implausible to consider cross-development from a 32-bit system. As such, stop spending time building LLVM bits are are vinishingly unlikely to be used on 32-bit systems. Default to BE_NATIVE (no cross build support) on 32-bit plaforms. Disable BE_AMDGPU and BE_WASM as well. BE_AMDGPU consumes enormous amounts of memory. BE_WASM is less problematic, but no one has stood up to say they need it so turn it off for now. Completely disable MLIR and POLLY on 32-bit. Just building MLIR fails routinly on armv7 and there aren't a lot of direct users (it's used by FLANG, but FLANG is 64-bit only). Polly is pretty niche and adds quite a bit of build time. Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D46239 --- devel/llvm19/Makefile | 44 +++++++++++++++++++++++++++++--------------- 1 file changed, 29 insertions(+), 15 deletions(-) diff --git a/devel/llvm19/Makefile b/devel/llvm19/Makefile index 61a8a9f89200..73d9cec01335 100644 --- a/devel/llvm19/Makefile +++ b/devel/llvm19/Makefile @@ -65,6 +65,7 @@ SHEBANG_FILES= \ SUB_FILES= llvm-wrapper.sh SUB_LIST= LLVM_PREFIX="${LLVM_PREFIX}" LLVM_SUFFIX="${LLVM_SUFFIX}" +OPTIONS_SUB= yes CMAKE_INSTALL_PREFIX= ${LLVM_PREFIX} CMAKE_SOURCE_PATH= ${WRKSRC}/llvm @@ -85,33 +86,46 @@ CMAKE_ARGS+= -DLLVM_ENABLE_TERMINFO=OFF CMAKE_ARGS+= -DLLVM_VERSION_SUFFIX= OPTIONS_DEFINE= BE_AMDGPU BE_WASM CLANG COMPILER_RT DOCS LLD STATIC_LIBS -OPTIONS_DEFAULT= BE_AMDGPU BE_WASM CLANG LLD OPTIONS_SINGLE= BACKENDS OPTIONS_SINGLE_BACKENDS=BE_FREEBSD BE_NATIVE BE_STANDARD + +OPTIONS_DEFAULT= CLANG LLD + +# BE_NATIVE for 32-bit +OPTIONS_DEFAULT_armv6= BE_NATIVE +OPTIONS_DEFAULT_armv7= BE_NATIVE +OPTIONS_DEFAULT_i386= BE_NATIVE +OPTIONS_DEFAULT_power= BE_NATIVE +# FLAVOR-dependent BE for 64-bit +_BE_default= BE_STANDARD BE_AMDGPU BE_WASM +_BE_lite= BE_FREEBSD BE_AMDGPU BE_WASM +OPTIONS_DEFAULT_aarch64= ${_BE_${FLAVOR}} +OPTIONS_DEFAULT_amd64= ${_BE_${FLAVOR}} +OPTIONS_DEFAULT_powerpc64= ${_BE_${FLAVOR}} +OPTIONS_DEFAULT_powerpc64le= ${_BE_${FLAVOR}} + OPTIONS_EXCLUDE_armv6= COMPILER_RT OPTIONS_EXCLUDE_armv7= COMPILER_RT -OPTIONS_SUB= yes -.if ${FLAVOR:Mlite} -OPTIONS_DEFAULT+= BE_FREEBSD -.else +.if ${FLAVOR:Mdefault} OPTIONS_DEFINE+= EXTRAS FLANG LIT LLDB MLIR OPENMP PYCLANG POLLY OPTIONS_DEFINE_amd64= GOLD OPTIONS_DEFINE_powerpc= GOLD OPTIONS_DEFINE_powerpc64= GOLD OPTIONS_DEFINE_powerpc64le= GOLD -OPTIONS_DEFAULT+= BE_STANDARD COMPILER_RT EXTRAS LIT LLDB MLIR OPENMP \ +OPTIONS_DEFAULT+= COMPILER_RT EXTRAS LIT LLDB MLIR OPENMP \ PYCLANG POLLY STATIC_LIBS -OPTIONS_DEFAULT_amd64= GOLD -OPTIONS_DEFAULT_powerpc= GOLD -OPTIONS_DEFAULT_powerpc64= GOLD -OPTIONS_DEFAULT_powerpc64le= GOLD - -OPTIONS_EXCLUDE_armv6+= FLANG OPENMP -OPTIONS_EXCLUDE_armv7+= FLANG OPENMP -OPTIONS_EXCLUDE_i386= FLANG OPENMP -OPTIONS_EXCLUDE_powerpc= FLANG OPENMP +OPTIONS_DEFAULT_amd64+= GOLD +OPTIONS_DEFAULT_powerpc+= GOLD +OPTIONS_DEFAULT_powerpc64+= GOLD +OPTIONS_DEFAULT_powerpc64le+= GOLD + +_OPTIONS_EXCLUDE_ptr32= FLANG MLIR OPENMP POLLY +OPTIONS_EXCLUDE_armv6+= ${_OPTIONS_EXCLUDE_ptr32} +OPTIONS_EXCLUDE_armv7+= ${_OPTIONS_EXCLUDE_ptr32} +OPTIONS_EXCLUDE_i386= ${_OPTIONS_EXCLUDE_ptr32} +OPTIONS_EXCLUDE_powerpc= ${_OPTIONS_EXCLUDE_ptr32} OPTIONS_EXCLUDE_riscv64= LLDB .endif