X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=include%2Fllvm%2Fmodule.modulemap;h=0adce0c9602d952a4aca35321ccb563e2bd8d677;hb=ada56848f5ff516cb5754215b265cd0ef78092b7;hp=533760f7868ad7088935d2be2d4cfcbd54546966;hpb=4f840727e9983ff83d6be140cfdef5a6000e9144;p=oota-llvm.git

diff --git a/include/llvm/module.modulemap b/include/llvm/module.modulemap
index 533760f7868..0adce0c9602 100644
--- a/include/llvm/module.modulemap
+++ b/include/llvm/module.modulemap
@@ -190,10 +190,6 @@ module LLVM_Utils {
     // Exclude this; it's fundamentally non-modular.
     exclude header "Support/PluginLoader.h"
 
-    // Exclude this; it's a weirdly-factored part of llvm-gcov and conflicts
-    // with the Analysis module (which also defines an llvm::GCOVOptions).
-    exclude header "Support/GCOV.h"
-
     // FIXME: Mislayered?
     exclude header "Support/TargetRegistry.h"
 
@@ -202,6 +198,7 @@ module LLVM_Utils {
     textual header "Support/Dwarf.def"
     textual header "Support/ELFRelocs/AArch64.def"
     textual header "Support/ELFRelocs/ARM.def"
+    textual header "Support/ELFRelocs/AVR.def"
     textual header "Support/ELFRelocs/Hexagon.def"
     textual header "Support/ELFRelocs/i386.def"
     textual header "Support/ELFRelocs/Mips.def"
@@ -211,6 +208,12 @@ module LLVM_Utils {
     textual header "Support/ELFRelocs/SystemZ.def"
     textual header "Support/ELFRelocs/x86_64.def"
   }
+
+  // This part of the module is usable from both C and C++ code.
+  module ConvertUTF {
+    header "Support/ConvertUTF.h"
+    export *
+  }
 }
 
 module LLVM_CodeGen_MachineValueType {