vendor/llvm/llvm-trunk-r290819

1 files changed, 16 insertions, 9 deletions

diff --git a/include/llvm/module.modulemap b/include/llvm/module.modulemap
index cc1895011dc33..a86bc7e7fcbf1 100644
--- a/include/llvm/module.modulemap
+++ b/include/llvm/module.modulemap
@@ -18,9 +18,6 @@ module LLVM_Backend {
     umbrella "CodeGen"
     module * { export * }
 
-    // FIXME: Why is this excluded?
-    exclude header "CodeGen/MachineValueType.h"
-
     // Exclude these; they're intended to be included into only a single
     // translation unit (or none) and aren't part of this module.
     exclude header "CodeGen/CommandFlags.h"
@@ -84,6 +81,13 @@ module LLVM_DebugInfo_PDB_DIA {
   module * { export * }
 }
 
+module LLVM_DebugInfo_MSF {
+  requires cplusplus
+
+  umbrella "DebugInfo/MSF"
+  module * { export * }
+}
+
 module LLVM_DebugInfo_CodeView {
   requires cplusplus
 
@@ -109,6 +113,14 @@ module LLVM_ExecutionEngine {
   exclude header "ExecutionEngine/MCJIT.h"
   exclude header "ExecutionEngine/Interpreter.h"
   exclude header "ExecutionEngine/OrcMCJITReplacement.h"
+
+  // FIXME: These exclude directives were added as a workaround for
+  //        <rdar://problem/29247092> and should be removed once it is fixed.
+  exclude header "ExecutionEngine/Orc/RawByteChannel.h"
+  exclude header "ExecutionEngine/Orc/RPCUtils.h"
+  exclude header "ExecutionEngine/Orc/OrcRemoteTargetRPCAPI.h"
+  exclude header "ExecutionEngine/Orc/OrcRemoteTargetClient.h"
+  exclude header "ExecutionEngine/Orc/OrcRemoteTargetServer.h"
 }
 
 module LLVM_Pass {
@@ -218,9 +230,6 @@ module LLVM_Transforms {
   requires cplusplus
   umbrella "Transforms"
   module * { export * }
-
-  // FIXME: Excluded because it does bad things with the legacy pass manager.
-  exclude header "Transforms/IPO/PassManagerBuilder.h"
 }
 
 // A module covering ADT/ and Support/. These are intertwined and
@@ -245,9 +254,6 @@ module LLVM_Utils {
     // Exclude this; it's fundamentally non-modular.
     exclude header "Support/PluginLoader.h"
 
-    // FIXME: Mislayered?
-    exclude header "Support/TargetRegistry.h"
-
     // These are intended for textual inclusion.
     textual header "Support/ARMTargetParser.def"
     textual header "Support/AArch64TargetParser.def"
@@ -264,6 +270,7 @@ module LLVM_Utils {
     textual header "Support/ELFRelocs/Mips.def"
     textual header "Support/ELFRelocs/PowerPC64.def"
     textual header "Support/ELFRelocs/PowerPC.def"
+    textual header "Support/ELFRelocs/RISCV.def"
     textual header "Support/ELFRelocs/Sparc.def"
     textual header "Support/ELFRelocs/SystemZ.def"
     textual header "Support/ELFRelocs/x86_64.def"