Merge pull request #14830 from graydon/typo-fix-plaform-platform

Author: swift-ci

include/swift/AST/DiagnosticsParse.def

@@ -1521,7 +1521,7 @@ WARNING(unknown_platform_condition_argument,none,
       "unknown %0 for build configuration '%1'",
       (StringRef, StringRef))
 WARNING(likely_simulator_platform_condition,none,
-      "plaform condition appears to be testing for simulator environment; "
+      "platform condition appears to be testing for simulator environment; "
       "use 'targetEnvironment(simulator)' instead",
       ())
 

test/Parse/ConditionalCompilation/simulatorTargetEnv.swift

@@ -14,26 +14,26 @@ var x = C()
 var y = x
 
 #if os(iOS) && arch(i386)
-// expected-warning @-1 {{plaform condition appears to be testing for simulator environment}} {{5-26=targetEnvironment(simulator)}}
+// expected-warning @-1 {{platform condition appears to be testing for simulator environment}} {{5-26=targetEnvironment(simulator)}}
 class C1 {}
 #endif
 
 #if arch(i386) && os(iOS)
-// expected-warning @-1 {{plaform condition appears to be testing for simulator environment}} {{5-26=targetEnvironment(simulator)}}
+// expected-warning @-1 {{platform condition appears to be testing for simulator environment}} {{5-26=targetEnvironment(simulator)}}
 class C2 {}
 #endif
 
 #if arch(i386) && (os(iOS) || os(watchOS))
-// expected-warning @-1 {{plaform condition appears to be testing for simulator environment}} {{5-43=targetEnvironment(simulator)}}
+// expected-warning @-1 {{platform condition appears to be testing for simulator environment}} {{5-43=targetEnvironment(simulator)}}
 class C3 {}
 #endif
 
 #if (arch(x86_64) || arch(i386)) && (os(iOS) || os(watchOS) || os(tvOS))
-// expected-warning @-1 {{plaform condition appears to be testing for simulator environment}} {{5-73=targetEnvironment(simulator)}}
+// expected-warning @-1 {{platform condition appears to be testing for simulator environment}} {{5-73=targetEnvironment(simulator)}}
 class C4 {}
 #endif
 
 #if !(arch(x86_64) && os(tvOS))
-// expected-warning @-1 {{plaform condition appears to be testing for simulator environment}} {{7-31=targetEnvironment(simulator)}}
+// expected-warning @-1 {{platform condition appears to be testing for simulator environment}} {{7-31=targetEnvironment(simulator)}}
 class C5 {}
 #endif

utils/gen-static-stdlib-link-args

@@ -2,7 +2,7 @@
 
 #
 # Generate the static-stdlib-args.lnk used by the -static-stdlib option for
-# 'GenericUnix' (eg linux) plaforms. Tries to find static .a files for libs
+# 'GenericUnix' (eg linux) platforms. Tries to find static .a files for libs
 # not normally installed by default (currently libicu)
 # If libicu is built locally then include libicudata
 #