diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-10-25 11:26:14 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-10-25 11:26:14 -0700 |
| commit | 5c897cf45a7b9df227e0c562c27454f56ba86c20 (patch) | |
| tree | ae3a9ea4d11bfb20379639dd9ca0951ce411e73a /projects | |
| parent | 89758b0545198f9a3876f0deb747146cbd84ce61 (diff) | |
| parent | a8a0a155de16830b8fcab539ba2ec21de3145532 (diff) | |
Merge commit 'a8a0a155de16830b8fcab539ba2ec21de3145532'
Conflicts:
lib/Target/X86/X86FrameLowering.cpp
lib/Target/X86/X86ISelLowering.cpp
The Intel folks switched some of the FrameLowering code to use
X86RegisterInfo::getSlotSize isntead of pointer size, thus reducing
our localmods in that file.
Diffstat (limited to 'projects')
| -rw-r--r-- | projects/CMakeLists.txt | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt index a9d2af6ad2..36751cd31d 100644 --- a/projects/CMakeLists.txt +++ b/projects/CMakeLists.txt @@ -14,8 +14,6 @@ endforeach(entry) # Also add in the compiler-rt tree if present and we have a sufficiently # recent version of CMake. if(${CMAKE_VERSION} VERSION_GREATER 2.8.7 AND - ${LLVM_BUILD_RUNTIME} AND - IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/compiler-rt AND - EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/compiler-rt/CMakeLists.txt) - add_subdirectory(compiler-rt) + ${LLVM_BUILD_RUNTIME}) + add_llvm_external_project(compiler-rt) endif() |