From nobody Tue Feb 06 21:22:14 2024 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 4TTx5y4VvBz5B0g4; Tue, 6 Feb 2024 21:22:14 +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 4TTx5y2btnz4ZkH; Tue, 6 Feb 2024 21:22:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707254534; 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=l+0iOc2N8l95NiIkpFfTrMh82b6csdOxZOH0Vyfv4x4=; b=EW9aaXhh26NbAxsZ39Htyty4X6PsUy3VCqBpih628SSxSadtGq/OmuIxzeNWyv95Q01HTb p6TTSsmx0LGrRxFozKDhHwD8KCYuQisnpyY9OqVgAq/xaahUCet8SIub++m6WgwL5K2fXl T2owpZZlznhpOAkp/SGoloURmwtC0TQsqcVEksfz7Lo8Ffn/Ua6uAk/0TI6W9REiExYPje p7M4GAQjco5UCqsPCcTvIRAZMj3vEmGwscUKA8XjuMV0vAE6cWwQ12D0Cr0J3JS6DBF9X9 Jxe0F4o7YtBRSVJ83r9BywsuV8IX5TT4Da40dW8xR078NUMWRHXj53Q09omsSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707254534; 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=l+0iOc2N8l95NiIkpFfTrMh82b6csdOxZOH0Vyfv4x4=; b=FLwmITfQZ2FkXwP5bsZNJ+7oAeuRHLroIuklePpj7fj3gWhxgmrohAFgaN6/RseOxVntPB RA9WRFeFG94fpY2UOaYFVoKDcBQJQguXhKkqsGUwmHr5PKXokrN+yB7Ni2xB0UgVtySJBX yPdOZ3GU/mauCqGgk9HJQqcVYPBOAdOop/P8vrp6z9GUENJsyemavEQgF9pxQDAjKd9Fqv EwpgBw6yTNsVBAeFduikA6Vh8aC4VhVhvrR27A5NCBMCIv8hCxaO359P9b80Ee2AlN25XR 4h3aChOsWSEAecH2fJ/TSLOtsSQtJ3LzOyhF8s93aMQuItp36lUArL7ixX32QQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707254534; a=rsa-sha256; cv=none; b=Nchs/v4ibF3NCNhFapVxLJGEn3gqXTt7HFDWHXCFnqVy2rzHPIKEkWVSt7RDN1GsP8nJdJ E6M6miCcndBZWH17WSmx26ylr12TrB5eWFbA3sYK754zTCXNTlNdzdTPxOTLSIgjvMkhwY GIa38RRarApjKw+qGvS+A0jLUD6zh9DxC/Q91wBB6/8YOhqDLa7wwe9f+eRxIBZudq33Tw DdlRm2ptoAAM6hhE//CWETrxEpPF7HCT24kET9+07kmBkM3KvlPv8FRl8ROBbvg5lgk8sc S4nos7xPqoR9QpAdfZxJF8zqY4HilVG4+ixMxfSi00UrVqS51XLNuf6y0vlqBQ== 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 4TTx5y1gQkzgDf; Tue, 6 Feb 2024 21:22:14 +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 416LMEq2069860; Tue, 6 Feb 2024 21:22:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 416LMExk069857; Tue, 6 Feb 2024 21:22:14 GMT (envelope-from git) Date: Tue, 6 Feb 2024 21:22:14 GMT Message-Id: <202402062122.416LMExk069857@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: cf92377ad51e - main - devel/llvm18: fix plist issues with BE_NATIVE 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: cf92377ad51eb7e0dbe805e34f5089f7eec89044 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=cf92377ad51eb7e0dbe805e34f5089f7eec89044 commit cf92377ad51eb7e0dbe805e34f5089f7eec89044 Author: Brooks Davis AuthorDate: 2024-02-06 21:15:54 +0000 Commit: Brooks Davis CommitDate: 2024-02-06 21:21:31 +0000 devel/llvm18: fix plist issues with BE_NATIVE Several flang modules depend on the PPC backend. Add a couple more arm headers that depend on the Arm or AArch64 backends. Reported by: Mark Millard --- devel/llvm18/Makefile | 17 ++++++++++++++--- devel/llvm18/pkg-plist | 6 ------ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/devel/llvm18/Makefile b/devel/llvm18/Makefile index 26fc3333336c..8610ea015fc2 100644 --- a/devel/llvm18/Makefile +++ b/devel/llvm18/Makefile @@ -380,7 +380,8 @@ _BE_INCS_AArch64= arm_bf16.h _BE_LIBS_AArch64= AsmParser Disassembler Utils _BE_LIBS_BACKWARDS_AArch64=Exegesis _BE_LIBS_AMDGPU= AsmParser Disassembler TargetMCA Utils -_BE_INCS_ARM= arm_cde.h arm_fp16.h arm_mve.h arm_neon.h arm_sve.h +_BE_INCS_ARM= arm_cde.h arm_fp16.h arm_mve.h arm_neon.h arm_sme.h \ + arm_sve.h arm_vector_types.h _BE_LIBS_ARM= AsmParser Disassembler Utils _BE_LIBS_AVR= AsmParser Disassembler _BE_LIBS_BPF= AsmParser Disassembler @@ -392,6 +393,8 @@ _BE_LIBS_Mips= AsmParser Disassembler _BE_LIBS_BACKWARDS_Mips=Exegesis _BE_LIBS_PowerPC= AsmParser Disassembler _BE_LIBS_BACKWARDS_PowerPC=Exegesis +_BE_MODS_PowerPC= __ppc_intrinsics.f18.mod __ppc_intrinsics.mod \ + mma.f18.mod mma.mod _BE_INCS_RISCV= riscv_vector.h _BE_LIBS_RISCV= AsmParser Disassembler TargetMCA _BE_LIBS_Sparc= AsmParser Disassembler @@ -407,9 +410,17 @@ _BE_LIBS_${BE}+= ${_BE_LIBS_COMMON:S/^/${BE_ARCH}/} \ ${_BE_LIBS_${BE_ARCH}:S/^/${BE_ARCH}/} \ ${_BE_LIBS_BACKWARDS_${BE_ARCH}:S/$/${BE_ARCH}/} _BE_INCS_${BE}+= ${_BE_INCS_${BE_ARCH}} +_BE_MODS_${BE}+= ${_BE_MODS_${BE_ARCH}} .endfor .endfor -BE_PATTERN=LLVM(${_BE_LIBS_STANDARD:O:S/$/.a/:ts|})|${_BE_INCS_STANDARD:ts|} +BE_PATTERN=LLVM(${_BE_LIBS_STANDARD:O:S/$/.a/:ts|})|${_BE_INCS_STANDARD:ts|}|${_BE_MODS_STANDARD:ts|} + +.if ${PORT_OPTIONS:MFLANG} +.for BE in FREEBSD NATIVE STANDARD +BE_${BE}_PLIST_FILES+= \ + ${_BE_MODS_${BE}:S|^|${LLVM_DIR}/include/flang/|:N${LLVM_DIR}/include/flang/$} +.endfor +.endif .if ${ARCH} == "aarch64" COMPILER_RT_ARCHS= aarch64 @@ -627,7 +638,7 @@ build-plist: if ($$0 ~ /${COMPILER_RT_PATTERN}/) \ {printf "%%%%COMPILER_RT%%%%"} \ if ($$0 ~ /(${EXTRAS_PATTERN})/) {printf "%%%%EXTRAS%%%%"} \ - if ($$0 ~ /(${FLANG_PATTERN})/) {printf "%%%%FLANG%%%%"} \ + if ($$0 ~ /(${FLANG_PATTERN})/ && $$0 !~ /${BE_PATTERN}$$/) {printf "%%%%FLANG%%%%"} \ if ($$0 ~ /(bin\/(ld|lld|wasm-ld))|liblld[^b]|\/lld\// && $$0 !~ /(lldb)/) {printf "%%%%LLD%%%%"} \ if ($$0 ~ /(argdumper|lldb|six.py)/) {printf "%%%%LLDB%%%%"} \ if ($$0 ~ /(${MLIR_PATTERN})/) {printf "%%%%MLIR%%%%"} \ diff --git a/devel/llvm18/pkg-plist b/devel/llvm18/pkg-plist index 887f92d1e1ee..3fb4d415b780 100644 --- a/devel/llvm18/pkg-plist +++ b/devel/llvm18/pkg-plist @@ -1752,8 +1752,6 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder %%FLANG%%llvm%%LLVM_SUFFIX%%/include/flang/__fortran_ieee_exceptions.mod %%FLANG%%llvm%%LLVM_SUFFIX%%/include/flang/__fortran_type_info.f18.mod %%FLANG%%llvm%%LLVM_SUFFIX%%/include/flang/__fortran_type_info.mod -%%FLANG%%llvm%%LLVM_SUFFIX%%/include/flang/__ppc_intrinsics.f18.mod -%%FLANG%%llvm%%LLVM_SUFFIX%%/include/flang/__ppc_intrinsics.mod %%FLANG%%llvm%%LLVM_SUFFIX%%/include/flang/__ppc_types.f18.mod %%FLANG%%llvm%%LLVM_SUFFIX%%/include/flang/__ppc_types.mod %%FLANG%%llvm%%LLVM_SUFFIX%%/include/flang/ieee_arithmetic.f18.mod @@ -1766,8 +1764,6 @@ llvm%%LLVM_SUFFIX%%/bin/verify-uselistorder %%FLANG%%llvm%%LLVM_SUFFIX%%/include/flang/iso_c_binding.mod %%FLANG%%llvm%%LLVM_SUFFIX%%/include/flang/iso_fortran_env.f18.mod %%FLANG%%llvm%%LLVM_SUFFIX%%/include/flang/iso_fortran_env.mod -%%FLANG%%llvm%%LLVM_SUFFIX%%/include/flang/mma.f18.mod -%%FLANG%%llvm%%LLVM_SUFFIX%%/include/flang/mma.mod %%FLANG%%llvm%%LLVM_SUFFIX%%/include/flang/omp_lib.f18.mod %%FLANG%%llvm%%LLVM_SUFFIX%%/include/flang/omp_lib.mod %%LLD%%llvm%%LLVM_SUFFIX%%/include/lld/Common/Args.h @@ -5934,8 +5930,6 @@ llvm%%LLVM_SUFFIX%%/include/llvm/XRay/YAMLXRayRecord.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/arm_acle.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/arm_cmse.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/arm_neon_sve_bridge.h -%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/arm_sme.h -%%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/arm_vector_types.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/armintr.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/avx2intrin.h %%CLANG%%llvm%%LLVM_SUFFIX%%/lib/clang/%%LLVM_MAJOR%%/include/avx512bf16intrin.h