Merge pull request #3466 from ruscur/powerpc64-fixes

powerpc64{le} build and test fixes

Author: gribozavr

utils/swift_build_support/swift_build_support/targets.py

@@ -116,8 +116,8 @@ class StdlibDeploymentTarget(object):
         "armv6",
         "armv7",
         "aarch64",
-        "ppc64",
-        "ppc64le",
+        "powerpc64",
+        "powerpc64le",
         "s390x"])
 
     FreeBSD = Platform("freebsd", archs=["x86_64"])
@@ -163,9 +163,9 @@ def host_target():
             elif machine == 'aarch64':
                 return StdlibDeploymentTarget.Linux.aarch64
             elif machine == 'ppc64':
-                return StdlibDeploymentTarget.Linux.ppc64
+                return StdlibDeploymentTarget.Linux.powerpc64
             elif machine == 'ppc64le':
-                return StdlibDeploymentTarget.Linux.ppc64le
+                return StdlibDeploymentTarget.Linux.powerpc64le
             elif machine == 's390x':
                 return StdlibDeploymentTarget.Linux.s390x
 

validation-test/stdlib/Glibc.swift

@@ -27,7 +27,7 @@ GlibcTestSuite.test("errno") {
 var GlibcIoctlConstants = TestSuite("GlibcIoctlConstants")
 
 GlibcIoctlConstants.test("tty ioctl constants availability") {
-  let aConstant = TIOCGWINSZ
+  let aConstant = TIOCSTI
 }
 
 runAllTests()

validation-test/stdlib/Prototypes/PersistentVector.swift.gyb

@@ -198,7 +198,7 @@ struct _${name}Bitmap {
 %   if underlyingType == 'UInt':
 #if arch(i386) || arch(arm)
     return Int(Builtin.int_ctpop_Int32(_bits._value))
-#elseif arch(x86_64) || arch(arm64)
+#elseif arch(x86_64) || arch(arm64) || arch(powerpc64) || arch(powerpc64le)
     return Int(Builtin.int_ctpop_Int64(_bits._value))
 #endif
 %   elif underlyingType == 'UInt32':