Merge remote-tracking branch 'origin/master' into master-next

Author: swift-ci

cmake/modules/AddSwift.cmake

@@ -517,8 +517,12 @@ function(_add_variant_link_flags)
         NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WINDOWS"))
       list(APPEND result "-fuse-ld=lld")
     elseif(SWIFT_ENABLE_GOLD_LINKER AND
-       "${SWIFT_SDK_${LFLAGS_SDK}_OBJECT_FORMAT}" STREQUAL "ELF")
-      list(APPEND result "-fuse-ld=gold")
+        "${SWIFT_SDK_${LFLAGS_SDK}_OBJECT_FORMAT}" STREQUAL "ELF")
+      if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)
+        list(APPEND result "-fuse-ld=gold.exe")
+      else()
+        list(APPEND result "-fuse-ld=gold")
+      endif()
     endif()
   endif()