diff --git a/MultiSource/Applications/ALAC/CMakeLists.txt b/MultiSource/Applications/ALAC/CMakeLists.txt
index 4d10b1e..b79a0a0 100644
--- a/MultiSource/Applications/ALAC/CMakeLists.txt
+++ b/MultiSource/Applications/ALAC/CMakeLists.txt
@@ -2,6 +2,5 @@
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS encode decode)
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Applications/CMakeLists.txt b/MultiSource/Applications/CMakeLists.txt
index 3f55fb7..0ec3668 100644
--- a/MultiSource/Applications/CMakeLists.txt
+++ b/MultiSource/Applications/CMakeLists.txt
@@ -44,6 +44,5 @@
   llvm_filter_out(TMP10 treecc  ${PARALLEL_DIRS})
   set(PARALLEL_DIRS ${TMP10})
 endif()
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Applications/JM/CMakeLists.txt b/MultiSource/Applications/JM/CMakeLists.txt
index 2635d39..3dd8f1f 100644
--- a/MultiSource/Applications/JM/CMakeLists.txt
+++ b/MultiSource/Applications/JM/CMakeLists.txt
@@ -2,6 +2,5 @@
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS ldecod lencod)
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Applications/kimwitu++/doc/CMakeLists.txt b/MultiSource/Applications/kimwitu++/doc/CMakeLists.txt
index 116e3ea..7d1ca51 100644
--- a/MultiSource/Applications/kimwitu++/doc/CMakeLists.txt
+++ b/MultiSource/Applications/kimwitu++/doc/CMakeLists.txt
@@ -28,6 +28,5 @@
 set(TMP9 ${PNGs})
 llvm_prepend(TMP9 ${IMGDIR}/ ${TMP9})
 set(PNGs ${TMP9})
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/ASCI_Purple/CMakeLists.txt b/MultiSource/Benchmarks/ASCI_Purple/CMakeLists.txt
index 1e9b201..3bf0fb0 100644
--- a/MultiSource/Benchmarks/ASCI_Purple/CMakeLists.txt
+++ b/MultiSource/Benchmarks/ASCI_Purple/CMakeLists.txt
@@ -2,6 +2,5 @@
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS SMG2000 )
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/ASC_Sequoia/CMakeLists.txt b/MultiSource/Benchmarks/ASC_Sequoia/CMakeLists.txt
index 8c811c8..a1fde6a 100644
--- a/MultiSource/Benchmarks/ASC_Sequoia/CMakeLists.txt
+++ b/MultiSource/Benchmarks/ASC_Sequoia/CMakeLists.txt
@@ -2,6 +2,5 @@
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS IRSmk AMGmk CrystalMk )
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/ASC_Sequoia/sphot/CMakeLists.txt b/MultiSource/Benchmarks/ASC_Sequoia/sphot/CMakeLists.txt
index 768068a..883e6aa 100644
--- a/MultiSource/Benchmarks/ASC_Sequoia/sphot/CMakeLists.txt
+++ b/MultiSource/Benchmarks/ASC_Sequoia/sphot/CMakeLists.txt
@@ -4,6 +4,5 @@
 set(PROG sphot)
 list(APPEND LIBS -lm)
 list(APPEND LDFLAGS -lm)
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/BitBench/CMakeLists.txt b/MultiSource/Benchmarks/BitBench/CMakeLists.txt
index 493558e..eccebb7 100644
--- a/MultiSource/Benchmarks/BitBench/CMakeLists.txt
+++ b/MultiSource/Benchmarks/BitBench/CMakeLists.txt
@@ -2,6 +2,5 @@
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS five11 drop3 uudecode uuencode)
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/CMakeLists.txt b/MultiSource/Benchmarks/CMakeLists.txt
index a4551ec..eb8a278 100644
--- a/MultiSource/Benchmarks/CMakeLists.txt
+++ b/MultiSource/Benchmarks/CMakeLists.txt
@@ -24,6 +24,5 @@
   llvm_filter_out(TMP4 PAQ8p  ${PARALLEL_DIRS})
   set(PARALLEL_DIRS ${TMP4})
 endif()
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/FreeBench/CMakeLists.txt b/MultiSource/Benchmarks/FreeBench/CMakeLists.txt
index 3aaa583..68f3276 100644
--- a/MultiSource/Benchmarks/FreeBench/CMakeLists.txt
+++ b/MultiSource/Benchmarks/FreeBench/CMakeLists.txt
@@ -6,6 +6,5 @@
   llvm_filter_out(TMP1 analyzer  ${PARALLEL_DIRS})
   set(PARALLEL_DIRS ${TMP1})
 endif()
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/MallocBench/CMakeLists.txt b/MultiSource/Benchmarks/MallocBench/CMakeLists.txt
index c19c738..ba8f33e 100644
--- a/MultiSource/Benchmarks/MallocBench/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MallocBench/CMakeLists.txt
@@ -6,6 +6,5 @@
   llvm_filter_out(TMP1 cfrac  ${PARALLEL_DIRS})
   set(PARALLEL_DIRS ${TMP1})
 endif()
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/McCat/CMakeLists.txt b/MultiSource/Benchmarks/McCat/CMakeLists.txt
index 31d2cb0..9d7ab3d 100644
--- a/MultiSource/Benchmarks/McCat/CMakeLists.txt
+++ b/MultiSource/Benchmarks/McCat/CMakeLists.txt
@@ -6,6 +6,5 @@
   llvm_filter_out(TMP1 15-trie  ${PARALLEL_DIRS})
   set(PARALLEL_DIRS ${TMP1})
 endif()
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/MiBench/CMakeLists.txt b/MultiSource/Benchmarks/MiBench/CMakeLists.txt
index 615865e..a9b68cf 100644
--- a/MultiSource/Benchmarks/MiBench/CMakeLists.txt
+++ b/MultiSource/Benchmarks/MiBench/CMakeLists.txt
@@ -22,6 +22,5 @@
   llvm_filter_out(TMP7 telecom-adpcm  ${PARALLEL_DIRS})
   set(PARALLEL_DIRS ${TMP7})
 endif()
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/NPB-serial/CMakeLists.txt b/MultiSource/Benchmarks/NPB-serial/CMakeLists.txt
index ab86d91..2dd7741 100644
--- a/MultiSource/Benchmarks/NPB-serial/CMakeLists.txt
+++ b/MultiSource/Benchmarks/NPB-serial/CMakeLists.txt
@@ -2,6 +2,5 @@
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS is )
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Olden/CMakeLists.txt b/MultiSource/Benchmarks/Olden/CMakeLists.txt
index 8e0f077..80a446f 100644
--- a/MultiSource/Benchmarks/Olden/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Olden/CMakeLists.txt
@@ -2,6 +2,5 @@
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS bh em3d mst power tsp bisort health perimeter treeadd voronoi)
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C++/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C++/CMakeLists.txt
index ca3d82e..7c1938e 100644
--- a/MultiSource/Benchmarks/Prolangs-C++/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C++/CMakeLists.txt
@@ -26,6 +26,5 @@
   llvm_filter_out(TMP11 vcirc  ${PARALLEL_DIRS})
   set(PARALLEL_DIRS ${TMP11})
 endif()
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Prolangs-C/CMakeLists.txt b/MultiSource/Benchmarks/Prolangs-C/CMakeLists.txt
index 3ebc97e..b8a76cd 100644
--- a/MultiSource/Benchmarks/Prolangs-C/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Prolangs-C/CMakeLists.txt
@@ -44,6 +44,5 @@
   llvm_filter_out(TMP17 unix-tbl  ${PARALLEL_DIRS})
   set(PARALLEL_DIRS ${TMP17})
 endif()
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Ptrdist/CMakeLists.txt b/MultiSource/Benchmarks/Ptrdist/CMakeLists.txt
index 7dacc24..8c34301 100644
--- a/MultiSource/Benchmarks/Ptrdist/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Ptrdist/CMakeLists.txt
@@ -2,6 +2,5 @@
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS anagram bc ft ks yacr2)
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/TSVC/CMakeLists.txt b/MultiSource/Benchmarks/TSVC/CMakeLists.txt
index 1d3f4ec..c985ec1 100644
--- a/MultiSource/Benchmarks/TSVC/CMakeLists.txt
+++ b/MultiSource/Benchmarks/TSVC/CMakeLists.txt
@@ -2,6 +2,5 @@
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS LinearDependence-flt InductionVariable-flt GlobalDataFlow-flt ControlFlow-flt Symbolics-flt StatementReordering-flt LoopRestructuring-flt NodeSplitting-flt Expansion-flt CrossingThresholds-flt Reductions-flt Recurrences-flt Searching-flt Packing-flt LoopRerolling-flt Equivalencing-flt IndirectAddressing-flt ControlLoops-flt LinearDependence-dbl InductionVariable-dbl GlobalDataFlow-dbl ControlFlow-dbl Symbolics-dbl StatementReordering-dbl LoopRestructuring-dbl NodeSplitting-dbl Expansion-dbl CrossingThresholds-dbl Reductions-dbl Recurrences-dbl Searching-dbl Packing-dbl LoopRerolling-dbl Equivalencing-dbl IndirectAddressing-dbl ControlLoops-dbl)
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/Trimaran/CMakeLists.txt b/MultiSource/Benchmarks/Trimaran/CMakeLists.txt
index d6034b2..45104d2 100644
--- a/MultiSource/Benchmarks/Trimaran/CMakeLists.txt
+++ b/MultiSource/Benchmarks/Trimaran/CMakeLists.txt
@@ -2,6 +2,5 @@
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS enc-3des enc-md5 enc-pc1 enc-rc4 netbench-crc netbench-url)
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/VersaBench/CMakeLists.txt b/MultiSource/Benchmarks/VersaBench/CMakeLists.txt
index 790f6ee..ef614c9 100644
--- a/MultiSource/Benchmarks/VersaBench/CMakeLists.txt
+++ b/MultiSource/Benchmarks/VersaBench/CMakeLists.txt
@@ -6,6 +6,5 @@
 else()
   set(PARALLEL_DIRS 8b10b beamformer bmm dbms ecbdes)
 endif()
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/mediabench/CMakeLists.txt b/MultiSource/Benchmarks/mediabench/CMakeLists.txt
index 5fb1a3a..ba5f4a6 100644
--- a/MultiSource/Benchmarks/mediabench/CMakeLists.txt
+++ b/MultiSource/Benchmarks/mediabench/CMakeLists.txt
@@ -2,6 +2,5 @@
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS adpcm g721 gsm jpeg mpeg2)
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/mediabench/adpcm/CMakeLists.txt b/MultiSource/Benchmarks/mediabench/adpcm/CMakeLists.txt
index cb22619..e035ea9 100644
--- a/MultiSource/Benchmarks/mediabench/adpcm/CMakeLists.txt
+++ b/MultiSource/Benchmarks/mediabench/adpcm/CMakeLists.txt
@@ -2,6 +2,5 @@
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS rawcaudio rawdaudio)
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/mediabench/g721/CMakeLists.txt b/MultiSource/Benchmarks/mediabench/g721/CMakeLists.txt
index 49b60f6..64bcae3 100644
--- a/MultiSource/Benchmarks/mediabench/g721/CMakeLists.txt
+++ b/MultiSource/Benchmarks/mediabench/g721/CMakeLists.txt
@@ -2,6 +2,5 @@
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS g721encode )
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/mediabench/gsm/CMakeLists.txt b/MultiSource/Benchmarks/mediabench/gsm/CMakeLists.txt
index ce5cf5c..d63103a 100644
--- a/MultiSource/Benchmarks/mediabench/gsm/CMakeLists.txt
+++ b/MultiSource/Benchmarks/mediabench/gsm/CMakeLists.txt
@@ -2,6 +2,5 @@
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS toast )
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/mediabench/jpeg/CMakeLists.txt b/MultiSource/Benchmarks/mediabench/jpeg/CMakeLists.txt
index f574a27..fef69d7 100644
--- a/MultiSource/Benchmarks/mediabench/jpeg/CMakeLists.txt
+++ b/MultiSource/Benchmarks/mediabench/jpeg/CMakeLists.txt
@@ -2,6 +2,5 @@
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS jpeg-6a )
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Benchmarks/mediabench/mpeg2/CMakeLists.txt b/MultiSource/Benchmarks/mediabench/mpeg2/CMakeLists.txt
index da36c8e..b0047bd 100644
--- a/MultiSource/Benchmarks/mediabench/mpeg2/CMakeLists.txt
+++ b/MultiSource/Benchmarks/mediabench/mpeg2/CMakeLists.txt
@@ -2,6 +2,5 @@
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS mpeg2dec)
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/CMakeLists.txt b/MultiSource/CMakeLists.txt
index 38dc9e7..058de7c 100644
--- a/MultiSource/CMakeLists.txt
+++ b/MultiSource/CMakeLists.txt
@@ -5,6 +5,5 @@
 if(NOT DEFINED BENCHMARKING_ONLY)
   list(APPEND PARALLEL_DIRS UnitTests)
 endif()
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/Examples/CMakeLists.txt b/MultiSource/Examples/CMakeLists.txt
index 25cf8d6..3fc73ab 100644
--- a/MultiSource/Examples/CMakeLists.txt
+++ b/MultiSource/Examples/CMakeLists.txt
@@ -2,6 +2,5 @@
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS MultipleResults)
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/UnitTests/C++11/CMakeLists.txt b/MultiSource/UnitTests/C++11/CMakeLists.txt
index 6c2e96b..e3a40a6 100644
--- a/MultiSource/UnitTests/C++11/CMakeLists.txt
+++ b/MultiSource/UnitTests/C++11/CMakeLists.txt
@@ -8,6 +8,5 @@
   llvm_filter_out(TMP2 frame_layout  ${PARALLEL_DIRS})
   set(PARALLEL_DIRS ${TMP2})
 endif()
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/UnitTests/CMakeLists.txt b/MultiSource/UnitTests/CMakeLists.txt
index 3b6f2ef..c41fb18 100644
--- a/MultiSource/UnitTests/CMakeLists.txt
+++ b/MultiSource/UnitTests/CMakeLists.txt
@@ -5,6 +5,5 @@
 if("${ARCH}" STREQUAL "Mips")
   list(APPEND PARALLEL_DIRS Mips)
 endif()
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/UnitTests/Mips/CMakeLists.txt b/MultiSource/UnitTests/Mips/CMakeLists.txt
index d3bdc69..e6b4f62 100644
--- a/MultiSource/UnitTests/Mips/CMakeLists.txt
+++ b/MultiSource/UnitTests/Mips/CMakeLists.txt
@@ -6,6 +6,5 @@
 if(NOT "" STREQUAL "${TMP1}")
   list(APPEND PARALLEL_DIRS Mips16)
 endif()
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/MultiSource/UnitTests/Mips/Mips16/CMakeLists.txt b/MultiSource/UnitTests/Mips/Mips16/CMakeLists.txt
index 0d1177e..00dec1a 100644
--- a/MultiSource/UnitTests/Mips/Mips16/CMakeLists.txt
+++ b/MultiSource/UnitTests/Mips/Mips16/CMakeLists.txt
@@ -2,6 +2,5 @@
 set(PARALLEL_DIRS)
 
 list(APPEND PARALLEL_DIRS multitest fp16_32_1)
