From f51d7e4bae9e861e711ad9711599456fc2f1bbca Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere Date: Mon, 14 Mar 2022 09:22:30 -0700 Subject: [PATCH] Fix the implicit module build This fixes the implicit module build after b1b4b6f36695 broke the LLDB build: https://green.lab.llvm.org/green/view/LLDB/job/lldb-cmake/42084/ --- clang/include/clang/Basic/BuiltinsVE.def | 5 +++++ llvm/include/llvm/CodeGen/MachinePipeliner.h | 1 + 2 files changed, 6 insertions(+) diff --git a/clang/include/clang/Basic/BuiltinsVE.def b/clang/include/clang/Basic/BuiltinsVE.def index 1cb5250..29b2bd2 100644 --- a/clang/include/clang/Basic/BuiltinsVE.def +++ b/clang/include/clang/Basic/BuiltinsVE.def @@ -11,7 +11,12 @@ // //===----------------------------------------------------------------------===// +#if defined(BUILTIN) && !defined(TARGET_BUILTIN) +# define TARGET_BUILTIN(ID, TYPE, ATTRS, FEATURE) BUILTIN(ID, TYPE, ATTRS) +#endif + // Use generated BUILTIN definitions #include "clang/Basic/BuiltinsVEVL.gen.def" #undef BUILTIN +#undef TARGET_BUILTIN diff --git a/llvm/include/llvm/CodeGen/MachinePipeliner.h b/llvm/include/llvm/CodeGen/MachinePipeliner.h index 7e7fa57..63024562 100644 --- a/llvm/include/llvm/CodeGen/MachinePipeliner.h +++ b/llvm/include/llvm/CodeGen/MachinePipeliner.h @@ -40,6 +40,7 @@ #ifndef LLVM_CODEGEN_MACHINEPIPELINER_H #define LLVM_CODEGEN_MACHINEPIPELINER_H +#include "llvm/ADT/SetVector.h" #include "llvm/CodeGen/MachineDominators.h" #include "llvm/CodeGen/MachineOptimizationRemarkEmitter.h" #include "llvm/CodeGen/RegisterClassInfo.h" -- 2.7.4