From nobody Mon Jan 30 23:39:35 2023 X-Original-To: dev-commits-ports-all@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 4P5Pm82s3Hz3bT41; Mon, 30 Jan 2023 23:39:36 +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 4P5Pm804yYz4P3d; Mon, 30 Jan 2023 23:39:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675121976; 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=M35eROxdHG4Y3OGfJMZ1ksZqxXw68ZvffdMdEf5JW6M=; b=rBBN2/yw1EZ/wcwIc2ZmJ8lxxPUbJ/NWouVtc++nLg1dUNM6qfV8Eq5+kgyy36HBUCx2CH a4VCqyENm7lmmnZN7gvra/xNiI5mA3e5wz30Fmd4HmVdaEZd0in4vdLfCTmnYZ4Y577Ygj WERYIrM5WIIkb4KA/5FJOJQjbuyFxi41qS3c5FPs+zZq43WN1YSDvjuJyHqRe3VlLJpPAY 3umyP9z9LtvyAPShEZMxNEWcQR2JJSI8KdRfE4+soQLEOy/DA5Y6UPBLKqzOLS563Rix/e CbWW6MTd87KbcmgS33cm7eLUZQeq8MbHdxYVRIMqgn1YiqkzAWzUBE1jA6F1Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675121976; 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=M35eROxdHG4Y3OGfJMZ1ksZqxXw68ZvffdMdEf5JW6M=; b=SIogzrg2rfDND3gENL8rFf5KYlOGJWlJ4y4W6QnBIls6H6uP9raoizNtS8oMparpdqXsxq p9j65Q2yR8g+Pe4pBqa8yhNPAzwrIqhPb0Pmbuh+bKWMkQJpwn0tVi8fxNMU+DNVtZmla2 xuHOTsFDwp5avVMplep5hk+srJ3JOg42n30wWRq7TwknH7HLO9VxpzfAkr6O0wBwi+UwDV AKQIpMCt/WzIY2suUojgdYzyj354o+nc3yQe7UM+KXtWI1dBCbH6BK97pYtke3iTLCJ5Og C69FjjG40FJS73iDP6G4/+tf8XO54ycv/FddCKoelMVcvJ0Pr/1hjcA8LyrbNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675121976; a=rsa-sha256; cv=none; b=HLNuYhqHn9TNBAxk/ULl3bsrT/GEtPHisjJ2svEefxljQ2FeqelSJBXNP9MLe3/Tky41rj komMCDxN0v2IxZlweyAdRXKJEzD8cx/AEg+QReRp6EGTUqYcrfMxMTN8NSnacLgImrrINI 3BkJYmRQLtzVAolxz/m6ih9d7bPTS+ym4RTR/kO68DmasQ5yGjw2BLLRoA1juETqdCG99e 0GFUqIsWRFF64IjEpLcnirBM5VqosLz49RLNW93J0rIxg2qxTL3PO18BO2J+75s50GHSbo RwW+VHfGKtfpSCZJSw0yePk+73uHb7iPMGjaQOtbAGi0jcTIGnlVusZg7yrbsQ== 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 4P5Pm763TqzRqy; Mon, 30 Jan 2023 23:39:35 +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 30UNdZwF073678; Mon, 30 Jan 2023 23:39:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30UNdZkE073677; Mon, 30 Jan 2023 23:39:35 GMT (envelope-from git) Date: Mon, 30 Jan 2023 23:39:35 GMT Message-Id: <202301302339.30UNdZkE073677@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: b6755d590ed2 - main - devel/llvm16: Welcome llvm 16.0.0rc1 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: b6755d590ed2e9fa167007f8fa222abf13459b9f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=b6755d590ed2e9fa167007f8fa222abf13459b9f commit b6755d590ed2e9fa167007f8fa222abf13459b9f Author: Brooks Davis AuthorDate: 2023-01-30 23:38:36 +0000 Commit: Brooks Davis CommitDate: 2023-01-30 23:38:36 +0000 devel/llvm16: Welcome llvm 16.0.0rc1 First release candidate of LLVM 16. Changes adopted from llvm-devel over the 6 months since the branch. --- devel/llvm16/Makefile | 260 ++---- devel/llvm16/Makefile.COMMANDS | 24 +- devel/llvm16/Makefile.MAN1SRCS | 19 +- devel/llvm16/Makefile.RUNTIMES | 215 +++++ devel/llvm16/distinfo | 6 +- ...patch-clang_tools_clang-format_git-clang-format | 10 +- ...omptarget_plugins-nextgen_amdgpu_CMakeLists.txt | 11 + ...nmp_libomptarget_plugins_amdgpu_impl_internal.h | 10 - devel/llvm16/pkg-plist | 872 ++++++++++++++------- 9 files changed, 917 insertions(+), 510 deletions(-) diff --git a/devel/llvm16/Makefile b/devel/llvm16/Makefile index 7401e536d3e1..c652bfa00c76 100644 --- a/devel/llvm16/Makefile +++ b/devel/llvm16/Makefile @@ -1,5 +1,5 @@ PORTNAME= llvm -DISTVERSION= 15.0.7 +DISTVERSION= 16.0.0rc1 PORTREVISION= 0 CATEGORIES= devel lang MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \ @@ -15,6 +15,7 @@ WWW= https://llvm.org/ LICENSE_DIR= ${WRKSRC}/llvm .include "${.CURDIR}/../llvm-devel/Makefile.LICENSE" LICENSE+= LLVM2 +LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/third-party/unittest/googletest/LICENSE.TXT LICENSE_FILE_LLVM2= ${LICENSE_DIR}/LICENSE.TXT LICENSE_NAME_LLVM2= Apache License 2.0 with LLVM Exceptions LICENSE_PERMS_LLVM2= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept @@ -33,7 +34,7 @@ LLVM_PREFIX= ${PREFIX}/${LLVM_DIR} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${LLVM_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${LLVM_SUFFIX} -USES= cmake compiler:c++11-lib cpe perl5 tar:xz \ +USES= cmake compiler:c++17-lang cpe perl5 tar:xz \ shebangfix _USES_PYTHON?= python:3.6+,build USES+= ${_USES_PYTHON} @@ -85,27 +86,22 @@ CMAKE_ARGS+= -DLLVM_ENABLE_TERMINFO=OFF CFLAGS+= -DNDEBUG CXXFLAGS+= -DNDEBUG -OPTIONS_DEFINE= BE_AMDGPU BE_WASM CLANG DOCS EXTRAS FLANG LIT LLD LLDB MLIR PYCLANG -OPTIONS_DEFINE_aarch64= OPENMP -OPTIONS_DEFINE_amd64= COMPILER_RT GOLD OPENMP -OPTIONS_DEFINE_i386= COMPILER_RT OPENMP -OPTIONS_DEFINE_powerpc= COMPILER_RT GOLD -OPTIONS_DEFINE_powerpc64= COMPILER_RT GOLD OPENMP -OPTIONS_DEFINE_powerpc64le= COMPILER_RT GOLD OPENMP -OPTIONS_DEFINE_riscv64= COMPILER_RT OPENMP -OPTIONS_DEFAULT= BE_AMDGPU BE_STANDARD BE_WASM CLANG EXTRAS FLANG LIT LLD LLDB PYCLANG -OPTIONS_DEFAULT_aarch64= OPENMP -OPTIONS_DEFAULT_amd64= COMPILER_RT GOLD OPENMP -OPTIONS_DEFAULT_i386= COMPILER_RT -OPTIONS_DEFAULT_powerpc= COMPILER_RT GOLD -OPTIONS_DEFAULT_powerpc64= COMPILER_RT GOLD OPENMP -OPTIONS_DEFAULT_powerpc64le= COMPILER_RT GOLD OPENMP -OPTIONS_DEFAULT_riscv64= COMPILER_RT OPENMP -OPTIONS_EXCLUDE_armv6= FLANG -OPTIONS_EXCLUDE_armv7= FLANG -OPTIONS_EXCLUDE_i386= FLANG -OPTIONS_EXCLUDE_powerpc= FLANG +OPTIONS_DEFINE= BE_AMDGPU BE_WASM CLANG COMPILER_RT DOCS EXTRAS FLANG LIT LLD LLDB MLIR OPENMP PYCLANG +OPTIONS_DEFINE_amd64= GOLD +OPTIONS_DEFINE_powerpc= GOLD +OPTIONS_DEFINE_powerpc64= GOLD +OPTIONS_DEFINE_powerpc64le= GOLD +OPTIONS_DEFAULT= BE_AMDGPU BE_STANDARD BE_WASM CLANG COMPILER_RT EXTRAS FLANG LIT LLD LLDB OPENMP PYCLANG +OPTIONS_DEFAULT_amd64= GOLD +OPTIONS_DEFAULT_powerpc= GOLD +OPTIONS_DEFAULT_powerpc64= GOLD +OPTIONS_DEFAULT_powerpc64le= GOLD +OPTIONS_EXCLUDE_armv6= COMPILER_RT FLANG OPENMP +OPTIONS_EXCLUDE_armv7= COMPILER_RT FLANG OPENMP +OPTIONS_EXCLUDE_i386= FLANG OPENMP +OPTIONS_EXCLUDE_powerpc= FLANG OPENMP OPTIONS_EXCLUDE_riscv64= LLDB +OPTIONS_EXCLUDE_FreeBSD_12= OPENMP OPTIONS_SINGLE= BACKENDS OPTIONS_SINGLE_BACKENDS=BE_FREEBSD BE_NATIVE BE_STANDARD OPTIONS_SUB= yes @@ -121,7 +117,7 @@ BE_STANDARD_DESC= All non-experimental backends BE_WASM_DESC= WebAssembly backend (required by firefox via wasi) .for BE in FREEBSD NATIVE STANDARD BE_${BE}_PLIST_FILES= ${_BE_LIBS_${BE}:O:S/$/.a/:S|^|${LLVM_DIR}/lib/libLLVM|} \ - ${_BE_INCS_${BE}:S|^|${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/include/|:N${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/include/$} + ${_BE_INCS_${BE}:S|^|${LLVM_DIR}/lib/clang/${LLVM_MAJOR}/include/|:N${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/include/$} .endfor CLANG_DESC= Build clang CLANG_CMAKE_ON= -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp @@ -136,8 +132,8 @@ CLANG_SUB_LIST= XCC=clang${LLVM_SUFFIX} \ CLANG_USE= GNOME=libxml2 COMPILER_RT_DESC= Sanitizer libraries COMPILER_RT_CMAKE_ON= -DCOMPILER_RT_INSTALL_PATH=${LLVM_PREFIX}/lib/clang/${LLVM_RELEASE} -COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ - ${_COMPILER_RT_IGNORELISTS:S|^|${_CRTBLDIR}/|} +COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS} \ + ${COMPILER_RT_IGNORELISTS:S|^|${_CRTILDIR}/|} DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx-markdown-tables>=0:textproc/py-sphinx-markdown-tables@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} DOCS_CONFLICTS_BUILD= cmark @@ -157,6 +153,7 @@ FLANG_PLIST_DIRS= ${LLVM_DIR}/include/flang/Config GOLD_DESC= Build the LLVM Gold plugin for LTO GOLD_CMAKE_ON= -DLLVM_BINUTILS_INCDIR=${LOCALBASE}/include GOLD_BUILD_DEPENDS= ${LOCALBASE}/bin/ld.gold:devel/binutils +GOLD_PLIST_FILES= ${LLVM_DIR}/lib/LLVMgold.so LIT_DESC= Install lit and FileCheck test tools LIT_VARS= _USES_PYTHON=python:3.6+ LLD_DESC= Install lld, the LLVM linker @@ -170,6 +167,7 @@ LLDB_CMAKE_ON= -DLUA_INCLUDE_DIR=${LOCALBASE}/include/lua${LUA_VER_STR} \ -DPANEL_LIBRARIES=/usr/lib/libpanel.so LLDB_DESC= Install lldb, the LLVM debugger LLDB_IMPLIES= CLANG +LLDB_PLIST_SUB= PYTHON_ABIVER=${PYTHON_ABIVER} LLDB_USES= lua:53 libedit LLDB_VARS= _USES_PYTHON=python:3.6+ MLIR_DESC= Multi-Level Intermediate Representation @@ -222,7 +220,7 @@ EXTRAS_LIBS= libclangApplyReplacements \ EXTRAS_FILES= index.js EXTRAS_PATTERN= ${EXTRAS_COMMANDS:tW:C/ */|/g}|${EXTRAS_LIBS:tW:C/ */|/g}|${EXTRAS_FILES:tW:C/ */|/g} -FLANG_PATTERN= ${FLANG_COMMANDS:S/^/bin./:tW:C/ */|/g}|flang|libFIR|libFortran +FLANG_PATTERN= ${FLANG_COMMANDS:S/^/bin./:tW:C/ */|/g}|flang|libFIR|libFortran|libHLFIR MLIR_PATTERN= ${MLIR_COMMANDS:S/^/bin./:tW:C/ */|/g}|mlir|libMLIR|obj.MLIRCAP @@ -252,7 +250,7 @@ CONFIGURE_TARGET:=${ARCH:C/amd64/x86_64/:C/arm64/aarch64/}-portbld-${OPSYS:tl}${ LLVM_ENABLE_PROJECTS+= clang COMMANDS+= ${CLANG_COMMANDS} MAN1SRCS+= ${CLANG_MAN1SRCS} -CLANG_PATTERN= (c-index-test|clang|diagtool|hmaptool|intercept-|libear|libscanbuild|analyze-|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|-analyzer|AnalyzerPlugin.so) +CLANG_PATTERN= (amdgpu-arch|c-index-test|clang|diagtool|hmaptool|intercept-|libear|libscanbuild|nvptx-arch|analyze-|scan-|Reporter.py|ScanView.py|scanview.css|sorttable.js|startfile.py|-analyzer|AnalyzerPlugin.so) USES+= gnome .endif @@ -348,7 +346,7 @@ FREEBSD_BACKENDS+= WebAssembly NATIVE_BACKENDS+= WebAssembly .endif STANDARD_BACKENDS= ${_FREEBSD_BACKENDS} AMDGPU AVR BPF Hexagon Lanai \ - MSP430 NVPTX SystemZ VE WebAssembly XCore + LoongArch MSP430 NVPTX SystemZ VE WebAssembly XCore _BE_LIBS_COMMON= CodeGen Desc Info _BE_LIBS_AArch64= AsmParser Disassembler Utils _BE_LIBS_BACKWARDS_AArch64=Exegesis @@ -359,13 +357,14 @@ _BE_LIBS_AVR= AsmParser Disassembler _BE_LIBS_BPF= AsmParser Disassembler _BE_LIBS_Hexagon= AsmParser Disassembler _BE_LIBS_Lanai= AsmParser Disassembler +_BE_LIBS_LoongArch= AsmParser Disassembler _BE_LIBS_MSP430= AsmParser Disassembler _BE_LIBS_Mips= AsmParser Disassembler _BE_LIBS_BACKWARDS_Mips=Exegesis _BE_LIBS_PowerPC= AsmParser Disassembler _BE_LIBS_BACKWARDS_PowerPC=Exegesis _BE_INCS_RISCV= riscv_vector.h -_BE_LIBS_RISCV= AsmParser Disassembler +_BE_LIBS_RISCV= AsmParser Disassembler TargetMCA _BE_LIBS_Sparc= AsmParser Disassembler _BE_LIBS_SystemZ= AsmParser Disassembler _BE_LIBS_VE= AsmParser Disassembler @@ -383,179 +382,48 @@ _BE_INCS_${BE}+= ${_BE_INCS_${BE_ARCH}} .endfor 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_LIBS_i386= \ - libclang_rt.asan-i386.a \ - libclang_rt.asan-i386.so \ - libclang_rt.asan-preinit-i386.a \ - libclang_rt.asan_static-i386.a \ - libclang_rt.asan_cxx-i386.a \ - libclang_rt.builtins-i386.a \ - libclang_rt.cfi-i386.a \ - libclang_rt.cfi_diag-i386.a \ - libclang_rt.profile-i386.a \ - libclang_rt.safestack-i386.a \ - libclang_rt.stats-i386.a \ - libclang_rt.stats_client-i386.a \ - libclang_rt.ubsan_minimal-i386.a \ - libclang_rt.ubsan_minimal-i386.so \ - libclang_rt.ubsan_standalone-i386.a \ - libclang_rt.ubsan_standalone-i386.so \ - libclang_rt.ubsan_standalone_cxx-i386.a -.if ${ARCH} == "amd64" -_COMPILER_RT_IGNORELISTS= cfi_ignorelist.txt -_COMPILER_RT_IGNORELISTS+= asan_ignorelist.txt -_COMPILER_RT_IGNORELISTS+= msan_ignorelist.txt -_COMPILER_RT_LIBS= \ - libclang_rt.asan-preinit-x86_64.a \ - libclang_rt.asan-x86_64.a \ - libclang_rt.asan-x86_64.a.syms \ - libclang_rt.asan-x86_64.so \ - libclang_rt.asan_cxx-x86_64.a \ - libclang_rt.asan_cxx-x86_64.a.syms \ - libclang_rt.asan_static-x86_64.a \ - libclang_rt.builtins-x86_64.a \ - libclang_rt.cfi-x86_64.a \ - libclang_rt.cfi_diag-x86_64.a \ - libclang_rt.dd-x86_64.a \ - libclang_rt.dyndd-x86_64.so \ - libclang_rt.fuzzer_interceptors-x86_64.a \ - libclang_rt.fuzzer_no_main-x86_64.a \ - libclang_rt.fuzzer-x86_64.a \ - libclang_rt.msan-x86_64.a \ - libclang_rt.msan-x86_64.a.syms \ - libclang_rt.msan_cxx-x86_64.a \ - libclang_rt.msan_cxx-x86_64.a.syms \ - libclang_rt.orc-x86_64.a \ - libclang_rt.profile-x86_64.a \ - libclang_rt.safestack-x86_64.a \ - libclang_rt.stats-x86_64.a \ - libclang_rt.stats_client-x86_64.a \ - libclang_rt.tsan-x86_64.a \ - libclang_rt.tsan-x86_64.a.syms \ - libclang_rt.tsan-x86_64.so \ - libclang_rt.tsan_cxx-x86_64.a \ - libclang_rt.tsan_cxx-x86_64.a.syms \ - libclang_rt.ubsan_minimal-x86_64.a \ - libclang_rt.ubsan_minimal-x86_64.a.syms \ - libclang_rt.ubsan_minimal-x86_64.so \ - libclang_rt.ubsan_standalone-x86_64.a \ - libclang_rt.ubsan_standalone-x86_64.a.syms \ - libclang_rt.ubsan_standalone-x86_64.so \ - libclang_rt.ubsan_standalone_cxx-x86_64.a \ - libclang_rt.ubsan_standalone_cxx-x86_64.a.syms \ - libclang_rt.xray-basic-x86_64.a \ - libclang_rt.xray-fdr-x86_64.a \ - libclang_rt.xray-profiling-x86_64.a \ - libclang_rt.xray-x86_64.a +.if ${ARCH} == "aarch64" +COMPILER_RT_ARCHS= aarch64 +.elif ${ARCH} == "amd64" +COMPILER_RT_ARCHS= x86_64 .if exists(/usr/lib32/libc.so.7) -_COMPILER_RT_LIBS+= ${_COMPILER_RT_LIBS_i386} +COMPILER_RT_ARCHS+= i386 .endif .elif ${ARCH} == "i386" -_COMPILER_RT_IGNORELISTS= cfi_ignorelist.txt -_COMPILER_RT_IGNORELISTS+= asan_ignorelist.txt -_COMPILER_RT_LIBS+= ${_COMPILER_RT_LIBS_i386} +COMPILER_RT_ARCHS= i386 .elif ${ARCH} == "powerpc" -_COMPILER_RT_LIBS= \ - libclang_rt.builtins-powerpc.a \ - libclang_rt.profile-powerpc.a +COMPILER_RT_ARCHS= powerpc .elif ${ARCH} == "powerpc64" -_COMPILER_RT_IGNORELISTS= asan_ignorelist.txt -_COMPILER_RT_IGNORELISTS+= msan_ignorelist.txt -_COMPILER_RT_LIBS= \ - libclang_rt.asan-powerpc64.a \ - libclang_rt.asan-powerpc64.a.syms \ - libclang_rt.asan-powerpc64.so \ - libclang_rt.asan-preinit-powerpc64.a \ - libclang_rt.asan_cxx-powerpc64.a \ - libclang_rt.asan_cxx-powerpc64.a.syms \ - libclang_rt.asan_static-powerpc64.a \ - libclang_rt.builtins-powerpc64.a \ - libclang_rt.msan-powerpc64.a \ - libclang_rt.msan-powerpc64.a.syms \ - libclang_rt.msan_cxx-powerpc64.a \ - libclang_rt.msan_cxx-powerpc64.a.syms \ - libclang_rt.profile-powerpc64.a \ - libclang_rt.stats-powerpc64.a \ - libclang_rt.stats_client-powerpc64.a \ - libclang_rt.tsan-powerpc64.a \ - libclang_rt.tsan-powerpc64.a.syms \ - libclang_rt.tsan-powerpc64.so \ - libclang_rt.tsan_cxx-powerpc64.a \ - libclang_rt.tsan_cxx-powerpc64.a.syms \ - libclang_rt.ubsan_minimal-powerpc64.a \ - libclang_rt.ubsan_minimal-powerpc64.a.syms \ - libclang_rt.ubsan_minimal-powerpc64.so \ - libclang_rt.ubsan_standalone-powerpc64.a \ - libclang_rt.ubsan_standalone-powerpc64.a.syms \ - libclang_rt.ubsan_standalone-powerpc64.so \ - libclang_rt.ubsan_standalone_cxx-powerpc64.a \ - libclang_rt.ubsan_standalone_cxx-powerpc64.a.syms +COMPILER_RT_ARCHS= powerpc64 .if exists(/usr/lib32/libc.so.7) -_COMPILER_RT_LIBS+= \ - libclang_rt.builtins-powerpc.a \ - libclang_rt.profile-powerpc.a +COMPILER_RT_ARCHS+= powerpc .endif .elif ${ARCH} == "powerpc64le" -_COMPILER_RT_IGNORELISTS= asan_ignorelist.txt -_COMPILER_RT_IGNORELISTS+= msan_ignorelist.txt -_COMPILER_RT_LIBS= \ - libclang_rt.asan-powerpc64le.a \ - libclang_rt.asan-powerpc64le.a.syms \ - libclang_rt.asan-powerpc64le.so \ - libclang_rt.asan-preinit-powerpc64le.a \ - libclang_rt.asan_cxx-powerpc64le.a \ - libclang_rt.asan_cxx-powerpc64le.a.syms \ - libclang_rt.asan_static-powerpc64le.a \ - libclang_rt.builtins-powerpc64le.a \ - libclang_rt.msan-powerpc64le.a \ - libclang_rt.msan-powerpc64le.a.syms \ - libclang_rt.msan_cxx-powerpc64le.a \ - libclang_rt.msan_cxx-powerpc64le.a.syms \ - libclang_rt.profile-powerpc64le.a \ - libclang_rt.stats-powerpc64le.a \ - libclang_rt.stats_client-powerpc64le.a \ - libclang_rt.tsan-powerpc64le.a \ - libclang_rt.tsan-powerpc64le.a.syms \ - libclang_rt.tsan-powerpc64le.so \ - libclang_rt.tsan_cxx-powerpc64le.a \ - libclang_rt.tsan_cxx-powerpc64le.a.syms \ - libclang_rt.ubsan_minimal-powerpc64le.a \ - libclang_rt.ubsan_minimal-powerpc64le.a.syms \ - libclang_rt.ubsan_minimal-powerpc64le.so \ - libclang_rt.ubsan_standalone-powerpc64le.a \ - libclang_rt.ubsan_standalone-powerpc64le.a.syms \ - libclang_rt.ubsan_standalone-powerpc64le.so \ - libclang_rt.ubsan_standalone_cxx-powerpc64le.a \ - libclang_rt.ubsan_standalone_cxx-powerpc64le.a.syms \ - libclang_rt.xray-basic-powerpc64le.a \ - libclang_rt.xray-fdr-powerpc64le.a \ - libclang_rt.xray-powerpc64le.a \ - libclang_rt.xray-profiling-powerpc64le.a +COMPILER_RT_ARCHS= powerpc64le .elif ${ARCH} == "riscv64" -_COMPILER_RT_IGNORELISTS= 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 +COMPILER_RT_ARCHS= riscv64 .endif +_CRTBASEDIR= ${LLVM_DIR}/lib/clang/${LLVM_MAJOR} +_CRTILDIR= ${_CRTBASEDIR}/share +_CRTLIBDIR= ${_CRTBASEDIR}/lib + +.include "Makefile.RUNTIMES" + +_COMPILER_RT_LIBS= +.for CRT_ARCH in ${COMPILER_RT_ARCHS} +_COMPILER_RT_LIBS:= ${_COMPILER_RT_LIBS} ${COMPILER_RT_LIBS_${CRT_ARCH}:S|^|${_CRTLIBDIR}/${CRT_ARCH}-portbld-${OPSYS:tl}${OSREL}/|} +.endfor + +COMPILER_RT_IGNORELISTS= +.for RT in asan cfi msan +.if ${_COMPILER_RT_LIBS:M*/libclang_rt.${RT}.a} +COMPILER_RT_IGNORELISTS:= ${COMPILER_RT_IGNORELISTS} ${RT}_ignorelist.txt +.endif +.endfor +# Strip empty element +COMPILER_RT_IGNORELISTS:=${COMPILER_RT_IGNORELISTS:N^$$} + .if ${ARCH} == "armv6" BUILD_DEPENDS+= ${LOCALBASE}/bin/ld:devel/binutils CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin @@ -644,6 +512,7 @@ post-install-EXTRAS-on: post-install-FLANG-on: ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/flang/Optimizer/CodeGen/CMakeFiles ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/flang/Optimizer/Dialect/CMakeFiles + ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/flang/Optimizer/HLFIR/CMakeFiles ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/flang/Optimizer/Transforms/CMakeFiles ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/flang/Optimizer/CMakeFiles ${RMDIR} ${STAGEDIR}${LLVM_PREFIX}/include/flang/CMakeFiles @@ -703,13 +572,13 @@ build-plist: ${GREP} -v '[/-]lit$$' | ${GREP} -v 'FileCheck$$' | \ ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \ -e 's|${PYTHON_SITELIBDIR:C|${PREFIX}/||}|%%PYTHON_SITELIBDIR%%|' \ - -e 's|${PYTHON_EXT_SUFFIX:C/\./\\./g}|%%PYTHON_EXT_SUFFIX%%|' \ + -e 's|${PYTHON_EXT_SUFFIX:C/\./\\./g}${PYTHON_ABIVER}|%%PYTHON_EXT_SUFFIX%%%%PYTHON_ABIVER%%|' \ -e 's|${LLVM_RELEASE}|%%LLVM_RELEASE%%|' \ -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' \ -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \ -e 's|${LLVM_SUFFIX:C/\./\\./g}|%%LLVM_SUFFIX%%|' \ - -e 's|\([^0-9]\)${LLVM_MAJOR}$$|\1%%LLVM_MAJOR%%|' \ - -e 's|\([^0-9]\)${LLVM_MAJOR}\([^0-9]\)|\1%%LLVM_MAJOR%%\2|' \ + -e 's|/${LLVM_MAJOR}/|/%%LLVM_MAJOR%%/|' \ + -e 's|\([-./]\)${LLVM_MAJOR:C/\./\\./}$$|\1%%LLVM_MAJOR%%|' \ | ${SORT} >> ${PLIST}.tmp ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR}/lit${LLVM_SUFFIX} -type f | \ ${SED} -e 's|${STAGEDIR}${PYTHON_SITELIBDIR}|%%LIT%%%%PYTHON_SITELIBDIR%%|' \ @@ -728,9 +597,8 @@ build-plist: if ($$0 ~ /(argdumper|lldb|six.py)/) {printf "%%%%LLDB%%%%"} \ if ($$0 ~ /(${MLIR_PATTERN})/) {printf "%%%%MLIR%%%%"} \ if ($$0 ~ /(${OPENMP_PATTERN})/) {printf "%%%%OPENMP%%%%"} \ - if ($$0 ~ /(LLVMgold)/) {printf "%%%%GOLD%%%%"} \ if ($$0 ~ /${PYCLANG_PATTERN}/) {printf "%%%%PYCLANG%%%%"} \ - if ($$0 !~ /(libclang_rt)/ && $$0 !~ /(${BE_PATTERN})$$/) {print}}' ${PLIST}.tmp >> ${PLIST} + if ($$0 !~ /(lib[a-z]*_rt|LLVMgold)/ && $$0 !~ /(${BE_PATTERN})$$/) {print}}' ${PLIST}.tmp >> ${PLIST} ${ECHO_CMD} '@postexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi' >> ${PLIST} ${ECHO_CMD} '@postunexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi' >> ${PLIST} ${RM} ${PLIST}.tmp diff --git a/devel/llvm16/Makefile.COMMANDS b/devel/llvm16/Makefile.COMMANDS index b7a6cd040c68..dfda5e607c18 100644 --- a/devel/llvm16/Makefile.COMMANDS +++ b/devel/llvm16/Makefile.COMMANDS @@ -14,6 +14,7 @@ LLVM_COMMANDS= \ llvm-cov \ llvm-cvtres \ llvm-cxxmap \ + llvm-debuginfo-analyzer \ llvm-debuginfod \ llvm-debuginfod-find \ llvm-diff \ @@ -32,7 +33,6 @@ LLVM_COMMANDS= \ llvm-link \ llvm-lipo \ llvm-mc \ - llvm-mca \ llvm-ml \ llvm-modextract \ llvm-mt \ @@ -50,6 +50,7 @@ LLVM_COMMANDS= \ llvm-readobj \ llvm-reduce \ llvm-remark-size-diff \ + llvm-remarkutil \ llvm-rtdyld \ llvm-sim \ llvm-size \ @@ -65,10 +66,10 @@ LLVM_COMMANDS= \ llvm-windres \ llvm-xray \ opt \ - sancov \ - split-file + sancov CLANG_COMMANDS= \ + amdgpu-arch \ analyze-build \ c-index-test \ clang \ @@ -78,16 +79,15 @@ CLANG_COMMANDS= \ clang-extdef-mapping \ clang-format \ clang-linker-wrapper \ - clang-nvlink-wrapper \ clang-offload-bundler \ clang-offload-packager \ - clang-offload-wrapper \ - clang-rename \ clang-repl \ clang-scan-deps \ + clang-tblgen \ diagtool \ hmaptool \ intercept-build \ + nvptx-arch \ scan-build \ scan-build-py \ scan-view @@ -97,18 +97,19 @@ EXTRAS_COMMANDS= \ clang-apply-replacements \ clang-change-namespace \ clang-doc \ + clang-include-cleaner \ clang-include-fixer \ clang-move \ clang-pseudo \ clang-query \ + clang-rename \ clang-reorder-fields \ clang-tidy \ find-all-symbols \ modularize \ - pp-trace \ - run-clang-tidy + pp-trace -FLANG_COMMANDS= \ +FLANG_COMMANDS= \ bbc \ f18-parse-demo \ fir-opt \ @@ -138,9 +139,9 @@ LLDB_COMMANDS= \ MLIR_COMMANDS= \ mlir-cpu-runner \ - mlir-linalg-ods-yaml-gen \ mlir-lsp-server \ mlir-opt \ + mlir-pdll \ mlir-pdll-lsp-server \ mlir-reduce \ mlir-tblgen \ @@ -148,4 +149,5 @@ MLIR_COMMANDS= \ tblgen-lsp-server OPENMP_COMMANDS= \ - llvm-omp-device-info + llvm-omp-device-info \ + llvm-omp-kernel-replay diff --git a/devel/llvm16/Makefile.MAN1SRCS b/devel/llvm16/Makefile.MAN1SRCS index 224eb37d8bc8..59eb5c909711 100644 --- a/devel/llvm16/Makefile.MAN1SRCS +++ b/devel/llvm16/Makefile.MAN1SRCS @@ -1,7 +1,9 @@ LLVM_MAN1SRCS= \ bugpoint.1 \ + clang-tblgen.1 \ dsymutil.1 \ llc.1 \ + lldb-tblgen.1 \ lli.1 \ llvm-addr2line.1 \ llvm-ar.1 \ @@ -11,6 +13,7 @@ LLVM_MAN1SRCS= \ llvm-cov.1 \ llvm-cxxfilt.1 \ llvm-cxxmap.1 \ + llvm-debuginfo-analyzer.1 \ llvm-diff.1 \ llvm-dis.1 \ llvm-dwarfdump.1 \ @@ -28,14 +31,16 @@ LLVM_MAN1SRCS= \ llvm-nm.1 \ llvm-objcopy.1 \ llvm-objdump.1 \ + llvm-opt-report.1 \ llvm-otool.1 \ llvm-pdbutil.1 \ llvm-profdata.1 \ llvm-profgen.1 \ llvm-ranlib.1 \ llvm-readelf.1 \ - llvm-remark-size-diff.1 \ llvm-readobj.1 \ + llvm-remark-size-diff.1 \ + llvm-remarkutil.1 \ llvm-size.1 \ llvm-stress.1 \ llvm-strings.1 \ @@ -43,12 +48,12 @@ LLVM_MAN1SRCS= \ llvm-symbolizer.1 \ llvm-tblgen.1 \ llvm-tli-checker.1 \ - tblgen.1 \ - opt.1 + mlir-tblgen.1 \ + opt.1 \ + tblgen.1 CLANG_MAN1SRCS= \ clang.1 \ - clang-tblgen.1 \ diagtool.1 \ scan-build.1 @@ -59,11 +64,5 @@ LIT_MAN1SRCS= \ lit.1 \ FileCheck.1 -LLDB_MAN1SRCS= \ - lldb-tblgen.1 - -MLIR_MAN1SRCS= \ - mlir-tblgen.1 - OPENMP_MAN1SRCS= \ llvmopenmp.1 diff --git a/devel/llvm16/Makefile.RUNTIMES b/devel/llvm16/Makefile.RUNTIMES new file mode 100644 index 000000000000..aa085a453cb7 --- /dev/null +++ b/devel/llvm16/Makefile.RUNTIMES @@ -0,0 +1,215 @@ +# Makefile.RUNTIMES +# +# LIBCLANG_RT_LIBS_ - clang runtime files (actual name prefixed with +# "libclang_rt." (e.g., asan.a -> libclang_rt.asan.a). +# +# RT_LIBS_ - full name of other runtimes. + +RT_ARCHES= + +RT_ARCHES+=aarch64 +LIBCLANG_RT_LIBS_aarch64= \ + asan-preinit.a \ + asan.a \ + asan.a.syms \ + asan.so \ + asan_cxx.a \ + asan_cxx.a.syms \ + asan_static.a \ + builtins.a \ + cfi.a \ + cfi_diag.a \ + fuzzer.a \ + fuzzer_interceptors.a \ + fuzzer_no_main.a \ + msan.a \ + msan.a.syms \ + msan_cxx.a \ + msan_cxx.a.syms \ + profile.a \ + safestack.a \ + stats.a \ + stats_client.a \ + tsan.a \ + tsan.a.syms \ + tsan.so \ + tsan_cxx.a \ + tsan_cxx.a.syms \ + ubsan_minimal.a \ + ubsan_minimal.a.syms \ + ubsan_minimal.so \ + ubsan_standalone.a \ + ubsan_standalone.a.syms \ + ubsan_standalone.so \ + ubsan_standalone_cxx.a \ + ubsan_standalone_cxx.a.syms \ + xray-basic.a \ + xray-fdr.a \ + xray-profiling.a \ + xray.a +RT_LIBS_aarch64= liborc_rt.a + +RT_ARCHES+=i386 +LIBCLANG_RT_LIBS_i386= \ + asan.a \ + asan.so \ + asan-preinit.a \ + asan_static.a \ + asan_cxx.a \ + builtins.a \ + cfi.a \ + cfi_diag.a \ + profile.a \ + safestack.a \ + stats.a \ + stats_client.a \ + ubsan_minimal.a \ + ubsan_minimal.so \ + ubsan_standalone.a \ + ubsan_standalone.so \ + ubsan_standalone_cxx.a + +RT_ARCHES+=powerpc +LIBCLANG_RT_LIBS_powerpc= \ + builtins.a \ + profile.a + +RT_ARCHES+=powerpc64 +LIBCLANG_RT_LIBS_powerpc64= \ + asan.a \ + asan.a.syms \ + asan.so \ + asan-preinit.a \ + asan_cxx.a \ + asan_cxx.a.syms \ + asan_static.a \ + builtins.a \ + msan.a \ + msan.a.syms \ + msan_cxx.a \ + msan_cxx.a.syms \ + profile.a \ + stats.a \ + stats_client.a \ + tsan.a \ + tsan.a.syms \ + tsan.so \ + tsan_cxx.a \ + tsan_cxx.a.syms \ + ubsan_minimal.a \ + ubsan_minimal.a.syms \ + ubsan_minimal.so \ + ubsan_standalone.a \ + ubsan_standalone.a.syms \ + ubsan_standalone.so \ + ubsan_standalone_cxx.a \ + ubsan_standalone_cxx.a.syms + +RT_ARCHES+=powerpc64le +LIBCLANG_RT_LIBS_powerpc64le= \ + asan.a \ + asan.a.syms \ + asan.so \ + asan-preinit.a \ + asan_cxx.a \ + asan_cxx.a.syms \ + asan_static.a \ + builtins.a \ + msan.a \ + msan.a.syms \ + msan_cxx.a \ + msan_cxx.a.syms \ + profile.a \ + stats.a \ + stats_client.a \ + tsan.a \ + tsan.a.syms \ + tsan.so \ + tsan_cxx.a \ + tsan_cxx.a.syms \ + ubsan_minimal.a \ + ubsan_minimal.a.syms \ + ubsan_minimal.so \ + ubsan_standalone.a \ + ubsan_standalone.a.syms \ + ubsan_standalone.so \ + ubsan_standalone_cxx.a \ + ubsan_standalone_cxx.a.syms \ + xray-basic.a \ + xray-fdr.a \ + xray.a \ + xray-profiling.a + +RT_ARCHES+=riscv64 +LIBCLANG_RT_LIBS_riscv64= \ + asan-preinit.a \ + asan.a \ + asan.a.syms \ + asan.so \ + asan_cxx.a \ + asan_cxx.a.syms \ + asan_static.a \ + builtins.a \ + profile.a \ + stats.a \ + stats_client.a \ + ubsan_minimal.a \ + ubsan_minimal.a.syms \ + ubsan_minimal.so \ + ubsan_standalone.a \ + ubsan_standalone.a.syms \ + ubsan_standalone.so \ + ubsan_standalone_cxx.a \ + ubsan_standalone_cxx.a.syms + +RT_ARCHES+=x86_64 +LIBCLANG_RT_LIBS_x86_64= \ + asan-preinit.a \ + asan_static.a \ + asan.a \ + asan.a.syms \ + asan.so \ + asan_cxx.a \ + asan_cxx.a.syms \ + builtins.a \ + cfi.a \ + cfi_diag.a \ + dd.a \ + dyndd.so \ + fuzzer.a \ + fuzzer_interceptors.a \ + fuzzer_no_main.a \ + msan.a \ + msan.a.syms \ + msan_cxx.a \ + msan_cxx.a.syms \ + xray-basic.a \ + xray-fdr.a \ + xray-profiling.a \ + xray.a \ + profile.a \ + safestack.a \ + stats.a \ + stats_client.a \ + tsan.a \ + tsan.a.syms \ + tsan.so \ + tsan_cxx.a \ + tsan_cxx.a.syms \ + ubsan_minimal.a \ + ubsan_minimal.a.syms \ + ubsan_minimal.so \ + ubsan_standalone.a \ + ubsan_standalone.a.syms \ + ubsan_standalone.so \ + ubsan_standalone_cxx.a \ + ubsan_standalone_cxx.a.syms +RT_LIBS_x86_64= liborc_rt.a + +.for CRT_ARCH in ${RT_ARCHES} +COMPILER_RT_LIBS_${CRT_ARCH}:=${LIBCLANG_RT_LIBS_${CRT_ARCH}:S|^|libclang_rt.|} +.ifdef RT_LIBS_${CRT_ARCH} +COMPILER_RT_LIBS_${CRT_ARCH}:= ${COMPILER_RT_LIBS_${CRT_ARCH}} ${RT_LIBS_${CRT_ARCH}} +.endif +.endfor + diff --git a/devel/llvm16/distinfo b/devel/llvm16/distinfo index f6a85a9bc945..f64b41a04928 100644 --- a/devel/llvm16/distinfo +++ b/devel/llvm16/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1673554510 -SHA256 (llvm-project-15.0.7.src.tar.xz) = 8b5fcb24b4128cf04df1b0b9410ce8b1a729cb3c544e6da885d234280dedeac6 -SIZE (llvm-project-15.0.7.src.tar.xz) = 110936452 +TIMESTAMP = 1675097540 +SHA256 (llvm-project-16.0.0rc1.src.tar.xz) = 8399db003b223ce33e3d7a5ee9df8dc3574cedffa5d9be4783660643f8402900 +SIZE (llvm-project-16.0.0rc1.src.tar.xz) = 118364920 diff --git a/devel/llvm16/files/patch-clang_tools_clang-format_git-clang-format b/devel/llvm16/files/patch-clang_tools_clang-format_git-clang-format index b48a644a1775..e4a4f0d4544e 100644 --- a/devel/llvm16/files/patch-clang_tools_clang-format_git-clang-format +++ b/devel/llvm16/files/patch-clang_tools_clang-format_git-clang-format @@ -1,6 +1,6 @@ --- clang/tools/clang-format/git-clang-format.orig +++ clang/tools/clang-format/git-clang-format -@@ -90,7 +90,7 @@ +@@ -104,7 +104,7 @@ usage=usage, formatter_class=argparse.RawDescriptionHelpFormatter, description=desc) p.add_argument('--binary', @@ -9,7 +9,7 @@ help='path to clang-format'), p.add_argument('--commit', default=config.get('clangformat.commit', 'HEAD'), -@@ -344,7 +344,7 @@ +@@ -412,7 +412,7 @@ def run_clang_format_and_save_to_tree(changed_lines, revision=None, @@ -18,12 +18,12 @@ """Run clang-format on each file and save the result to a git tree. Returns the object ID (SHA-1) of the created tree.""" -@@ -397,7 +397,7 @@ +@@ -473,7 +473,7 @@ def clang_format_to_blob(filename, line_ranges, revision=None, -- binary='clang-format', style=None): -+ binary='clang-format%%LLVM_SUFFIX%%', style=None): +- binary='clang-format', style=None, env=None): ++ binary='clang-format%%LLVM_SUFFIX%%', style=None, env=None): """Run clang-format on the given file and save the result to a git blob. Runs on the file in `revision` if not None, or on the file in the working diff --git a/devel/llvm16/files/patch-openmp_libomptarget_plugins-nextgen_amdgpu_CMakeLists.txt b/devel/llvm16/files/patch-openmp_libomptarget_plugins-nextgen_amdgpu_CMakeLists.txt new file mode 100644 index 000000000000..5b65cfa95fd8 --- /dev/null +++ b/devel/llvm16/files/patch-openmp_libomptarget_plugins-nextgen_amdgpu_CMakeLists.txt @@ -0,0 +1,11 @@ +--- openmp/libomptarget/plugins-nextgen/amdgpu/CMakeLists.txt.orig ++++ openmp/libomptarget/plugins-nextgen/amdgpu/CMakeLists.txt +@@ -90,7 +90,7 @@ + + NO_INSTALL_RPATH + ) +-add_dependencies(omptarget.rtl.amdgpu.nextgen omptarget.devicertl.amdgpu) ++#add_dependencies(omptarget.rtl.amdgpu.nextgen omptarget.devicertl.amdgpu) + + target_include_directories( + omptarget.rtl.amdgpu.nextgen diff --git a/devel/llvm16/files/patch-openmp_libomptarget_plugins_amdgpu_impl_internal.h b/devel/llvm16/files/patch-openmp_libomptarget_plugins_amdgpu_impl_internal.h deleted file mode 100644 index 8b745c18d5a5..000000000000 --- a/devel/llvm16/files/patch-openmp_libomptarget_plugins_amdgpu_impl_internal.h +++ /dev/null @@ -1,10 +0,0 @@ ---- openmp/libomptarget/plugins/amdgpu/impl/internal.h.orig -+++ openmp/libomptarget/plugins/amdgpu/impl/internal.h -@@ -42,7 +42,6 @@ - unsigned long unused1; - unsigned long unused2; - } impl_implicit_args_t; --static_assert(sizeof(impl_implicit_args_t) == 56, ""); - - // ---------------------- Kernel Start ------------- - typedef struct atl_kernel_info_s { diff --git a/devel/llvm16/pkg-plist b/devel/llvm16/pkg-plist index 6632bb4aad85..0f3a0ad7e2ed 100644 --- a/devel/llvm16/pkg-plist +++ b/devel/llvm16/pkg-plist @@ -15,6 +15,7 @@ bin/llvm-config%%LLVM_SUFFIX%% bin/llvm-cov%%LLVM_SUFFIX%% bin/llvm-cvtres%%LLVM_SUFFIX%% bin/llvm-cxxmap%%LLVM_SUFFIX%% +%%CLANG%%bin/llvm-debuginfo-analyzer%%LLVM_SUFFIX%% bin/llvm-debuginfod%%LLVM_SUFFIX%% bin/llvm-debuginfod-find%%LLVM_SUFFIX%% bin/llvm-diff%%LLVM_SUFFIX%% @@ -33,7 +34,6 @@ bin/llvm-libtool-darwin%%LLVM_SUFFIX%% bin/llvm-link%%LLVM_SUFFIX%% bin/llvm-lipo%%LLVM_SUFFIX%% bin/llvm-mc%%LLVM_SUFFIX%% -bin/llvm-mca%%LLVM_SUFFIX%% bin/llvm-ml%%LLVM_SUFFIX%% bin/llvm-modextract%%LLVM_SUFFIX%% bin/llvm-mt%%LLVM_SUFFIX%% @@ -51,6 +51,7 @@ bin/llvm-readelf%%LLVM_SUFFIX%% bin/llvm-readobj%%LLVM_SUFFIX%% bin/llvm-reduce%%LLVM_SUFFIX%% bin/llvm-remark-size-diff%%LLVM_SUFFIX%% +bin/llvm-remarkutil%%LLVM_SUFFIX%% bin/llvm-rtdyld%%LLVM_SUFFIX%% bin/llvm-sim%%LLVM_SUFFIX%% bin/llvm-size%%LLVM_SUFFIX%% @@ -67,7 +68,7 @@ bin/llvm-windres%%LLVM_SUFFIX%% bin/llvm-xray%%LLVM_SUFFIX%% bin/opt%%LLVM_SUFFIX%% bin/sancov%%LLVM_SUFFIX%% -bin/split-file%%LLVM_SUFFIX%% +%%CLANG%%bin/amdgpu-arch%%LLVM_SUFFIX%% %%CLANG%%bin/analyze-build%%LLVM_SUFFIX%% %%CLANG%%bin/c-index-test%%LLVM_SUFFIX%% %%CLANG%%bin/clang%%LLVM_SUFFIX%% @@ -77,16 +78,15 @@ bin/split-file%%LLVM_SUFFIX%% %%CLANG%%bin/clang-extdef-mapping%%LLVM_SUFFIX%% %%CLANG%%bin/clang-format%%LLVM_SUFFIX%% %%CLANG%%bin/clang-linker-wrapper%%LLVM_SUFFIX%% -%%CLANG%%bin/clang-nvlink-wrapper%%LLVM_SUFFIX%% %%CLANG%%bin/clang-offload-bundler%%LLVM_SUFFIX%% %%CLANG%%bin/clang-offload-packager%%LLVM_SUFFIX%% -%%CLANG%%bin/clang-offload-wrapper%%LLVM_SUFFIX%% -%%CLANG%%bin/clang-rename%%LLVM_SUFFIX%% %%CLANG%%bin/clang-repl%%LLVM_SUFFIX%% %%CLANG%%bin/clang-scan-deps%%LLVM_SUFFIX%% +%%CLANG%%bin/clang-tblgen%%LLVM_SUFFIX%% %%CLANG%%bin/diagtool%%LLVM_SUFFIX%% %%CLANG%%bin/hmaptool%%LLVM_SUFFIX%% %%CLANG%%bin/intercept-build%%LLVM_SUFFIX%% +%%CLANG%%bin/nvptx-arch%%LLVM_SUFFIX%% %%CLANG%%bin/scan-build%%LLVM_SUFFIX%% %%CLANG%%bin/scan-build-py%%LLVM_SUFFIX%% %%CLANG%%bin/scan-view%%LLVM_SUFFIX%% @@ -94,16 +94,17 @@ bin/split-file%%LLVM_SUFFIX%% %%EXTRAS%%bin/clang-apply-replacements%%LLVM_SUFFIX%% %%EXTRAS%%bin/clang-change-namespace%%LLVM_SUFFIX%% %%EXTRAS%%bin/clang-doc%%LLVM_SUFFIX%% +%%EXTRAS%%bin/clang-include-cleaner%%LLVM_SUFFIX%% %%EXTRAS%%bin/clang-include-fixer%%LLVM_SUFFIX%% %%EXTRAS%%bin/clang-move%%LLVM_SUFFIX%% %%EXTRAS%%bin/clang-pseudo%%LLVM_SUFFIX%% %%EXTRAS%%bin/clang-query%%LLVM_SUFFIX%% +%%EXTRAS%%bin/clang-rename%%LLVM_SUFFIX%% %%EXTRAS%%bin/clang-reorder-fields%%LLVM_SUFFIX%% %%EXTRAS%%bin/clang-tidy%%LLVM_SUFFIX%% %%EXTRAS%%bin/find-all-symbols%%LLVM_SUFFIX%% %%EXTRAS%%bin/modularize%%LLVM_SUFFIX%% %%EXTRAS%%bin/pp-trace%%LLVM_SUFFIX%% -%%EXTRAS%%bin/run-clang-tidy%%LLVM_SUFFIX%% %%FLANG%%bin/bbc%%LLVM_SUFFIX%% %%FLANG%%bin/f18-parse-demo%%LLVM_SUFFIX%% %%FLANG%%bin/fir-opt%%LLVM_SUFFIX%% @@ -122,15 +123,16 @@ bin/split-file%%LLVM_SUFFIX%% %%LLDB%%bin/lldb-server%%LLVM_SUFFIX%% %%LLDB%%bin/lldb-vscode%%LLVM_SUFFIX%% %%MLIR%%bin/mlir-cpu-runner%%LLVM_SUFFIX%% -%%MLIR%%bin/mlir-linalg-ods-yaml-gen%%LLVM_SUFFIX%% %%MLIR%%bin/mlir-lsp-server%%LLVM_SUFFIX%% %%MLIR%%bin/mlir-opt%%LLVM_SUFFIX%% +%%MLIR%%bin/mlir-pdll%%LLVM_SUFFIX%% %%MLIR%%bin/mlir-pdll-lsp-server%%LLVM_SUFFIX%% %%MLIR%%bin/mlir-reduce%%LLVM_SUFFIX%% %%MLIR%%bin/mlir-tblgen%%LLVM_SUFFIX%% %%MLIR%%bin/mlir-translate%%LLVM_SUFFIX%% %%MLIR%%bin/tblgen-lsp-server%%LLVM_SUFFIX%% %%OPENMP%%bin/llvm-omp-device-info%%LLVM_SUFFIX%% +%%OPENMP%%bin/llvm-omp-kernel-replay%%LLVM_SUFFIX%% %%LIT%%bin/FileCheck%%LLVM_SUFFIX%% %%LIT%%llvm%%LLVM_SUFFIX%%/bin/FileCheck %%LIT%%bin/lit%%LLVM_SUFFIX%% *** 2153 LINES SKIPPED ***