From nobody Wed Apr 20 23:17:08 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 8253211DFAE4; Wed, 20 Apr 2022 23:17:08 +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 4KkGlm3CX1z3q3p; Wed, 20 Apr 2022 23:17:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650496628; 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=PXjES55JSBKs1ef8AEmz3yMt9Nqn4ekeR7ST4+05Gxw=; b=dwXPoIETQz9SpDHDjR7JnU+MZbcxXkt9YVEZzhMW/c6rD3GKtc0Fq8pWnoPa4MVccjZMu4 ht9pnl5QleP8hOuW1ul9D0aUxZ9PgVwUs0snqzyF17rPmDkdB7iT2MRK9uTouwrrdpPyKS EnESS6cdbBI8+FkksFFH+PXidhBm537Kpi+FEQcSshmD2rGFSa8Q0Ff1k+hgSNvoBPuI+k miErZW6rb5NEwj3KXJiSQoYLnYM3y9Od78KODjzfFCxsiVNpW4c0DtXe5SDbqalphValeE Sdt0BNIHt0TpXsV2rfLP2k5ZMjrm8PffQfu5drskrdaSxn342MHSY63eIHINsQ== 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 4E82B1D36F; Wed, 20 Apr 2022 23:17:08 +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 23KNH8N6027613; Wed, 20 Apr 2022 23:17:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23KNH88d027612; Wed, 20 Apr 2022 23:17:08 GMT (envelope-from git) Date: Wed, 20 Apr 2022 23:17:08 GMT Message-Id: <202204202317.23KNH88d027612@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: 3a7c192dc40b - main - devel/llvm14: 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: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a7c192dc40b51cc8d08f04ffe69cee13637c4f6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650496628; 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=PXjES55JSBKs1ef8AEmz3yMt9Nqn4ekeR7ST4+05Gxw=; b=J4as3GV/suz+Q1dvGvoSmslzM4ZRSb8SXmlVIiGxl2h1SiI3BPoO9p/VuyawJwAN5WqJeO Yw8JWNjer1UCpcVEQN49QNiBo9gfZQzJLwbE7fE8JVUaV6vWy9V2+Hm1gSjBr0qCh5whcC MBx1C4N8IM4HsHmr70LIbrIVPGfgJOiPTYRe+SrvYYn01t+jdxpumJqr224LPlx4VCPzGj V6maF5cu0EFoOyNAFTipw6Ebm5Yp8PX9lmjg6pS9JQLVX8BucpNhLg/myLr+aaX68W663h 0AkIMyb5NlB1UwNvqagF09x40GJ9Z7wvYVTJBK8Gt5xkfM1ImDTQTRbbkqtvUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650496628; a=rsa-sha256; cv=none; b=JGaOpIl45FSp8hiGVqAfzGX3XUxqEK9J4JbkqCS73XUjr0X60lHcqi5iv6DuyLNu/1U8Cg XbCQqVBokhTFGLa4lv20rHfNIGOCBGktIgQ9Zg3h5qGtCNA5pfP1P2zex8G0aGK2mLebbH aeWd9rgMBN5yql8poshhcfe5q18zlDm1A0eslJsbDhBqVfCYZv79ARAIlwBUIPYjCiPtLi EHiaKvT8Qi5Bs+STMAvdp++FJFoRrShqVbyBYI1+qHpiuI8QLEXwQqdalUEY+03u/qUFee EUOo8x73nZk9Efo9a185Fq811i9xQi16QQXnxSybK+JEtezpg7nBbx8RX9nUxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=3a7c192dc40b51cc8d08f04ffe69cee13637c4f6 commit 3a7c192dc40b51cc8d08f04ffe69cee13637c4f6 Author: Brooks Davis AuthorDate: 2022-04-20 23:17:01 +0000 Commit: Brooks Davis CommitDate: 2022-04-20 23:17:01 +0000 devel/llvm14: enable COMPILER_RT on riscv64 Also use the base system unwind.h when appropriate. PR: 262707, 263414 Submitted by: pkubaj --- devel/llvm14/Makefile | 43 +++++++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/devel/llvm14/Makefile b/devel/llvm14/Makefile index ccc8f57227c2..7d25d2cc5350 100644 --- a/devel/llvm14/Makefile +++ b/devel/llvm14/Makefile @@ -89,7 +89,7 @@ OPTIONS_DEFINE_i386= COMPILER_RT OPENMP OPTIONS_DEFINE_powerpc= GOLD OPTIONS_DEFINE_powerpc64= GOLD OPENMP OPTIONS_DEFINE_powerpc64le= GOLD OPENMP -OPTIONS_DEFINE_riscv64= OPENMP +OPTIONS_DEFINE_riscv64= COMPILER_RT OPENMP OPTIONS_DEFAULT= BE_AMDGPU BE_STANDARD BE_WASM CLANG EXTRAS FLANG LIT LLD LLDB MLIR PYCLANG OPTIONS_DEFAULT_aarch64= OPENMP OPTIONS_DEFAULT_amd64= COMPILER_RT GOLD OPENMP @@ -99,7 +99,7 @@ OPTIONS_DEFAULT_powerpc64= ${OPTIONS_DEFAULT_powerpc64_${OSREL:R}} OPENMP OPTIONS_DEFAULT_powerpc64_13= GOLD OPTIONS_DEFAULT_powerpc64_14= GOLD OPTIONS_DEFAULT_powerpc64le= GOLD OPENMP -OPTIONS_DEFAULT_riscv64= OPENMP +OPTIONS_DEFAULT_riscv64= COMPILER_RT OPENMP OPTIONS_EXCLUDE_armv6= FLANG OPTIONS_EXCLUDE_armv7= FLANG OPTIONS_EXCLUDE_i386= FLANG @@ -134,12 +134,7 @@ CLANG_SUB_LIST= XCC=clang${LLVM_SUFFIX} \ X_COMPILER_TYPE=clang CLANG_USE= GNOME=libxml2 COMPILER_RT_DESC= Sanitizer libraries -# An unwind.h is require to build. I think an in-tree one should be used -# but this seems to work as a workaround... -COMPILER_RT_BUILD_DEPENDS= libunwind>0:devel/libunwind COMPILER_RT_CMAKE_ON= -DCOMPILER_RT_INSTALL_PATH=${LLVM_PREFIX}/lib/clang/${LLVM_RELEASE} -# Allow unwind.h to be found reliably -COMPILER_RT_USES= localbase COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ ${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|} DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx-markdown-tables>=0:textproc/py-sphinx-markdown-tables@${PY_FLAVOR} \ @@ -307,6 +302,13 @@ USES+= gnome .if ${PORT_OPTIONS:MCOMPILER_RT} LLVM_ENABLE_PROJECTS+= compiler-rt COMPILER_RT_PATTERN= (sanitizer|include.xray|include\/fuzzer|profile\/InstrProfData.inc) +.if ${OSVERSION} < 1300525 +# An unwind.h is require to build. I think an in-tree one should be used +# but this seems to work as a workaround... +COMPILER_RT_BUILD_DEPENDS= libunwind>0:devel/libunwind +# Allow unwind.h to be found reliably +COMPILER_RT_USES= localbase +.endif .endif .if ${PORT_OPTIONS:MEXTRAS} @@ -425,7 +427,6 @@ BE_PATTERN=${_BE_LIBS_STANDARD:O:S/$/.a/:ts|}|${_BE_INCS_STANDARD:ts|} _CRTLIBDIR= ${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/lib/freebsd _CRTBLDIR= ${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/share -_COMPILER_RT_BLACKLISTS= cfi_ignorelist.txt _COMPILER_RT_LIBS_i386= \ libclang_rt.asan-i386.a \ libclang_rt.asan-i386.so \ @@ -445,6 +446,7 @@ _COMPILER_RT_LIBS_i386= \ libclang_rt.ubsan_standalone-i386.so \ libclang_rt.ubsan_standalone_cxx-i386.a .if ${ARCH} == "amd64" +_COMPILER_RT_BLACKLISTS= cfi_ignorelist.txt _COMPILER_RT_BLACKLISTS+= asan_ignorelist.txt _COMPILER_RT_BLACKLISTS+= msan_ignorelist.txt _COMPILER_RT_LIBS= \ @@ -492,10 +494,31 @@ _COMPILER_RT_LIBS= \ .if exists(/usr/lib32/libc.so.7) _COMPILER_RT_LIBS+= ${_COMPILER_RT_LIBS_i386} .endif -.endif -.if ${ARCH} == "i386" +.elif ${ARCH} == "i386" +_COMPILER_RT_BLACKLISTS= cfi_ignorelist.txt _COMPILER_RT_BLACKLISTS+= asan_ignorelist.txt _COMPILER_RT_LIBS+= ${_COMPILER_RT_LIBS_i386} +.elif ${ARCH} == "riscv64" +_COMPILER_RT_BLACKLISTS= asan_ignorelist.txt +_COMPILER_RT_LIBS= \ + libclang_rt.asan-preinit-riscv64.a \ + libclang_rt.asan-riscv64.a \ + libclang_rt.asan-riscv64.a.syms \ + libclang_rt.asan-riscv64.so \ + libclang_rt.asan_cxx-riscv64.a \ + libclang_rt.asan_cxx-riscv64.a.syms \ + libclang_rt.asan_static-riscv64.a \ + libclang_rt.builtins-riscv64.a \ + libclang_rt.stats-riscv64.a \ + libclang_rt.stats_client-riscv64.a \ + libclang_rt.ubsan_minimal-riscv64.a \ + libclang_rt.ubsan_minimal-riscv64.a.syms \ + libclang_rt.ubsan_minimal-riscv64.so \ + libclang_rt.ubsan_standalone-riscv64.a \ + libclang_rt.ubsan_standalone-riscv64.a.syms \ + libclang_rt.ubsan_standalone-riscv64.so \ + libclang_rt.ubsan_standalone_cxx-riscv64.a \ + libclang_rt.ubsan_standalone_cxx-riscv64.a.syms .endif .if ${ARCH} == "armv6"