Du kan inte välja fler än 25 ämnen Ämnen måste starta med en bokstav eller siffra, kan innehålla bindestreck ('-') och vara max 35 tecken långa.

129 rader
4.7 KiB

  1. diff -rupN llvm-3.3.src/CMakeLists.txt llvm-3.3.src.cotire/CMakeLists.txt
  2. --- llvm-3.3.src/CMakeLists.txt 2013-05-06 18:23:07.000000000 +0200
  3. +++ llvm-3.3.src.cotire/CMakeLists.txt 2013-10-13 10:05:20.000000000 +0200
  4. @@ -1,7 +1,7 @@
  5. # See docs/CMake.html for instructions about how to build LLVM with CMake.
  6. project(LLVM)
  7. -cmake_minimum_required(VERSION 2.8)
  8. +cmake_minimum_required(VERSION 2.8.11)
  9. # Add path for custom modules
  10. set(CMAKE_MODULE_PATH
  11. @@ -21,6 +21,8 @@ if ( LLVM_USE_FOLDERS )
  12. endif()
  13. include(VersionFromVCS)
  14. +include(cotire)
  15. +set_property(DIRECTORY PROPERTY COTIRE_UNITY_LINK_LIBRARIES_INIT "COPY_UNITY")
  16. option(LLVM_APPEND_VC_REV
  17. "Append the version control system revision id to LLVM version" OFF)
  18. @@ -187,7 +189,7 @@ option(LLVM_USE_OPROFILE
  19. # If enabled, verify we are on a platform that supports oprofile.
  20. if( LLVM_USE_OPROFILE )
  21. if( NOT CMAKE_SYSTEM_NAME MATCHES "Linux" )
  22. - message(FATAL_ERROR "OProfile support is available on Linux only.")
  23. + message(FATAL_ERROR "OProfile support is available on Linux only.")
  24. endif( NOT CMAKE_SYSTEM_NAME MATCHES "Linux" )
  25. endif( LLVM_USE_OPROFILE )
  26. diff -rupN llvm-3.3.src/cmake/modules/AddLLVM.cmake llvm-3.3.src.cotire/cmake/modules/AddLLVM.cmake
  27. --- llvm-3.3.src/cmake/modules/AddLLVM.cmake 2013-04-21 11:04:59.000000000 +0200
  28. +++ llvm-3.3.src.cotire/cmake/modules/AddLLVM.cmake 2013-10-13 10:43:04.000000000 +0200
  29. @@ -34,6 +34,10 @@ macro(add_llvm_library name)
  30. # property has been set to an empty value.
  31. get_property(lib_deps GLOBAL PROPERTY LLVMBUILD_LIB_DEPS_${name})
  32. target_link_libraries(${name} ${lib_deps})
  33. +if (COMMAND cotire)
  34. + set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE")
  35. + cotire(${name})
  36. +endif()
  37. endmacro(add_llvm_library name)
  38. macro(add_llvm_loadable_module name)
  39. @@ -69,6 +73,10 @@ ${name} ignored.")
  40. LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX}
  41. ARCHIVE DESTINATION lib${LLVM_LIBDIR_SUFFIX})
  42. endif()
  43. +if (COMMAND cotire)
  44. + set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE")
  45. + cotire(${name})
  46. +endif()
  47. endif()
  48. set_target_properties(${name} PROPERTIES FOLDER "Loadable modules")
  49. @@ -101,6 +109,10 @@ macro(add_llvm_tool name)
  50. install(TARGETS ${name} RUNTIME DESTINATION bin)
  51. endif()
  52. set_target_properties(${name} PROPERTIES FOLDER "Tools")
  53. +if (COMMAND cotire)
  54. + set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE")
  55. + cotire(${name})
  56. +endif()
  57. endmacro(add_llvm_tool name)
  58. @@ -114,12 +126,20 @@ macro(add_llvm_example name)
  59. install(TARGETS ${name} RUNTIME DESTINATION examples)
  60. endif()
  61. set_target_properties(${name} PROPERTIES FOLDER "Examples")
  62. +if (COMMAND cotire)
  63. + set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE")
  64. + cotire(${name})
  65. +endif()
  66. endmacro(add_llvm_example name)
  67. macro(add_llvm_utility name)
  68. add_llvm_executable(${name} ${ARGN})
  69. set_target_properties(${name} PROPERTIES FOLDER "Utils")
  70. +if (COMMAND cotire)
  71. + set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE")
  72. + cotire(${name})
  73. +endif()
  74. endmacro(add_llvm_utility name)
  75. @@ -198,6 +218,10 @@ function(add_unittest test_suite test_na
  76. set(target_compile_flags "${target_compile_flags} -Wno-variadic-macros")
  77. endif ()
  78. set_property(TARGET ${test_name} PROPERTY COMPILE_FLAGS "${target_compile_flags}")
  79. +if (COMMAND cotire)
  80. + set_target_properties(${name} PROPERTIES COTIRE_UNITY_SOURCE_POST_UNDEFS "DEBUG_TYPE")
  81. + cotire(${name})
  82. +endif()
  83. endfunction()
  84. # This function provides an automatic way to 'configure'-like generate a file
  85. diff -rupN llvm-3.3.src/include/llvm/Transforms/Utils/BlackList.h llvm-3.3.src.cotire/include/llvm/Transforms/Utils/BlackList.h
  86. --- llvm-3.3.src/include/llvm/Transforms/Utils/BlackList.h 2013-04-11 15:20:00.000000000 +0200
  87. +++ llvm-3.3.src.cotire/include/llvm/Transforms/Utils/BlackList.h 2013-10-13 11:52:41.000000000 +0200
  88. @@ -30,6 +30,9 @@
  89. //===----------------------------------------------------------------------===//
  90. //
  91. +#ifndef LLVM_TRANSFORMS_UTILS_BLACKLIST_H
  92. +#define LLVM_TRANSFORMS_UTILS_BLACKLIST_H
  93. +
  94. #include "llvm/ADT/StringMap.h"
  95. namespace llvm {
  96. @@ -57,3 +60,5 @@ class BlackList {
  97. };
  98. } // namespace llvm
  99. +
  100. +#endif
  101. diff -rupN llvm-3.3.src/lib/Support/CMakeLists.txt llvm-3.3.src.cotire/lib/Support/CMakeLists.txt
  102. --- llvm-3.3.src/lib/Support/CMakeLists.txt 2013-04-23 10:28:39.000000000 +0200
  103. +++ llvm-3.3.src.cotire/lib/Support/CMakeLists.txt 2013-10-13 10:25:45.000000000 +0200
  104. @@ -1,3 +1,7 @@
  105. +if (COMMAND cotire)
  106. + set_source_files_properties (IsInf.cpp IsNAN.cpp PROPERTIES COTIRE_EXCLUDED TRUE)
  107. +endif()
  108. +
  109. add_llvm_library(LLVMSupport
  110. APFloat.cpp
  111. APInt.cpp