-llvm_multisource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/CMakeLists.txt b/SingleSource/Benchmarks/CMakeLists.txt
index 98714cc..6649f3f 100644
--- a/SingleSource/Benchmarks/CMakeLists.txt
+++ b/SingleSource/Benchmarks/CMakeLists.txt
@@ -3,6 +3,5 @@
 
 set(PARALLEL_DIRS Dhrystone CoyoteBench Shootout Shootout-C++ Stanford McGill Misc Misc-C++ Misc-C++-EH BenchmarkGame Adobe-C++ Polybench Linpack SmallPT)
 list(APPEND LDFLAGS -lm)
-llvm_singlesource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/CMakeLists.txt
index 8c8ac42..1d9d292 100644
--- a/SingleSource/Benchmarks/Polybench/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/CMakeLists.txt
@@ -2,6 +2,5 @@
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS datamining linear-algebra medley stencils)
-llvm_singlesource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/datamining/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/datamining/CMakeLists.txt
index 7bbba5a..b0617fc 100644
--- a/SingleSource/Benchmarks/Polybench/datamining/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/datamining/CMakeLists.txt
@@ -2,6 +2,5 @@
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS correlation covariance )
-llvm_singlesource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/linear-algebra/CMakeLists.txt
index 6e97b8d..8c20f00 100644
--- a/SingleSource/Benchmarks/Polybench/linear-algebra/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/linear-algebra/CMakeLists.txt
@@ -2,6 +2,5 @@
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS kernels solvers)
-llvm_singlesource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/CMakeLists.txt
index f14c76a..74f8fa9 100644
--- a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/CMakeLists.txt
@@ -10,6 +10,5 @@
   llvm_filter_out(TMP3 gemm  ${PARALLEL_DIRS})
   set(PARALLEL_DIRS ${TMP3})
 endif()
