diff options
| author | tstellar <tstellar@91177308-0d34-0410-b5e6-96231b3b80d8> | 2012-11-13 15:21:47 +0000 |
|---|---|---|
| committer | tstellar <tstellar@91177308-0d34-0410-b5e6-96231b3b80d8> | 2012-11-13 15:21:47 +0000 |
| commit | 38a99a412cd8522809fe6852f4ab51aa9e0ac0b8 (patch) | |
| tree | d0484fd7bd7bc5106013543f08885705866e9ce1 /projects | |
| parent | 094d4debe319059e37a2bc5c4846d7496660c095 (diff) | |
Merge master branch
Build with clang checkouts:
SVN: r167547
Git Mirror: b578aee665aad5ed1a46a26217c730fdfbfc8c2e
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/R600/@167838 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'projects')
| -rw-r--r-- | projects/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | projects/sample/autoconf/configure.ac | 4 | ||||
| -rwxr-xr-x | projects/sample/configure | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt index a9d2af6ad21..36751cd31da 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() diff --git a/projects/sample/autoconf/configure.ac b/projects/sample/autoconf/configure.ac index bd0b16a4a69..8012c23412d 100644 --- a/projects/sample/autoconf/configure.ac +++ b/projects/sample/autoconf/configure.ac @@ -304,8 +304,8 @@ AC_CACHE_CHECK([target architecture],[llvm_cv_target_arch], sparc*-*) llvm_cv_target_arch="Sparc" ;; powerpc*-*) llvm_cv_target_arch="PowerPC" ;; arm*-*) llvm_cv_target_arch="ARM" ;; - mips-*) llvm_cv_target_arch="Mips" ;; - mipsel-*) llvm_cv_target_arch="Mips" ;; + mips-* | mips64-*) llvm_cv_target_arch="Mips" ;; + mipsel-* | mips64el-*) llvm_cv_target_arch="Mips" ;; xcore-*) llvm_cv_target_arch="XCore" ;; msp430-*) llvm_cv_target_arch="MSP430" ;; hexagon-*) llvm_cv_target_arch="Hexagon" ;; diff --git a/projects/sample/configure b/projects/sample/configure index df08c7c4e04..cfbb6c69224 100755 --- a/projects/sample/configure +++ b/projects/sample/configure @@ -3840,8 +3840,8 @@ else sparc*-*) llvm_cv_target_arch="Sparc" ;; powerpc*-*) llvm_cv_target_arch="PowerPC" ;; arm*-*) llvm_cv_target_arch="ARM" ;; - mips-*) llvm_cv_target_arch="Mips" ;; - mipsel-*) llvm_cv_target_arch="Mips" ;; + mips-* | mips64-*) llvm_cv_target_arch="Mips" ;; + mipsel-* | mips64el-*) llvm_cv_target_arch="Mips" ;; xcore-*) llvm_cv_target_arch="XCore" ;; msp430-*) llvm_cv_target_arch="MSP430" ;; hexagon-*) llvm_cv_target_arch="Hexagon" ;; |