From nobody Tue Jan 11 23:09: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 8CE011956CCB; Tue, 11 Jan 2022 23:09:49 +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 4JYRH11xy9z4vJN; Tue, 11 Jan 2022 23:09:49 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 1EFEA221AB; Tue, 11 Jan 2022 23:09:49 +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 20BN9nHV017103; Tue, 11 Jan 2022 23:09:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20BN9ntF017102; Tue, 11 Jan 2022 23:09:49 GMT (envelope-from git) Date: Tue, 11 Jan 2022 23:09:49 GMT Message-Id: <202201112309.20BN9ntF017102@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 89ba74caeafb - main - devel/llvm90: enable COMPILER_RT on riscv64 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 89ba74caeafbef6ed418cc07c392f990347095c9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641942589; 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=jr0LpwgLi8FA8Hr6bYnzoh60sBXeoChDnjy59+Olw9Y=; b=V6gvCRHfAUFAZzKLSgL7ohAL0/I1ni6L8Mslfkx457ynMqnfCaqLWV+BLkrzwsOR1aGcfi rUBJM4rk8IrMTmZ5q0un090BeViXchbXC5jZB4LbrOsZfcstCQhZJE6SwCuLll85Ghgli8 ln2d0xZqk+tNuqxqrgBLsS9eWf+cuV5lnkOcZRpt7GWnl4/cvCSrUiCts7tkpAEJovAfvv Wix0vK2lRDFOQnoWXn/2XJdkrFOIeh7yMJ7xWbrFeIzEukMjEYJIz14wwRIsLJ3CTAseQn 5x12uF6/MBMop8aaTuJadmlTon3+cUJjL7skKy1liFSrbcWkJl0LIdHjctJ7sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641942589; a=rsa-sha256; cv=none; b=Lxx9q8i/Ot4eSMvgeZ/nLq65R9QXezaTd1S/0W8N11n1HnfJx1uUsSI00ZZo94d9Ivj8cX arWZTFJWGltxmWcXW2uxNhmmXw0LV0fm2clQLgHzKPzgj7/LoVDeMTCLAiHYaHYTsA8RL7 zgigU1hLYDa5K+aIF56aO2DwWpJVyjLqArut/hjRnlF/+1Fokea0w5tDHCpNttm6v1y94S zYGmMVdROxDUQNJlVDKcJEfaPycW5uxHWcLtuk6iT7BJtbWiEwPFuoKDyGEdU6gyZgGCoC fMkvnSKPdp8q234WtokqdpxbJFcXEzJ2BtwahCoIOsOyS9h9Af/8BaeEwS3L9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=89ba74caeafbef6ed418cc07c392f990347095c9 commit 89ba74caeafbef6ed418cc07c392f990347095c9 Author: Piotr Kubaj AuthorDate: 2022-01-11 23:07:43 +0000 Commit: Piotr Kubaj CommitDate: 2022-01-11 23:07:43 +0000 devel/llvm90: enable COMPILER_RT on riscv64 1. COMPILER_RT builds libclang_rt.builtins-riscv64.a library, but not cfi_blacklist.txt, so _COMPILER_RT_BLACKLISTS needs to be put into amd64 and i386 cases. 2. Instead of: .if ${ARCH} .endif .if {ARCH} Do: .if ${ARCH} .elseif ${ARCH} 3. Remove whitespace at the end of line. PR: 261106 Approved by: brooks (maintainer) --- devel/llvm90/Makefile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/devel/llvm90/Makefile b/devel/llvm90/Makefile index 806ae746991e..04f794ea57d4 100644 --- a/devel/llvm90/Makefile +++ b/devel/llvm90/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 9.0.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel lang MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION}/ PKGNAMESUFFIX= ${LLVM_SUFFIX} @@ -67,6 +67,7 @@ OPTIONS_DEFINE_i386= COMPILER_RT OPENMP OPTIONS_DEFINE_powerpc= GOLD OPTIONS_DEFINE_powerpc64= GOLD OPENMP OPTIONS_DEFINE_powerpc64le= GOLD OPENMP +OPTIONS_DEFINE_riscv64= COMPILER_RT OPTIONS_DEFAULT= BE_AMDGPU BE_STANDARD CLANG EXTRAS LIT LLD LLD_LINK LLDB PYCLANG OPTIONS_DEFAULT_amd64= COMPILER_RT GOLD OPENMP OPTIONS_DEFAULT_i386= COMPILER_RT OPENMP @@ -75,6 +76,7 @@ OPTIONS_DEFAULT_powerpc64= ${PPC_ABI:tu:MELFV2} ${OPTIONS_DEFAULT_powerpc64_${OS OPTIONS_DEFAULT_powerpc64_13= GOLD OPTIONS_DEFAULT_powerpc64_14= GOLD OPTIONS_DEFAULT_powerpc64le= ELFV2 GOLD OPENMP +OPTIONS_DEFAULT_riscv64= COMPILER_RT OPTIONS_SINGLE= BACKENDS OPTIONS_SINGLE_BACKENDS=BE_FREEBSD BE_NATIVE BE_STANDARD OPTIONS_SUB= yes @@ -310,7 +312,7 @@ _BE_LIBS_COMMON= CodeGen Desc Info _BE_LIBS_AArch64= AsmParser Disassembler Utils _BE_LIBS_AMDGPU= AsmParser Disassembler Utils _BE_LIBS_ARM= AsmParser Disassembler Utils -_BE_LIBS_BPF= AsmParser Disassembler +_BE_LIBS_BPF= AsmParser Disassembler _BE_LIBS_Hexagon= AsmParser Disassembler _BE_LIBS_Lanai= AsmParser Disassembler _BE_LIBS_MSP430= AsmParser Disassembler @@ -332,8 +334,8 @@ BE_PATTERN=${_BE_LIBS_STANDARD:O:S/$/.a/:ts|} _CRTLIBDIR= ${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/lib/freebsd _CRTBLDIR= ${LLVM_DIR}/share -_COMPILER_RT_BLACKLISTS= cfi_blacklist.txt .if ${ARCH} == "amd64" +_COMPILER_RT_BLACKLISTS= cfi_blacklist.txt _COMPILER_RT_BLACKLISTS+= asan_blacklist.txt _COMPILER_RT_BLACKLISTS+= msan_blacklist.txt _COMPILER_RT_LIBS= \ @@ -374,8 +376,8 @@ _COMPILER_RT_LIBS= \ libclang_rt.xray-fdr-x86_64.a \ libclang_rt.xray-profiling-x86_64.a \ libclang_rt.xray-x86_64.a -.endif -.if ${ARCH} == "i386" +.elif ${ARCH} == "i386" +_COMPILER_RT_BLACKLISTS= cfi_blacklist.txt _COMPILER_RT_BLACKLISTS+= asan_blacklist.txt _COMPILER_RT_LIBS+= \ libclang_rt.asan-i386.a \ @@ -394,6 +396,9 @@ _COMPILER_RT_LIBS+= \ libclang_rt.ubsan_standalone-i386.a \ libclang_rt.ubsan_standalone-i386.so \ libclang_rt.ubsan_standalone_cxx-i386.a +.elif ${ARCH} == "riscv64" +_COMPILER_RT_LIBS= \ + libclang_rt.builtins-riscv64.a .endif .if ${ARCH} == "armv6"