From 4b5205d2a3e0df909f29de0bff8ea775ad21fe0f Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Mon, 30 Sep 2013 16:32:51 +0000 Subject: [PATCH] Revert "Enable building LTO on WIN32." This reverts commit r191670. It was causing build failures on the msvc bots: http://bb.pgr.jp/builders/ninja-clang-i686-msc17-R/builds/5166/steps/compile/logs/stdio git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@191679 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/LTO/cfi_endproc.ll | 1 + test/LTO/lit.local.cfg | 2 +- tools/CMakeLists.txt | 2 +- tools/lto/CMakeLists.txt | 16 ++-------------- 4 files changed, 5 insertions(+), 16 deletions(-) diff --git a/test/LTO/cfi_endproc.ll b/test/LTO/cfi_endproc.ll index ecb0ed506e6..0a47b0225ee 100644 --- a/test/LTO/cfi_endproc.ll +++ b/test/LTO/cfi_endproc.ll @@ -17,3 +17,4 @@ 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 7a70736aeac..f61943a77af 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']: +if config.root.host_os in ['Cygwin', 'MingW', 'Windows']: config.unsupported = True diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index d8001e75a70..468d396b59a 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 CYGWIN ) +if( NOT WIN32 ) 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 5e5d8adecf7..8b26ddd57e8 100644 --- a/tools/lto/CMakeLists.txt +++ b/tools/lto/CMakeLists.txt @@ -9,19 +9,7 @@ set(SOURCES lto.cpp ) -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() - +if( NOT WIN32 AND LLVM_ENABLE_PIC ) set(bsl ${BUILD_SHARED_LIBS}) set(BUILD_SHARED_LIBS ON) add_llvm_library(LTO ${SOURCES}) @@ -37,7 +25,7 @@ if( NOT BUILD_SHARED_LIBS ) set_property(TARGET ${LTO_STATIC_TARGET_NAME} PROPERTY OUTPUT_NAME "LTO") endif() -if( NOT CYGWIN ) +if( NOT WIN32 ) install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h DESTINATION include/llvm-c) endif()