Support Linux on z (#386)

* Add support for Linux s390x, use the corresponding mapping table for big
endian

* Fix endianness issues in Foundation

* Add s390x support in NSRange.swift

Author: vivkong

CoreFoundation/Base.subproj/CFInternal.h

@@ -343,6 +343,13 @@ CF_PRIVATE Boolean __CFProcessIsRestricted();
 CF_EXPORT void * __CFConstantStringClassReferencePtr;
 CF_EXPORT void *__CFConstantStringClassReference[];
 
+#if __CF_BIG_ENDIAN__
+#define CFINFO {0x00, 0x00, 0x07, 0xc8}
+#elif __CF_LITTLE_ENDIAN__
+#define CFINFO {0xc8, 0x07, 0x00, 0x00}
+#endif
+
+
 #ifdef __CONSTANT_CFSTRINGS__
 
 #if DEPLOYMENT_RUNTIME_SWIFT
@@ -353,59 +360,53 @@ CF_EXPORT void *__CFConstantStringClassReference[];
 #define CONST_STRING_SECTION
 #endif
 
+
 // TODO: Pinned retain count for constants?
 #define CONST_STRING_DECL(S, V) \
-const struct __CFConstStr __##S CONST_STRING_SECTION = {{(uintptr_t)&__CFConstantStringClassReference, _CF_CONSTANT_OBJECT_STRONG_RC, 0, {0xc8, 0x07, 0x00, 0x00}}, (uint8_t *)(V), sizeof(V) - 1}; \
+const struct __CFConstStr __##S CONST_STRING_SECTION = {{(uintptr_t)&__CFConstantStringClassReference, _CF_CONSTANT_OBJECT_STRONG_RC, 0, CFINFO}, (uint8_t *)(V), sizeof(V) - 1}; \
 const CFStringRef S = (CFStringRef)&__##S;
 
 #define PE_CONST_STRING_DECL(S, V) \
-const static struct __CFConstStr __##S CONST_STRING_SECTION = {{(uintptr_t)&__CFConstantStringClassReference, _CF_CONSTANT_OBJECT_STRONG_RC, 0, {0xc8, 0x07, 0x00, 0x00}}, (uint8_t *)(V), sizeof(V) - 1}; \
+const static struct __CFConstStr __##S CONST_STRING_SECTION = {{(uintptr_t)&__CFConstantStringClassReference, _CF_CONSTANT_OBJECT_STRONG_RC, 0, CFINFO}, (uint8_t *)(V), sizeof(V) - 1}; \
 CF_PRIVATE const CFStringRef S = (CFStringRef)&__##S;
 
+
 #else
 
 #define CONST_STRING_DECL(S, V) \
-const struct __CFConstStr __##S = {{(uintptr_t)&__CFConstantStringClassReference, _CFSWIFT_RC_INIT {0xc8, 0x07, 0x00, 0x00}}, (uint8_t *)(V), sizeof(V) - 1}; \
+const struct __CFConstStr __##S = {{(uintptr_t)&__CFConstantStringClassReference, _CFSWIFT_RC_INIT CFINFO}, (uint8_t *)(V), sizeof(V) - 1}; \
 const CFStringRef S = (CFStringRef)&__##S;
 
 #define PE_CONST_STRING_DECL(S, V) \
-const static struct __CFConstStr __##S = {{(uintptr_t)&__CFConstantStringClassReference, _CFSWIFT_RC_INIT {0xc8, 0x07, 0x00, 0x00}}, (uint8_t *)(V), sizeof(V) - 1}; \
+const static struct __CFConstStr __##S = {{(uintptr_t)&__CFConstantStringClassReference, _CFSWIFT_RC_INIT CFINFO}, (uint8_t *)(V), sizeof(V) - 1}; \
 CF_PRIVATE const CFStringRef S = (CFStringRef)&__##S;
 
+
 #endif
 
 #else
 
 struct CF_CONST_STRING {
     CFRuntimeBase _base;
     uint8_t *_ptr;
+#if defined(__LP64__) && defined(__BIG_ENDIAN__)
+    uint64_t _length;
+#else
     uint32_t _length;
+#endif
 };
 
 CF_EXPORT int __CFConstantStringClassReference[];
 
 /* CFNetwork also has a copy of the CONST_STRING_DECL macro (for use on platforms without constant string support in cc); please warn cfnetwork-core@group.apple.com of any necessary changes to this macro. -- REW, 1/28/2002 */
 
-#if __CF_BIG_ENDIAN__
-
-#define CONST_STRING_DECL(S, V)			\
-static struct CF_CONST_STRING __ ## S ## __ = {{(uintptr_t)&__CFConstantStringClassReference, {0x00, 0x00, 0x07, 0xc8}}, (uint8_t *)V, sizeof(V) - 1}; \
-const CFStringRef S = (CFStringRef) & __ ## S ## __;
-#define PE_CONST_STRING_DECL(S, V)			\
-static struct CF_CONST_STRING __ ## S ## __ = {{(uintptr_t)&__CFConstantStringClassReference, {0x00, 0x00, 0x07, 0xc8}}, (uint8_t *)V, sizeof(V) - 1}; \
-CF_PRIVATE const CFStringRef S = (CFStringRef) & __ ## S ## __;
-
-#elif __CF_LITTLE_ENDIAN__
-
 #define CONST_STRING_DECL(S, V)			\
-static struct CF_CONST_STRING __ ## S ## __ = {{(uintptr_t)&__CFConstantStringClassReference, {0xc8, 0x07, 0x00, 0x00}}, (uint8_t *)(V), sizeof(V) - 1}; \
+static struct CF_CONST_STRING __ ## S ## __ = {{(uintptr_t)&__CFConstantStringClassReference, CFINFO}, (uint8_t *)(V), sizeof(V) - 1}; \
 const CFStringRef S = (CFStringRef) & __ ## S ## __;
 #define PE_CONST_STRING_DECL(S, V)			\
-static struct CF_CONST_STRING __ ## S ## __ = {{(uintptr_t)&__CFConstantStringClassReference, {0xc8, 0x07, 0x00, 0x00}}, (uint8_t *)(V), sizeof(V) - 1}; \
+static struct CF_CONST_STRING __ ## S ## __ = {{(uintptr_t)&__CFConstantStringClassReference, CFINFO}, (uint8_t *)(V), sizeof(V) - 1}; \
 CF_PRIVATE const CFStringRef S = (CFStringRef) & __ ## S ## __;
 
-#endif
-
 #endif // __CONSTANT_CFSTRINGS__
 
 CF_EXPORT bool __CFOASafe;

CoreFoundation/Base.subproj/SwiftRuntime/TargetConditionals.h

@@ -107,6 +107,7 @@
 #define TARGET_CPU_ARM64        0
 #define TARGET_CPU_MIPS         0
 #define TARGET_CPU_MIPS64       0
+#define TARGET_CPU_S390X        0
 #elif __arm64__ || __aarch64__
 #define TARGET_CPU_PPC          0
 #define TARGET_CPU_PPC64        0
@@ -116,6 +117,7 @@
 #define TARGET_CPU_ARM64        1
 #define TARGET_CPU_MIPS         0
 #define TARGET_CPU_MIPS64       0
+#define TARGET_CPU_S390X        0
 #elif __mips64__
 #define TARGET_CPU_PPC          0
 #define TARGET_CPU_PPC64        0
@@ -125,6 +127,7 @@
 #define TARGET_CPU_ARM64        0
 #define TARGET_CPU_MIPS         0
 #define TARGET_CPU_MIPS64       1
+#define TARGET_CPU_S390X        0
 #elif __powerpc64__
 #define TARGET_CPU_PPC          0
 #define TARGET_CPU_PPC64        1
@@ -134,6 +137,7 @@
 #define TARGET_CPU_ARM64        0
 #define TARGET_CPU_MIPS         0
 #define TARGET_CPU_MIPS64       0
+#define TARGET_CPU_S390X        0
 #elif __i386__
 #define TARGET_CPU_PPC          0
 #define TARGET_CPU_PPC64        0
@@ -143,6 +147,7 @@
 #define TARGET_CPU_ARM64        0
 #define TARGET_CPU_MIPS         0
 #define TARGET_CPU_MIPS64       0
+#define TARGET_CPU_S390X        0
 #elif __arm__
 #define TARGET_CPU_PPC          0
 #define TARGET_CPU_PPC64        0
@@ -152,6 +157,7 @@
 #define TARGET_CPU_ARM64        0
 #define TARGET_CPU_MIPS         0
 #define TARGET_CPU_MIPS64       0
+#define TARGET_CPU_S390X        0
 #elif __mips__
 #define TARGET_CPU_PPC          0
 #define TARGET_CPU_PPC64        0
@@ -161,6 +167,7 @@
 #define TARGET_CPU_ARM64        0
 #define TARGET_CPU_MIPS         1
 #define TARGET_CPU_MIPS64       0
+#define TARGET_CPU_S390X        0
 #elif __powerpc__
 #define TARGET_CPU_PPC          1
 #define TARGET_CPU_PPC64        0
@@ -170,6 +177,17 @@
 #define TARGET_CPU_ARM64        0
 #define TARGET_CPU_MIPS         0
 #define TARGET_CPU_MIPS64       0
+#define TARGET_CPU_S390X        0
+#elif __s390x__
+#define TARGET_CPU_PPC          0
+#define TARGET_CPU_PPC64        0
+#define TARGET_CPU_X86          0
+#define TARGET_CPU_X86_64       0
+#define TARGET_CPU_ARM          0
+#define TARGET_CPU_ARM64        0
+#define TARGET_CPU_MIPS         0
+#define TARGET_CPU_MIPS64       0
+#define TARGET_CPU_S390X        1
 #else
 #error unknown architecture
 #endif

CoreFoundation/String.subproj/CFString.h

@@ -165,7 +165,11 @@ struct __CFConstStr {
         uint8_t _pad[4];
     } _base;
     uint8_t *_ptr;
+#if defined(__LP64__) && defined(__BIG_ENDIAN__)
+    uint64_t _length;
+#else
     uint32_t _length;
+#endif
 };
 
 #if DEPLOYMENT_TARGET_LINUX
