4 files changed, 16 insertions, 5 deletions
diff --git a/test/LTO/cfi_endproc.ll b/test/LTO/cfi_endproc.ll
index 0a47b0225e..ecb0ed506e 100644
--- a/test/LTO/cfi_endproc.ll
+++ b/test/LTO/cfi_endproc.ll
@@ -17,4 +17,3 @@ define i32 @main(i32 %argc, i8** %argv) {
   call void @PR14512()
   ret i32 0
 }
-; XFAIL: win32
diff --git a/test/LTO/lit.local.cfg b/test/LTO/lit.local.cfg
index f61943a77a..7a70736aea 100644
--- a/test/LTO/lit.local.cfg
+++ b/test/LTO/lit.local.cfg
@@ -2,5 +2,5 @@ targets = set(config.root.targets_to_build.split())
 if not 'X86' in targets:
   config.unsupported = True
 
-if config.root.host_os in ['Cygwin', 'MingW', 'Windows']:
+if config.root.host_os in ['Cygwin']:
   config.unsupported = True
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 468d396b59..d8001e75a7 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -43,7 +43,7 @@ add_llvm_tool_subdirectory(llvm-symbolizer)
 add_llvm_tool_subdirectory(obj2yaml)
 add_llvm_tool_subdirectory(yaml2obj)
 
-if( NOT WIN32 )
+if( NOT CYGWIN )
   add_llvm_tool_subdirectory(lto)
   add_llvm_tool_subdirectory(llvm-lto)
 else()
diff --git a/tools/lto/CMakeLists.txt b/tools/lto/CMakeLists.txt
index 8b26ddd57e..5e5d8adecf 100644
--- a/tools/lto/CMakeLists.txt
+++ b/tools/lto/CMakeLists.txt
@@ -9,7 +9,19 @@ set(SOURCES
   lto.cpp
   )
 
-if( NOT WIN32 AND LLVM_ENABLE_PIC )
+if( NOT CYGWIN AND LLVM_ENABLE_PIC )
+  if ( WIN32 )
+    # Create .def file containing a list of exports preceeded by
+    # 'EXPORTS'.  The file "lto.exports" already contains the list, so we
+    # massage it into the correct format here to create "lto.exports.def".
+    set(LTO_EXPORTS_DEF ${CMAKE_CURRENT_BINARY_DIR}/lto.exports.def)
+    file(READ "lto.exports" exports_list)
+    file(WRITE ${LTO_EXPORTS_DEF} "LIBRARY LTO\n")
+    file(APPEND ${LTO_EXPORTS_DEF} "EXPORTS\n")
+    file(APPEND ${LTO_EXPORTS_DEF} ${exports_list})
+    set(SOURCES ${SOURCES} ${LTO_EXPORTS_DEF})
+  endif()
+
   set(bsl ${BUILD_SHARED_LIBS})
   set(BUILD_SHARED_LIBS ON)
   add_llvm_library(LTO ${SOURCES})
@@ -25,7 +37,7 @@ if( NOT BUILD_SHARED_LIBS )
   set_property(TARGET ${LTO_STATIC_TARGET_NAME} PROPERTY OUTPUT_NAME "LTO")
 endif()
 
-if( NOT WIN32 )
+if( NOT CYGWIN )
   install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h
           DESTINATION include/llvm-c)
 endif()