-llvm_singlesource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/CMakeLists.txt
index 52cb02c..8e68b6f 100644
--- a/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/CMakeLists.txt
@@ -2,6 +2,5 @@
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS durbin dynprog gramschmidt lu)
-llvm_singlesource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/medley/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/medley/CMakeLists.txt
index 569b92f..2ce9461 100644
--- a/SingleSource/Benchmarks/Polybench/medley/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/medley/CMakeLists.txt
@@ -2,6 +2,5 @@
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS floyd-warshall reg_detect)
-llvm_singlesource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Benchmarks/Polybench/stencils/CMakeLists.txt b/SingleSource/Benchmarks/Polybench/stencils/CMakeLists.txt
index c3a63dc..9188d84 100644
--- a/SingleSource/Benchmarks/Polybench/stencils/CMakeLists.txt
+++ b/SingleSource/Benchmarks/Polybench/stencils/CMakeLists.txt
@@ -2,6 +2,5 @@
 set(PARALLEL_DIRS)
 
 set(PARALLEL_DIRS adi fdtd-2d fdtd-apml jacobi-1d-imper jacobi-2d-imper seidel-2d)
-llvm_singlesource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/CMakeLists.txt b/SingleSource/CMakeLists.txt
index bc6442e..81ffbfc 100644
--- a/SingleSource/CMakeLists.txt
+++ b/SingleSource/CMakeLists.txt
@@ -5,6 +5,5 @@
 if(NOT DEFINED BENCHMARKING_ONLY)
   list(APPEND PARALLEL_DIRS UnitTests)
 endif()