@@ -174,10 +178,17 @@ struct __CFConstStr {
 #define CONST_STRING_LITERAL_SECTION
 #endif
 
+#if __BIG_ENDIAN__
+#define CFSTR(cStr)  ({ \
+static struct __CFConstStr str CONST_STRING_LITERAL_SECTION = {{(uintptr_t)&__CFConstantStringClassReference, _CF_CONSTANT_OBJECT_STRONG_RC, 0, {0x00, 0x00, 0x07, 0xc8}, {0x00, 0x00, 0x00, 0x00}}, (uint8_t *)(cStr), sizeof(cStr) - 1}; \
+(CFStringRef)&str; \
+})
+#else
 #define CFSTR(cStr)  ({ \
 static struct __CFConstStr str CONST_STRING_LITERAL_SECTION = {{(uintptr_t)&__CFConstantStringClassReference, _CF_CONSTANT_OBJECT_STRONG_RC, 0, {0xc8, 0x07, 0x00, 0x00}, {0x00, 0x00, 0x00, 0x00}}, (uint8_t *)(cStr), sizeof(cStr) - 1}; \
 (CFStringRef)&str; \
 })
+#endif
 
 #else
 

CoreFoundation/String.subproj/CFUnicodeDataL.S renamed to CoreFoundation/String.subproj/CFUnicodeData.S

