Update to LLVM 3.5a.

Change-Id: Ifadecab779f128e62e430c2b4f6ddd84953ed617

1 files changed, 12 insertions, 37 deletions

diff --git a/tools/lto/CMakeLists.txt b/tools/lto/CMakeLists.txt
index 957a9f0..542053b 100644
--- a/tools/lto/CMakeLists.txt
+++ b/tools/lto/CMakeLists.txt
@@ -1,6 +1,11 @@
 set(LLVM_LINK_COMPONENTS
   ${LLVM_TARGETS_TO_BUILD}
-  ipo scalaropts linker bitreader bitwriter lto mcdisassembler vectorize)
+  Core
+  LTO
+  MC
+  MCDisassembler
+  Support
+  )
 
 add_definitions( -DLLVM_VERSION_INFO=\"${PACKAGE_VERSION}\" )
 
@@ -9,43 +14,13 @@ 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)
-    set(LTO_EXPORTS_DEF_TEMP ${LTO_EXPORTS_DEF}.txt)
-    file(READ "lto.exports" exports_list)
-    file(WRITE ${LTO_EXPORTS_DEF_TEMP} "LIBRARY LTO\n")
-    file(APPEND ${LTO_EXPORTS_DEF_TEMP} "EXPORTS\n")
-    file(APPEND ${LTO_EXPORTS_DEF_TEMP} ${exports_list})
-
-    # Copy the file only if it has changed.
-    execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
-      ${LTO_EXPORTS_DEF_TEMP} ${LTO_EXPORTS_DEF})
-
-    set(SHARED_LIB_SOURCES ${SOURCES} ${LTO_EXPORTS_DEF})
-  else()
-    set(SHARED_LIB_SOURCES ${SOURCES})
-  endif()
+set(LLVM_EXPORTED_SYMBOL_FILE ${CMAKE_CURRENT_SOURCE_DIR}/lto.exports)
 
-  set(bsl ${BUILD_SHARED_LIBS})
-  set(BUILD_SHARED_LIBS ON)
-  add_llvm_library(LTO ${SHARED_LIB_SOURCES})
-  set_property(TARGET LTO PROPERTY OUTPUT_NAME "LTO")
-  set(BUILD_SHARED_LIBS ${bsl})
-  set(LTO_STATIC_TARGET_NAME LTO_static)
-else()
-  set(LTO_STATIC_TARGET_NAME LTO)
+if(NOT CYGWIN AND LLVM_ENABLE_PIC)
+  set(ENABLE_SHARED SHARED)
 endif()
 
-if( NOT BUILD_SHARED_LIBS )
-  add_llvm_library(${LTO_STATIC_TARGET_NAME} ${SOURCES})
-  set_property(TARGET ${LTO_STATIC_TARGET_NAME} PROPERTY OUTPUT_NAME "LTO")
-endif()
+add_llvm_library(LTO ${ENABLE_SHARED} STATIC ${SOURCES})
 
-if( NOT CYGWIN )
-  install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h
-          DESTINATION include/llvm-c)
-endif()
+install(FILES ${LLVM_MAIN_INCLUDE_DIR}/llvm-c/lto.h
+  DESTINATION include/llvm-c)