Merge commit 'c0662ed83227' from apple/stable/20210107 into swift/release/5.5

Author: git apple-llvm automerger

clang/lib/Driver/ToolChains/Darwin.cpp

@@ -2764,8 +2764,16 @@ void Darwin::addPlatformVersionArgs(const llvm::opt::ArgList &Args,
       }
       CmdArgs.push_back(Args.MakeArgString(SDKVersion.getAsString()));
     } else {
-      // Use a blank SDK version if it's not present.
-      CmdArgs.push_back("0.0.0");
+      // Use an SDK version that's matching the deployment target if the SDK
+      // version is missing. This is preferred over an empty SDK version (0.0.0)
+      // as the system's runtime might expect the linked binary to contain a
+      // valid SDK version in order for the binary to work correctly. It's
+      // reasonable to use the deployment target version as a proxy for the
+      // SDK version because older SDKs don't guarantee support for deployment
+      // targets newer than the SDK versions, so that rules out using some
+      // predetermined older SDK version, which leaves the deployment target
+      // version as the only reasonable choice.
+      CmdArgs.push_back(Args.MakeArgString(TargetVersion.getAsString()));
     }
   };
   EmitPlatformVersionArg(getOSTargetVersion(), TargetPlatform,

clang/test/Driver/darwin-ld-platform-version-macos.c

@@ -48,4 +48,7 @@
 // RUN: %clang -target x86_64-apple-macos10.13 -mlinker-version=520 \
 // RUN:   -### %t.o 2>&1 \
 // RUN:   | FileCheck --check-prefix=NOSDK %s
-// NOSDK: "-platform_version" "macos" "10.13.0" "0.0.0"
+// RUN: %clang -target x86_64-apple-darwin17 -mlinker-version=520 \
+// RUN:   -### %t.o 2>&1 \
+// RUN:   | FileCheck --check-prefix=NOSDK %s
+// NOSDK: "-platform_version" "macos" "10.13.0" "10.13.0"