Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -54,6 +54,11 @@
     set(ENDIAN "little")
   endif()
 endif()
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+  set(ARCH_LP64 TRUE)
+endif()
+
+set(TEST_SUITE_EXTERNALS_DIR "" CACHE PATH "Directory of llvm-test-suite external sources")
 
 add_subdirectory(tools)
 
@@ -63,6 +68,9 @@
 
 add_subdirectory(SingleSource)
 add_subdirectory(MultiSource)
+if(TEST_SUITE_EXTERNALS_DIR)
+  add_subdirectory(External)
+endif()
 
 # Produce lit.site.cfg
 configure_file("${CMAKE_SOURCE_DIR}/lit.site.cfg.in" "${CMAKE_BINARY_DIR}/lit.site.cfg")
Index: External/CMakeLists.txt
===================================================================
--- /dev/null
+++ External/CMakeLists.txt
@@ -0,0 +1,6 @@
+llvm_add_subdirectories(
+  HMMER
+  Nurbs
+  Povray
+  skidmarks10
+)
Index: External/HMMER/CMakeLists.txt
===================================================================
--- /dev/null
+++ External/HMMER/CMakeLists.txt
@@ -0,0 +1,25 @@
+# Autogenerated from External/HMMER/Makefile
+
+set(DIRS)
+set(PARALLEL_DIRS)
+
+set(TEST_SUITE_HMMER_ROOT "${TEST_SUITE_EXTERNALS_DIR}/hmmer" CACHE PATH "Directory containing hmmer sourcecode")
+
+set(LEVEL ../..)
+set(PROG hmmcalibrate)
+FILE(GLOB Source ${TEST_SUITE_HMMER_ROOT}/*.c)
+set(CPPFLAGS -DSSE2)
+list(APPEND LIBS -lpthread)
+list(APPEND LDFLAGS -lpthread)
+if("${ARCH}" STREQUAL "PowerPC")
+  list(APPEND TARGET_FLAGS -maltivec)
+  list(APPEND LCCFLAGS -maltivec)
+endif()
+if(DEFINED LARGE_PROBLEM_SIZE)
+  set(RUN_OPTIONS --fixed 400 --cpu 1 --num 200000 --seed 1158818515 ${TEST_SUITE_HMMER_ROOT}/globin.hmm)
+else()
+  set(RUN_OPTIONS --fixed 400 --cpu 1 --num 80000 --seed 1158818515 ${TEST_SUITE_HMMER_ROOT}/globin.hmm)
+endif()
+llvm_multisource()
+
+llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
Index: External/Nurbs/CMakeLists.txt
===================================================================
--- /dev/null
+++ External/Nurbs/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Autogenerated from External/Nurbs/Makefile
+
+set(DIRS)
+set(PARALLEL_DIRS)
+
+set(TEST_SUITE_NURBS_ROOT "${TEST_SUITE_EXTERNALS_DIR}/nurbs" CACHE PATH "Directory containing nurbs sourcecode")
+
+set(LEVEL ../..)
+set(PROG nurbs)
+file(GLOB Source ${TEST_SUITE_NURBS_ROOT}/*.cpp)
+set(CPPFLAGS )
+set(LDFLAGS -lstdc++)
+list(APPEND LIBS -lstdc++)
+if(ARCH_LP64)
+  list(APPEND CPPFLAGS -DDWORD_IS_ULL)
+endif()
+set(RUN_OPTIONS /k all timed /t 500 /vsteps 192 /usteps 192 /vcp 20 /ucp 20)
+llvm_multisource()
+
+llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})
Index: External/Povray/CMakeLists.txt
===================================================================
--- /dev/null
+++ External/Povray/CMakeLists.txt
@@ -0,0 +1,14 @@
+set(PROG povray)
+
+set(TEST_SUITE_POVRAY_ROOT "${TEST_SUITE_EXTERNALS_DIR}/povray31" CACHE PATH "Directory containing povray 3.1 sourcecode")
+
+file(GLOB Source ${TEST_SUITE_POVRAY_ROOT}/source/*.c ${TEST_SUITE_POVRAY_ROOT}/source/libpng/*.c)
+list(REMOVE_ITEM Source ${TEST_SUITE_POVRAY_ROOT}/source/libpng/ansi2knr.c ${TEST_SUITE_POVRAY_ROOT}/source/libpng/pngtest.c ${TEST_SUITE_POVRAY_ROOT}/source/libpng/example.c)
+
+list(APPEND CPPFLAGS -I${TEST_SUITE_POVRAY_ROOT}/source -I${TEST_SUITE_POVRAY_ROOT}/source/unix -I${TEST_SUITE_POVRAY_ROOT}/source/libpng -DPREFIX='"${CMAKE_CURRENT_BINARY_DIR}"' -DSYSCONFDIR='"${CMAKE_CURRENT_BINARY_DIR}"' -UHAVE_LIBVGA)
+list(APPEND LIBS -lz -lm)
+list(APPEND LDFLAGS -lz -lm)
+
+set(RUN_OPTIONS -I${TEST_SUITE_POVRAY_ROOT}/scenes/advanced/chess2.pov -L${TEST_SUITE_POVRAY_ROOT}/include -GA$<.junk -O-)
+
+llvm_multisource()
Index: External/skidmarks10/CMakeLists.txt
===================================================================
--- /dev/null
+++ External/skidmarks10/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Autogenerated from External/skidmarks10/Makefile
+
+set(DIRS)
+set(PARALLEL_DIRS)
+
+set(TEST_SUITE_SKIDMARKS10_ROOT "${TEST_SUITE_EXTERNALS_DIR}/skidmarks10" CACHE PATH "Directory containing skidmarks 10 sourcecode")
+
+set(LEVEL ../..)
+set(PROG skidmarks)
+set(DISABLE_JIT 1)
+
+file(GLOB Source ${TEST_SUITE_SKIDMARKS10_ROOT}/source/*.c)
+set(RUN_OPTIONS 0 ${TEST_SUITE_SKIDMARKS10_ROOT}/golden)
+list(APPEND CPPFLAGS -I${TEST_SUITE_SKIDMARKS10_ROOT}/source)
+string(FIND "${ARCH}" "x86" TMP1)
+if(NOT "" STREQUAL "${TMP1}")
+  list(APPEND CPPFLAGS -msse3)
+endif()
+llvm_multisource()
+
+llvm_add_subdirectories(${DIRS} ${PARALLEL_DIRS})