-llvm_singlesource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/Regression/CMakeLists.txt b/SingleSource/Regression/CMakeLists.txt
index 45989b7..3e9edc5 100644
--- a/SingleSource/Regression/CMakeLists.txt
+++ b/SingleSource/Regression/CMakeLists.txt
@@ -2,6 +2,5 @@
 set(PARALLEL_DIRS)
 
 set(DIRS C++ C)
-llvm_singlesource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/UnitTests/Mips/CMakeLists.txt b/SingleSource/UnitTests/Mips/CMakeLists.txt
index a176c09..c74ee2b 100644
--- a/SingleSource/UnitTests/Mips/CMakeLists.txt
+++ b/SingleSource/UnitTests/Mips/CMakeLists.txt
@@ -5,6 +5,5 @@
 if(NOT "" STREQUAL "${TMP1}")
   list(APPEND PARALLEL_DIRS Mips16)
 endif()
-llvm_singlesource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/UnitTests/ObjC++/CMakeLists.txt b/SingleSource/UnitTests/ObjC++/CMakeLists.txt
index 760500d..2a25ed8 100644
--- a/SingleSource/UnitTests/ObjC++/CMakeLists.txt
+++ b/SingleSource/UnitTests/ObjC++/CMakeLists.txt
@@ -6,6 +6,5 @@
 if(DEFINED CC_UNDER_TEST_IS_LLVM_GCC)
   set(PROGRAMS_TO_SKIP property-reference-object)
 endif()
-llvm_singlesource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/UnitTests/ObjC/CMakeLists.txt b/SingleSource/UnitTests/ObjC/CMakeLists.txt
index 7144af2..88a4281 100644
--- a/SingleSource/UnitTests/ObjC/CMakeLists.txt
+++ b/SingleSource/UnitTests/ObjC/CMakeLists.txt
@@ -7,6 +7,5 @@
 if(DEFINED CC_UNDER_TEST_IS_LLVM_GCC)
   set(EXEC_XFAILS dot-syntax-2)
 endif()
-llvm_singlesource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
diff --git a/SingleSource/UnitTests/SetjmpLongjmp/CMakeLists.txt b/SingleSource/UnitTests/SetjmpLongjmp/CMakeLists.txt
index 653b73e..7e35a37 100644
--- a/SingleSource/UnitTests/SetjmpLongjmp/CMakeLists.txt
+++ b/SingleSource/UnitTests/SetjmpLongjmp/CMakeLists.txt
@@ -2,6 +2,5 @@
 set(PARALLEL_DIRS)
 
 set(DIRS C C++)
-llvm_singlesource()
 
 llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})