build: use the new object format property

Simplify the ELF checks based on review comments from Dimitri Gribenko.

Author: compnerd

cmake/modules/AddSwift.cmake

@@ -85,16 +85,6 @@ function(is_windows_based_sdk sdk_name out_var)
  endif()
 endfunction()
 
-function(is_elfish_sdk sdk_name out_var)
-  is_darwin_based_sdk("${sdk_name}" IS_DARWIN)
-  is_windows_based_sdk("${sdk_name}" IS_WINDOWS)
-  if(IS_DARWIN OR IS_WINDOWS)
-    set(${out_var} FALSE PARENT_SCOPE)
-  else()
-    set(${out_var} TRUE PARENT_SCOPE)
-  endif()
-endfunction()
-
 # Usage:
 # _add_variant_c_compile_link_flags(
 #   SDK sdk
@@ -890,8 +880,8 @@ function(_add_swift_library_single target name)
     RESULT_VAR_NAME link_flags
       )
 
-  is_elfish_sdk("${SWIFTLIB_SINGLE_SDK}" IS_ELFISH)
-  if(SWIFT_ENABLE_GOLD_LINKER AND IS_ELFISH)
+  if(SWIFT_ENABLE_GOLD_LINKER AND
+     "${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_OBJECT_FORMAT}" STREQUAL "ELF")
     list(APPEND link_flags "-fuse-ld=gold")
   endif()
 
@@ -1532,8 +1522,8 @@ function(_add_swift_executable_single name)
         "-Xlinker" "@executable_path/../lib/swift/${SWIFT_SDK_${SWIFTEXE_SINGLE_SDK}_LIB_SUBDIR}")
   endif()
 
-  is_elfish_sdk("${SWIFTLIB_SINGLE_SDK}" IS_ELFISH)
-  if(SWIFT_ENABLE_GOLD_LINKER AND IS_ELFISH)
+  if(SWIFT_ENABLE_GOLD_LINKER AND
+     "${SWIFT_SDK_${SWIFTEXE_SINGLE_SDK}_OBJECT_FORMAT}" STREQUAL "ELF")
     list(APPEND link_flags "-fuse-ld=gold")
   endif()
 

stdlib/public/runtime/CMakeLists.txt

@@ -84,9 +84,8 @@ add_swift_library(swiftRuntime OBJECT_LIBRARY TARGET_LIBRARY
 
 set(ELFISH_SDKS)
 foreach(sdk ${SWIFT_CONFIGURED_SDKS})
-  is_elfish_sdk("${sdk}" IS_EFLISH)
-  if(IS_ELFISH)
-    list(APPEND EFLISH_SDKS "${sdk}")
+  if("${SWIFT_SDK_${sdk}_OBJECT_FORMAT}" STREQUAL "ELF")
+    list(APPEND ELFISH_SDKS "${sdk}")
   endif()
 endforeach()
 
@@ -102,39 +101,36 @@ add_swift_library(section_magic_end OBJECT_LIBRARY IS_STDLIB IS_STDLIB_CORE
     INSTALL_IN_COMPONENT never_install)
 
 set(object_target_list)
-foreach(sdk ${SWIFT_CONFIGURED_SDKS})
-  is_elfish_sdk("${sdk}" IS_ELFISH)
-  if(IS_ELFISH)
-    foreach(arch ${SWIFT_SDK_${sdk}_ARCHITECTURES})
-      set(arch_subdir "${SWIFT_SDK_${sdk}_LIB_SUBDIR}/${arch}")
-      set(arch_suffix "${SWIFT_SDK_${sdk}_LIB_SUBDIR}-${arch}")
-
-      set(section_magic_begin_name "section_magic_begin-${arch_suffix}")
-      set(section_magic_end_name "section_magic_end-${arch_suffix}")
-
-      add_custom_command_target(section_magic_${arch_suffix}_objects
-        COMMAND
-            "${CMAKE_COMMAND}" -E copy
-            "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${section_magic_begin_name}.dir/swift_sections.S${CMAKE_C_OUTPUT_EXTENSION}"
-            "${SWIFTLIB_DIR}/${arch_subdir}/swift_begin.o"
-        COMMAND
-            "${CMAKE_COMMAND}" -E copy
-            "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${section_magic_end_name}.dir/swift_sections.S${CMAKE_C_OUTPUT_EXTENSION}"
-            "${SWIFTLIB_DIR}/${arch_subdir}/swift_end.o"
-        OUTPUT
-            "${SWIFTLIB_DIR}/${arch_subdir}/swift_begin.o"
-            "${SWIFTLIB_DIR}/${arch_subdir}/swift_end.o"
-        DEPENDS
-            ${section_magic_begin_name}
-            ${section_magic_end_name})
-
-      list(APPEND object_target_list "${section_magic_${arch_suffix}_objects}")
-
-      swift_install_in_component(stdlib
-          FILES "${SWIFTLIB_DIR}/${arch_subdir}/swift_begin.o" "${SWIFTLIB_DIR}/${arch_subdir}/swift_end.o"
-          DESTINATION "lib/swift/${arch_subdir}")
-    endforeach()
-  endif()
+foreach(sdk ${ELFISH_SDKS})
+  foreach(arch ${SWIFT_SDK_${sdk}_ARCHITECTURES})
+    set(arch_subdir "${SWIFT_SDK_${sdk}_LIB_SUBDIR}/${arch}")
+    set(arch_suffix "${SWIFT_SDK_${sdk}_LIB_SUBDIR}-${arch}")
+
+    set(section_magic_begin_name "section_magic_begin-${arch_suffix}")
+    set(section_magic_end_name "section_magic_end-${arch_suffix}")
+
+    add_custom_command_target(section_magic_${arch_suffix}_objects
+      COMMAND
+          "${CMAKE_COMMAND}" -E copy
+          "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${section_magic_begin_name}.dir/swift_sections.S${CMAKE_C_OUTPUT_EXTENSION}"
+          "${SWIFTLIB_DIR}/${arch_subdir}/swift_begin.o"
+      COMMAND
+          "${CMAKE_COMMAND}" -E copy
+          "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${section_magic_end_name}.dir/swift_sections.S${CMAKE_C_OUTPUT_EXTENSION}"
+          "${SWIFTLIB_DIR}/${arch_subdir}/swift_end.o"
+      OUTPUT
+          "${SWIFTLIB_DIR}/${arch_subdir}/swift_begin.o"
+          "${SWIFTLIB_DIR}/${arch_subdir}/swift_end.o"
+      DEPENDS
+          ${section_magic_begin_name}
+          ${section_magic_end_name})
+
+    list(APPEND object_target_list "${section_magic_${arch_suffix}_objects}")
+
+    swift_install_in_component(stdlib
+        FILES "${SWIFTLIB_DIR}/${arch_subdir}/swift_begin.o" "${SWIFTLIB_DIR}/${arch_subdir}/swift_end.o"
+        DESTINATION "lib/swift/${arch_subdir}")
+  endforeach()
 endforeach()
 
 add_custom_target(section_magic ALL DEPENDS ${object_target_list})