[llvm-branch-commits] [llvm-branch] r171646 - in /llvm/branches/AMDILBackend: ./ CMakeLists.txt test/CodeGen/ARM/longMAC.ll

[Richard Relph]

Author: rrelph
Date: Sat Jan  5 20:06:34 2013
New Revision: 171646

URL: http://llvm.org/viewvc/llvm-project?rev=171646&view=rev
Log:
Get history synced to where the branch actually is so future merges are clean.

Added:
    llvm/branches/AMDILBackend/test/CodeGen/ARM/longMAC.ll
      - copied unchanged from r161674, llvm/trunk/test/CodeGen/ARM/longMAC.ll
Modified:
    llvm/branches/AMDILBackend/   (props changed)
    llvm/branches/AMDILBackend/CMakeLists.txt

Propchange: llvm/branches/AMDILBackend/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan  5 20:06:34 2013
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,161674-164633
+/llvm/trunk:155241,161674

Modified: llvm/branches/AMDILBackend/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/AMDILBackend/CMakeLists.txt?rev=171646&r1=171645&r2=171646&view=diff
==============================================================================
--- llvm/branches/AMDILBackend/CMakeLists.txt (original)
+++ llvm/branches/AMDILBackend/CMakeLists.txt Sat Jan  5 20:06:34 2013
@@ -129,15 +129,10 @@
   set( LLVM_TARGETS_TO_BUILD ${LLVM_ALL_TARGETS} )
 endif()
 
-set(LLVM_TARGETS_TO_BUILD
-   ${LLVM_TARGETS_TO_BUILD}
-   ${LLVM_EXPERIMENTAL_TARGETS_TO_BUILD})
-
 set(LLVM_ENUM_TARGETS "")
 foreach(c ${LLVM_TARGETS_TO_BUILD})
   list(FIND LLVM_ALL_TARGETS ${c} idx)
-  list(FIND LLVM_EXPERIMENTAL_TARGETS_TO_BUILD ${c} idy)
-  if( idx LESS 0 AND idy LESS 0 )
+  if( idx LESS 0 )
     message(FATAL_ERROR "The target `${c}' does not exist.
     It should be one of\n${LLVM_ALL_TARGETS}")
   else()
@@ -145,6 +140,11 @@
   endif()
 endforeach(c)
 
+set(LLVM_TARGETS_TO_BUILD
+  ${LLVM_TARGETS_TO_BUILD}
+  ${LLVM_EXPERIMENTAL_TARGETS_TO_BUILD}
+  )
+
 set(llvm_builded_incs_dir ${LLVM_BINARY_DIR}/include/llvm)
 
 include(AddLLVMDefinitions)