[modules] Work around mislayering of MC / Object.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@214000 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/llvm/module.modulemap b/include/llvm/module.modulemap
index 1790a7242e5b1e7501327325e835f8f183d91ab0..eb9a698a3390097288621921dcfe3c1ac3436230 100644 (file)
--- a/include/llvm/module.modulemap
+++ b/include/llvm/module.modulemap
@@ -108,11 +108,21 @@ module LLVM_MC {
   umbrella "MC"
   module * { export * }
 
+  // FIXME: Excluded due to mislayering.
+  exclude header "MC/MCObjectSymbolizer.h"
+
   // Exclude this; it's fundamentally non-modular.
   exclude header "MC/MCTargetOptionsCommandFlags.h"
 }
 
-module LLVM_Object { requires cplusplus umbrella "Object" module * { export * } }
+module LLVM_Object {
+  requires cplusplus
+  umbrella "Object"
+  module * { export * }
+
+  module LLVM_MC_MCObjectSymbolizer { header "MC/MCObjectSymbolizer.h" export * }
+}
+
 module LLVM_Option { requires cplusplus umbrella "Option" module * { export * } }
 module LLVM_TableGen { requires cplusplus umbrella "TableGen" module * { export * } }