Import LLVM r73340.

4 files changed, 8 insertions, 8 deletions

diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake
index a21ed20..e525674 100755
--- a/cmake/modules/AddLLVM.cmake
+++ b/cmake/modules/AddLLVM.cmake
@@ -10,8 +10,8 @@ macro(add_llvm_library name)
     add_dependencies( ${name} ${LLVM_COMMON_DEPENDS} )
   endif( LLVM_COMMON_DEPENDS )
   install(TARGETS ${name}
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
+    LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
+    ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
 endmacro(add_llvm_library name)
 
 
diff --git a/cmake/modules/AddPartiallyLinkedObject.cmake b/cmake/modules/AddPartiallyLinkedObject.cmake
index d20666d..0f92455 100755
--- a/cmake/modules/AddPartiallyLinkedObject.cmake
+++ b/cmake/modules/AddPartiallyLinkedObject.cmake
@@ -38,5 +38,5 @@ macro(add_partially_linked_object lib)
     set( llvm_lib_targets ${llvm_lib_targets} ${tnplo} PARENT_SCOPE )
   endif( )
   install(FILES ${pll}
-    DESTINATION lib)
+    DESTINATION lib${LLVM_LIBDIR_SUFFIX})
 endmacro(add_partially_linked_object lib)
diff --git a/cmake/modules/CrossCompileLLVM.cmake b/cmake/modules/CrossCompileLLVM.cmake
index f638d67..138ff0e 100644
--- a/cmake/modules/CrossCompileLLVM.cmake
+++ b/cmake/modules/CrossCompileLLVM.cmake
@@ -1,7 +1,7 @@
 

 if( ${LLVM_TABLEGEN} STREQUAL "tblgen" )

   set(CX_NATIVE_TG_DIR "${CMAKE_BINARY_DIR}/native")

-  set(LLVM_TABLEGEN "${CX_NATIVE_TG_DIR}/bin/tblgen")

+  set(LLVM_TABLEGEN_EXE "${CX_NATIVE_TG_DIR}/bin/tblgen")

 

   add_custom_command(OUTPUT ${CX_NATIVE_TG_DIR}

     COMMAND ${CMAKE_COMMAND} -E make_directory ${CX_NATIVE_TG_DIR}

@@ -13,12 +13,12 @@ if( ${LLVM_TABLEGEN} STREQUAL "tblgen" )
     DEPENDS ${CX_NATIVE_TG_DIR}

     COMMENT "Configuring native TableGen...")

 

-  add_custom_command(OUTPUT ${LLVM_TABLEGEN}

+  add_custom_command(OUTPUT ${LLVM_TABLEGEN_EXE}

     COMMAND ${CMAKE_BUILD_TOOL}

     DEPENDS ${CX_NATIVE_TG_DIR}/CMakeCache.txt

     WORKING_DIRECTORY ${CX_NATIVE_TG_DIR}/utils/TableGen

     COMMENT "Building native TableGen...")

-  add_custom_target(NativeTableGen DEPENDS ${LLVM_TABLEGEN})

+  add_custom_target(NativeTableGen DEPENDS ${LLVM_TABLEGEN_EXE})

 

   add_dependencies(tblgen NativeTableGen)

 

diff --git a/cmake/modules/TableGen.cmake b/cmake/modules/TableGen.cmake
index adb22c7..16c732b 100644
--- a/cmake/modules/TableGen.cmake
+++ b/cmake/modules/TableGen.cmake
@@ -6,11 +6,11 @@ macro(tablegen ofn)
   file(GLOB all_tds "*.td")
 
   add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${ofn}.tmp
-    COMMAND ${LLVM_TABLEGEN} ${ARGN} -I ${CMAKE_CURRENT_SOURCE_DIR}
+    COMMAND ${LLVM_TABLEGEN_EXE} ${ARGN} -I ${CMAKE_CURRENT_SOURCE_DIR}
     -I ${LLVM_MAIN_SRC_DIR}/lib/Target -I ${LLVM_MAIN_INCLUDE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/${LLVM_TARGET_DEFINITIONS} 
     -o ${CMAKE_CURRENT_BINARY_DIR}/${ofn}.tmp
-    DEPENDS ${LLVM_TABLEGEN} ${all_tds}
+    DEPENDS tblgen ${all_tds}
     COMMENT "Building ${ofn}.tmp..."
     )
   add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${ofn}