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

Author: swift-ci

cmake/modules/AddSwift.cmake

@@ -416,6 +416,11 @@ function(_add_variant_link_flags)
     endif()
     swift_windows_lib_for_arch(${LFLAGS_ARCH} ${LFLAGS_ARCH}_LIB)
     list(APPEND library_search_directories ${${LFLAGS_ARCH}_LIB})
+
+    # NOTE(compnerd) workaround incorrectly extensioned import libraries from
+    # the Windows SDK on case sensitive file systems.
+    list(APPEND library_search_directories
+         ${CMAKE_BINARY_DIR}/winsdk_lib_${LFLAGS_ARCH}_symlinks)
   elseif("${LFLAGS_SDK}" STREQUAL "HAIKU")
     list(APPEND result "-lbsd" "-latomic" "-Wl,-Bsymbolic")
   elseif("${LFLAGS_SDK}" STREQUAL "ANDROID")

cmake/modules/SwiftConfigureSDK.cmake

@@ -270,6 +270,26 @@ macro(configure_sdk_windows name environment architectures)
     # to the driver -- rely on the `INCLUDE` AND `LIB` environment variables
     # instead.
     set(SWIFT_SDK_${prefix}_ARCH_${arch}_PATH "/")
+
+    # NOTE(compnerd) workaround incorrectly extensioned import libraries from
+    # the Windows SDK on case sensitive file systems.
+    swift_windows_arch_spelling(${arch} WinSDKArchitecture)
+    set(WinSDK${arch}UMDir "$ENV{UniversalCRTSdkDir}/Lib/$ENV{UCRTVersion}/um/${WinSDKArchitecture}")
+    set(OverlayDirectory "${CMAKE_BINARY_DIR}/winsdk_lib_${arch}_symlinks")
+
+    file(MAKE_DIRECTORY ${OverlayDirectory})
+
+    file(GLOB libraries RELATIVE "${WinSDK${arch}UMDir}" "${WinSDK${arch}UMDir}/*")
+    foreach(library ${libraries})
+      get_filename_component(name_we "${library}" NAME_WE)
+      get_filename_component(ext "${library}" EXT)
+      string(TOLOWER "${ext}" lowercase_ext)
+      set(lowercase_ext_symlink_name "${name_we}${lowercase_ext}")
+      if(NOT library STREQUAL lowercase_ext_symlink_name)
+        execute_process(COMMAND
+                        "${CMAKE_COMMAND}" -E create_symlink "${WinSDK${arch}UMDir}/${library}" "${OverlayDirectory}/${lowercase_ext_symlink_name}")
+      endif()
+    endforeach()
   endforeach()
 
   # Add this to the list of known SDKs.

lib/ClangImporter/ClangImporter.cpp

@@ -535,7 +535,7 @@ getNormalInvocationArguments(std::vector<std::string> &invocationArgStrs,
     // using Glibc or a libc that respects that flag. This will cause some
     // source breakage however (specifically with strerror_r()) on Linux
     // without a workaround.
-    if (triple.isOSFuchsia()) {
+    if (triple.isOSFuchsia() || triple.isAndroid()) {
       // Many of the modern libc features are hidden behind feature macros like
       // _GNU_SOURCE or _XOPEN_SOURCE.
       invocationArgStrs.insert(invocationArgStrs.end(), {

stdlib/public/Platform/tgmath.swift.gyb

@@ -292,8 +292,8 @@ public func ${bfunc}(_ lhs: ${T}, _ rhs: ${T}) -> ${T} {
 %  if T == 'Float80':
 #if (arch(i386) || arch(x86_64)) && !os(Windows)
 %  else:
-//  lgamma not avaialable on Windows, apparently?
-#if !os(Windows) && !os(Android)
+//  lgamma not available on Windows, apparently?
+#if !os(Windows)
 %  end
 @_transparent
 public func lgamma(_ x: ${T}) -> (${T}, Int) {