Merge branch 'master' of github.com:apple/swift-corelibs-foundation into pr/241

# Conflicts:
#	Foundation/NSCoder.swift
#	Foundation/NSKeyedArchiver.swift

Author: phausler

CoreFoundation/Base.subproj/CFRuntime.c

@@ -1135,7 +1135,7 @@ void __CFInitialize(void) {
 #if (DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI) && !DEPLOYMENT_RUNTIME_SWIFT
         CFMachPortGetTypeID();
 #endif
-#if (DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS) && !DEPLOYMENT_RUNTIME_SWIFT
+#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS || DEPLOYMENT_TARGET_LINUX
         __CFStreamInitialize();
 #endif
 #if DEPLOYMENT_TARGET_WINDOWS
@@ -1159,6 +1159,7 @@ void __CFInitialize(void) {
 #endif
 #endif
 #if DEPLOYMENT_RUNTIME_SWIFT
+        _CFKeyedArchiverUIDGetTypeID();
         #ifndef __CFInitializeSwift
         #if TARGET_OS_LINUX
         #define __CFInitializeSwift _TF10Foundation19__CFInitializeSwiftFT_T_

CoreFoundation/Base.subproj/ForSwiftFoundationOnly.h

@@ -224,6 +224,20 @@ CF_PRIVATE CF_EXPORT void _cf_uuid_unparse_upper(const _cf_uuid_t uu, _cf_uuid_s
 
 
 CF_PRIVATE CF_EXPORT int32_t _CF_SOCK_STREAM();
+extern CFWriteStreamRef _CFWriteStreamCreateFromFileDescriptor(CFAllocatorRef alloc, int fd);
+#if !__COREFOUNDATION_FORFOUNDATIONONLY__
+typedef const struct __CFKeyedArchiverUID * CFKeyedArchiverUIDRef;
+extern CFTypeID _CFKeyedArchiverUIDGetTypeID(void);
+extern CFKeyedArchiverUIDRef _CFKeyedArchiverUIDCreate(CFAllocatorRef allocator, uint32_t value);
+extern uint32_t _CFKeyedArchiverUIDGetValue(CFKeyedArchiverUIDRef uid);
+#endif
+
+extern CFIndex __CFBinaryPlistWriteToStream(CFPropertyListRef plist, CFTypeRef stream);
+extern CFDataRef _CFPropertyListCreateXMLDataWithExtras(CFAllocatorRef allocator, CFPropertyListRef propertyList);
+extern CFWriteStreamRef _CFWriteStreamCreateFromFileDescriptor(CFAllocatorRef alloc, int fd);
+
+extern _Nullable CFDateRef CFCalendarCopyGregorianStartDate(CFCalendarRef calendar);
+extern void CFCalendarSetGregorianStartDate(CFCalendarRef calendar, CFDateRef date);
 
 CF_PRIVATE CF_EXPORT char *_Nonnull*_Nonnull _CFEnviron(void);