diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -233,8 +233,6 @@
 
 include(TestSuite)
 include(SingleMultiSource)
-find_package(TCL)
-find_package(OpenMP)
 
 if(NOT DEFINED TARGET_OS)
   message(STATUS "Check target operating system - ${CMAKE_SYSTEM_NAME}")
diff --git a/External/SPEC/CFP2017rate/503.bwaves_r/CMakeLists.txt b/External/SPEC/CFP2017rate/503.bwaves_r/CMakeLists.txt
new file mode 100644
--- /dev/null
+++ b/External/SPEC/CFP2017rate/503.bwaves_r/CMakeLists.txt
@@ -0,0 +1,67 @@
+# https://www.spec.org/cpu2017/Docs/benchmarks/503.bwaves_r.html
+include(../../SpecCPU2017.cmake)
+if (NOT TEST_SUITE_SPEC2017_ROOT)
+  return ()
+endif ()
+
+speccpu2017_benchmark(RATE)
+
+## test ########################################################################
+
+speccpu2017_run_test(
+  < "${INPUT_test_DIR}/bwaves_1.in"
+  STDOUT bwaves_1.out
+  RUN_TYPE test
+)
+
+speccpu2017_run_test(
+  < "${INPUT_test_DIR}/bwaves_2.in"
+  STDOUT bwaves_2.out
+  RUN_TYPE test
+)
+
+## train #######################################################################
+
+speccpu2017_run_test(
+  < "${INPUT_train_DIR}/bwaves_1.in"
+  STDOUT bwaves_1.out
+  RUN_TYPE train
+)
+
+speccpu2017_run_test(
+  < "${INPUT_train_DIR}/bwaves_2.in"
+  STDOUT bwaves_2.out
+  RUN_TYPE train
+)
+
+## ref #########################################################################
+
+speccpu2017_run_test(
+  < "${INPUT_ref_DIR}/bwaves_1.in"
+  STDOUT bwaves_1.out
+  RUN_TYPE ref
+)
+
+speccpu2017_run_test(
+  < "${INPUT_ref_DIR}/bwaves_2.in"
+  STDOUT bwaves_2.out
+  RUN_TYPE ref
+)
+
+speccpu2017_run_test(
+  < "${INPUT_ref_DIR}/bwaves_3.in"
+  STDOUT bwaves_3.out
+  RUN_TYPE ref
+)
+
+speccpu2017_run_test(
+  < "${INPUT_ref_DIR}/bwaves_4.in"
+  STDOUT bwaves_4.out
+  RUN_TYPE ref
+)
+
+
+################################################################################
+
+speccpu2017_verify_output()
+speccpu2017_add_executable()
diff --git a/External/SPEC/CFP2017rate/CMakeLists.txt b/External/SPEC/CFP2017rate/CMakeLists.txt
--- a/External/SPEC/CFP2017rate/CMakeLists.txt
+++ b/External/SPEC/CFP2017rate/CMakeLists.txt
@@ -1,5 +1,7 @@
-#add_subdirectory(503.bwaves_r)    # Fortran
-#add_subdirectory(507.cactuBSSN_r) # C++, C, Fortran
+if (TEST_SUITE_FORTRAN)
+  add_subdirectory(503.bwaves_r)    # Fortran
+  #add_subdirectory(507.cactuBSSN_r) # C++, C, Fortran
+endif ()
 add_subdirectory(508.namd_r)       # C++
 add_subdirectory(510.parest_r)     # C++
 add_subdirectory(511.povray_r)     # C++, C
diff --git a/External/SPEC/CFP2017speed/603.bwaves_s/CMakeLists.txt b/External/SPEC/CFP2017speed/603.bwaves_s/CMakeLists.txt
new file mode 100644
--- /dev/null
+++ b/External/SPEC/CFP2017speed/603.bwaves_s/CMakeLists.txt
@@ -0,0 +1,9 @@
+# https://www.spec.org/cpu2017/Docs/benchmarks/603.bwaves_s.html
+include(../../SpecCPU2017.cmake)
+if (NOT TEST_SUITE_SPEC2017_ROOT)
+  return ()
+endif ()
+
+speccpu2017_benchmark(SPEED ORIGIN 503.bwaves_r)
+
+speccpu2017_inherit(../../CFP2017rate/503.bwaves_r)
diff --git a/External/SPEC/CFP2017speed/CMakeLists.txt b/External/SPEC/CFP2017speed/CMakeLists.txt
--- a/External/SPEC/CFP2017speed/CMakeLists.txt
+++ b/External/SPEC/CFP2017speed/CMakeLists.txt
@@ -1,5 +1,7 @@
-#add_subdirectory(603.bwaves_s)    # Fortran
-#add_subdirectory(607.cactuBSSN_s) # C++, C, Fortran
+if (TEST_SUITE_FORTRAN)
+  add_subdirectory(603.bwaves_s)    # Fortran
+  #add_subdirectory(607.cactuBSSN_s) # C++, C, Fortran
+endif ()
 add_subdirectory(619.lbm_s)        # C
 #add_subdirectory(621.wrf_s)       # Fortran, C
 #add_subdirectory(627.cam4_s)      # Fortran, C