@@ -1,12 +1,25 @@
 // This source file is part of the Swift.org open source project
 //
-// Copyright (c) 2014 - 2015 Apple Inc. and the Swift project authors
+// Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
 // Licensed under Apache License v2.0 with Runtime Library Exception
 //
 // See http://swift.org/LICENSE.txt for license information
 // See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
 //
 
+#if defined(__BIG_ENDIAN__)
+    .global __CFUnicodeDataB
+__CFUnicodeDataB:
+    .incbin "CoreFoundation/CharacterSets/CFUnicodeData-B.mapping"
+
+    .global __CFUnicodeDataBEnd
+__CFUnicodeDataBEnd:
+    .byte 0
+
+    .global __CFUnicodeDataBSize
+__CFUnicodeDataBSize:
+    .int __CFUnicodeDataBEnd - __CFUnicodeDataB
+#else
     .global __CFUnicodeDataL
 __CFUnicodeDataL:
     .incbin "CoreFoundation/CharacterSets/CFUnicodeData-L.mapping"
@@ -18,3 +31,4 @@ __CFUnicodeDataLEnd:
     .global __CFUnicodeDataLSize
 __CFUnicodeDataLSize:
     .int __CFUnicodeDataLEnd - __CFUnicodeDataL
+#endif

CoreFoundation/StringEncodings.subproj/CFUniChar.c

