From: robert Date: Sun, 12 Nov 2023 14:25:40 +0000 (+0000) Subject: TargetMCAs.def is required to be installed in the llvm include dir X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=50fda6485d355561d4fba13b2d48964fb0d78afd;p=openbsd TargetMCAs.def is required to be installed in the llvm include dir so instead of shipping the file internally, let's generate it and install it with the rest of the headers; unbreaks xenocara build --- diff --git a/gnu/usr.bin/clang/include/llvm/Config/Makefile b/gnu/usr.bin/clang/include/llvm/Config/Makefile index da2fe2cf59b..ed56a0c60af 100644 --- a/gnu/usr.bin/clang/include/llvm/Config/Makefile +++ b/gnu/usr.bin/clang/include/llvm/Config/Makefile @@ -1,11 +1,12 @@ -# $OpenBSD: Makefile,v 1.7 2019/12/06 09:22:24 jsg Exp $ +# $OpenBSD: Makefile,v 1.8 2023/11/12 14:25:40 robert Exp $ .include .include "../../../Makefile.arch" .include "../../../Makefile.inc" -DEFS= AsmParsers.def AsmPrinters.def Disassemblers.def Targets.def llvm-config.h +DEFS= AsmParsers.def AsmPrinters.def Disassemblers.def Targets.def \ + TargetMCAs.def llvm-config.h HDRS= abi-breaking.h INCDIR= /usr/include/llvm/Config @@ -27,6 +28,10 @@ Disassemblers.def: Targets.def: printf "LLVM_TARGET(AMDGPU)\n" >$@ printf "LLVM_TARGET(${LLVM_ARCH})\n#undef LLVM_TARGET\n" >>$@ +TargetMCAs.def: + printf "LLVM_TARGETMCA(AMDGPU)\n" >$@ + printf "LLVM_TARGETMCA(RISCV)\n" >>$@ + printf "LLVM_TARGETMCA(X86)\n#undef LLVM_TARGETMCA\n" >>$@ llvm-config.h: llvm-config.h.in cp ${.CURDIR}/llvm-config.h.in $@ diff --git a/gnu/usr.bin/clang/include/llvm/Config/TargetMCAs.def b/gnu/usr.bin/clang/include/llvm/Config/TargetMCAs.def deleted file mode 100644 index 1aefdbc2513..00000000000 --- a/gnu/usr.bin/clang/include/llvm/Config/TargetMCAs.def +++ /dev/null @@ -1,32 +0,0 @@ -/*===------ llvm/Config/TargetMCAs.def - LLVM Target MCAs -------*- C++ -*-===*\ -|* *| -|* Part of the LLVM Project, under the Apache License v2.0 with LLVM *| -|* Exceptions. *| -|* See https://llvm.org/LICENSE.txt for license information. *| -|* SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception *| -|* *| -|*===----------------------------------------------------------------------===*| -|* *| -|* This file enumerates all of the target MCAs *| -|* supported by this build of LLVM. Clients of this file should define *| -|* the LLVM_TARGETMCA macro to be a function-like macro with a *| -|* single parameter (the name of the target whose assembly can be *| -|* generated); including this file will then enumerate all of the *| -|* targets with target MCAs. *| -|* *| -|* The set of targets supported by LLVM is generated at configuration *| -|* time, at which point this header is generated. Do not modify this *| -|* header directly. *| -|* *| -\*===----------------------------------------------------------------------===*/ - -#ifndef LLVM_TARGETMCA -# error Please define the macro LLVM_TARGETMCA(TargetName) -#endif - -LLVM_TARGETMCA(AMDGPU) -LLVM_TARGETMCA(RISCV) -LLVM_TARGETMCA(X86) - - -#undef LLVM_TARGETMCA