diff --git a/External/SPEC/CINT2017rate/548.exchange2_r/CMakeLists.txt b/External/SPEC/CINT2017rate/548.exchange2_r/CMakeLists.txt
new file mode 100644
--- /dev/null
+++ b/External/SPEC/CINT2017rate/548.exchange2_r/CMakeLists.txt
@@ -0,0 +1,34 @@
+# https://www.spec.org/cpu2017/Docs/benchmarks/548.exchange2_r.html
+include(../../SpecCPU2017.cmake)
+if (NOT TEST_SUITE_SPEC2017_ROOT)
+  return ()
+endif ()
+
+speccpu2017_benchmark(RATE)
+
+## test ########################################################################
+
+speccpu2017_run_test(
+  0
+  RUN_TYPE test
+)
+
+## train #######################################################################
+
+speccpu2017_run_test(
+  1
+  RUN_TYPE train
+)
+
+## ref #########################################################################
+
+speccpu2017_run_test(
+  6
+  RUN_TYPE ref
+)
+
+################################################################################
+
+speccpu2017_verify_output()
+speccpu2017_add_executable()
+speccpu2017_prepare_rundir()
diff --git a/External/SPEC/CINT2017rate/CMakeLists.txt b/External/SPEC/CINT2017rate/CMakeLists.txt
--- a/External/SPEC/CINT2017rate/CMakeLists.txt
+++ b/External/SPEC/CINT2017rate/CMakeLists.txt
@@ -6,7 +6,9 @@
 add_subdirectory(525.x264_r)       # C
 add_subdirectory(531.deepsjeng_r)  # C++
 add_subdirectory(541.leela_r)      # C++
-#add_subdirectory(548.exchange2_r) # Fortran
+if (TEST_SUITE_FORTRAN)
+  add_subdirectory(548.exchange2_r) # Fortran
+endif ()
 add_subdirectory(557.xz_r)         # C
 
 add_subdirectory(999.specrand_ir)  # C
diff --git a/External/SPEC/CINT2017speed/648.exchange2_s/CMakeLists.txt b/External/SPEC/CINT2017speed/648.exchange2_s/CMakeLists.txt
new file mode 100644
--- /dev/null
+++ b/External/SPEC/CINT2017speed/648.exchange2_s/CMakeLists.txt
@@ -0,0 +1,9 @@
+# https://www.spec.org/cpu2017/Docs/benchmarks/648.exchange2_s.html
+include(../../SpecCPU2017.cmake)
+if (NOT TEST_SUITE_SPEC2017_ROOT)
+  return ()
+endif ()
+
+speccpu2017_benchmark(SPEED ORIGIN 548.exchange2_r)
+
+speccpu2017_inherit(../../CINT2017rate/548.exchange2_r)
diff --git a/External/SPEC/CINT2017speed/CMakeLists.txt b/External/SPEC/CINT2017speed/CMakeLists.txt
--- a/External/SPEC/CINT2017speed/CMakeLists.txt
+++ b/External/SPEC/CINT2017speed/CMakeLists.txt
@@ -6,7 +6,9 @@
 add_subdirectory(625.x264_s)       # C
 add_subdirectory(631.deepsjeng_s)  # C++
 add_subdirectory(641.leela_s)      # C++
-#add_subdirectory(648.exchange2_s) # Fortran
+if (TEST_SUITE_FORTRAN)
+  add_subdirectory(648.exchange2_s) # Fortran
+endif ()
 add_subdirectory(657.xz_s)         # C
 
 add_subdirectory(998.specrand_is)  # C
diff --git a/External/SPEC/SpecCPU2017.cmake b/External/SPEC/SpecCPU2017.cmake
--- a/External/SPEC/SpecCPU2017.cmake
+++ b/External/SPEC/SpecCPU2017.cmake
@@ -326,7 +326,7 @@
     endforeach()
   else ()
     file(GLOB_RECURSE _sources
-      ${SRC_DIR}/*.c ${SRC_DIR}/*.cpp ${SRC_DIR}/*.cc ${SRC_DIR}/*.C)
+      ${SRC_DIR}/*.c ${SRC_DIR}/*.cpp ${SRC_DIR}/*.cc ${SRC_DIR}/*.C ${SRC_DIR}/*.f ${SRC_DIR}/*.F ${SRC_DIR}/*.f90 ${SRC_DIR}/*.F90)
   endif ()
 
   llvm_test_executable(${PROG} ${_sources})
diff --git a/SingleSource/Regression/C/gcc-c-torture/execute/CMakeLists.txt b/SingleSource/Regression/C/gcc-c-torture/execute/CMakeLists.txt
--- a/SingleSource/Regression/C/gcc-c-torture/execute/CMakeLists.txt
+++ b/SingleSource/Regression/C/gcc-c-torture/execute/CMakeLists.txt
@@ -190,6 +190,7 @@
 file(GLOB TestRequiresLibM CONFIGURE_DEPENDS
   980709-1.c
   float-floor.c
+  complex-5.c  # -lm needed on FreeBSD
 )
 
 # Tests that require newnlib Nano IO (--undefined=_printf_float ldflag)