@@ -320,13 +320,21 @@ static bool __CFUniCharLoadFile(const wchar_t *bitmapName, const void **bytes, i
     return *bytes ? true : false;
 #elif USE_RAW_SYMBOL
     extern void *__CFCharacterSetBitmapData;
+#if __CF_BIG_ENDIAN__
+    extern void *__CFUnicodeDataB;
+#else
     extern void *__CFUnicodeDataL;
+#endif
     extern void *__CFUniCharPropertyDatabase;
 
     if (strcmp(bitmapName, CF_UNICHAR_BITMAP_FILE) == 0) {
         *bytes = &__CFCharacterSetBitmapData;
     } else if (strcmp(bitmapName, MAPPING_TABLE_FILE) == 0) {
+#if __CF_BIG_ENDIAN__
+        *bytes = &__CFUnicodeDataB;
+#else
         *bytes = &__CFUnicodeDataL;
+#endif
     } else if (strcmp(bitmapName, PROP_DB_FILE) == 0) {
         *bytes = &__CFUniCharPropertyDatabase;
     }

Foundation/NSRange.swift

@@ -89,7 +89,7 @@ extension NSRange: NSSpecialValueCoding {
     static func objCType() -> String {
 #if arch(i386) || arch(arm)
         return "{_NSRange=II}"
-#elseif arch(x86_64) || arch(arm64)
+#elseif arch(x86_64) || arch(arm64) || arch(s390x)
         return "{_NSRange=QQ}"
 #else
         NSUnimplemented()

build.py

@@ -259,7 +259,7 @@
 	'CoreFoundation/URL.subproj/CFURLComponents.c',
 	'CoreFoundation/URL.subproj/CFURLComponents_URIParser.c',
 	'CoreFoundation/String.subproj/CFCharacterSetData.S',
-	'CoreFoundation/String.subproj/CFUnicodeDataL.S',
+	'CoreFoundation/String.subproj/CFUnicodeData.S',
 	'CoreFoundation/String.subproj/CFUniCharPropertyDatabase.S',
 	'CoreFoundation/String.subproj/CFRegularExpression.c',
 	'CoreFoundation/String.subproj/CFAttributedString.c',

lib/target.py

@@ -52,6 +52,7 @@ class ArchType:
     kalimba     = 38
     shave       = 39
     armv6       = 40
+    s390x       = 41
 # Do not assume that these are 1:1 mapping.  This should follow
 # canonical naming conventions for arm, etc. architectures.
 # See apple/swift PR #608    
@@ -137,6 +138,8 @@ def to_string(value):
             return "kalimba"
         if value == ArchType.shave:
             return "shave"
+        if value == ArchType.s390x:
+            return "s390x"
         return "unknown"
 # Not 1:1, See to_string
     @staticmethod
@@ -227,6 +230,8 @@ def from_string(string):
             return ArchType.kalimba
         if string == "shave":
             return ArchType.shave
+        if string == "s390x":
+            return ArchType.s390x
 
         return ArchType.UnknownArch