Revert changes not needed for test passage on supported platforms.

This reverts:
- Adopt proper freebsd triple as required by Swift's build system.
- Revert "Add FreeBSD target_* support.

These will be re-introduced in a later patch that brings up the FreeBSD
test suite.

Author: landonf

CMakeLists.txt

@@ -398,7 +398,7 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
   set(SWIFT_PRIMARY_VARIANT_SDK_default "LINUX")
   set(SWIFT_PRIMARY_VARIANT_ARCH_default "x86_64")
 elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD")
-  configure_sdk_unix(FREEBSD "FreeBSD" "freebsd" "freebsd" "x86_64" "x86_64-unknown-freebsd10")
+  configure_sdk_unix(FREEBSD "FreeBSD" "freebsd" "freebsd" "x86_64" "x86_64-freebsd10")
 
   set(CMAKE_EXECUTABLE_FORMAT "ELF")
 

test/lit.cfg

@@ -611,20 +611,13 @@ if run_vendor == 'apple':
         "%s ld -L%s" %
         (xcrun_prefix, os.path.join(test_resource_dir, config.target_sdk_name)))
 
-elif run_os == 'linux-gnu' or run_os.startswith('freebsd'):
-    # Linux/FreeBSD
-    if run_os == 'linux-gnu':
-        config.target_sdk_name = "linux"
-    elif run_os.startswith('freebsd'):
-        config.target_sdk_name = "freebsd"
-
-    lit_config.note("Testing " + config.target_sdk_name + " " +
-        config.variant_triple)
-
+elif run_os == 'linux-gnu':
+    # Linux
+    lit_config.note("Testing Linux " + config.variant_triple)
     config.target_object_format = "elf"
     config.target_runtime = "native"
     config.target_swift_autolink_extract = inferSwiftBinary("swift-autolink-extract")
-
+    config.target_sdk_name = "linux"
     config.target_build_swift = (
         '%s -target %s %s %s %s %s'
         % (config.swiftc, config.variant_triple, resource_dir_opt, mcp_opt,