Skip to content

Commit 06ae1ba

Browse files
committed
Fixing issues causing build break when -DLLVM_ENABLE_MODULES=ON
1 parent 850c932 commit 06ae1ba

File tree

9 files changed

+12
-3
lines changed

9 files changed

+12
-3
lines changed

clang/include/clang/Support/Compiler.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
#ifndef CLANG_SUPPORT_COMPILER_H
1515
#define CLANG_SUPPORT_COMPILER_H
1616

17-
#include "llvm/Support/Compiler.h"
18-
1917
/// CLANG_ABI is the main export/visibility macro to mark something as
2018
/// explicitly exported when clang is built as a shared library with everything
2119
/// else that is unannotated having hidden visibility.

clang/include/module.modulemap

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ module Clang_Diagnostics {
115115
module Driver { header "clang/Driver/DriverDiagnostic.h" export * }
116116
module Frontend { header "clang/Frontend/FrontendDiagnostic.h" export * }
117117
module Lex { header "clang/Lex/LexDiagnostic.h" export * }
118-
module Parse { header "clang/Parse/ParseDiagnostic.h" export * }
118+
module Parse { header "clang/Basic/DiagnosticParse.h" export * }
119119
module Serialization { header "clang/Serialization/SerializationDiagnostic.h" export * }
120120
module Refactoring { header "clang/Tooling/Refactoring/RefactoringDiagnostic.h" export * }
121121
}
@@ -186,6 +186,9 @@ module Clang_StaticAnalyzer_Frontend {
186186
module Clang_Testing {
187187
requires cplusplus
188188
umbrella "clang/Testing"
189+
190+
textual header "clang/Testing/TestLanguage.def"
191+
189192
module * { export * }
190193
}
191194

llvm/include/llvm/DebugInfo/DWARF/DWARFTypePrinter.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#ifndef LLVM_DEBUGINFO_DWARF_DWARFTYPEPRINTER_H
1010
#define LLVM_DEBUGINFO_DWARF_DWARFTYPEPRINTER_H
1111

12+
#include "llvm/ADT/StringExtras.h"
1213
#include "llvm/ADT/StringRef.h"
1314
#include "llvm/BinaryFormat/Dwarf.h"
1415
#include "llvm/Support/Error.h"

llvm/include/llvm/IR/NVVMIntrinsicFlags.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
#ifndef LLVM_IR_NVVMINTRINSICFLAGS_H
1616
#define LLVM_IR_NVVMINTRINSICFLAGS_H
1717

18+
#include <stdint.h>
19+
1820
namespace llvm {
1921
namespace nvvm {
2022

llvm/include/llvm/Support/Memory.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
#include "llvm/Support/DataTypes.h"
1717
#include <system_error>
18+
#include <utility>
1819

1920
namespace llvm {
2021

llvm/include/llvm/TargetParser/AArch64TargetParser.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include "llvm/ADT/ArrayRef.h"
1818
#include "llvm/ADT/Bitset.h"
19+
#include "llvm/ADT/StringExtras.h"
1920
#include "llvm/ADT/StringMap.h"
2021
#include "llvm/ADT/StringRef.h"
2122
#include "llvm/Support/VersionTuple.h"

llvm/include/module.modulemap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,7 @@ extern module LLVM_Extern_Utils_DataTypes "module.extern.modulemap"
346346
// TargetParser module before building the TargetParser module itself.
347347
module TargetParserGen {
348348
module AArch64TargetParserDef {
349+
textual header "llvm/TargetParser/AArch64CPUFeatures.inc"
349350
header "llvm/TargetParser/AArch64TargetParser.h"
350351
extern module LLVM_Extern_TargetParser_Gen "module.extern.modulemap"
351352
export *

llvm/tools/llvm-jitlink/llvm-jitlink-executor/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ set(LLVM_LINK_COMPONENTS
22
OrcShared
33
OrcTargetProcess
44
Support
5+
Core
56
)
67

78
add_llvm_utility(llvm-jitlink-executor

llvm/unittests/tools/llvm-profgen/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
set(LLVM_LINK_COMPONENTS
22
Support
3+
Core
34
)
45

56
add_llvm_unittest(LLVMProfgenTests

0 commit comments

Comments
 (0)