Merge pull request #1699 from eeckstein/mangling-prefix

Adapt for the mangling prefix change ($S -> $s)

Author: eeckstein

CoreFoundation/Base.subproj/CFInternal.h

@@ -409,9 +409,9 @@ CF_EXPORT void * __CFConstantStringClassReferencePtr;
 #if DEPLOYMENT_RUNTIME_SWIFT
 
 #if TARGET_OS_MAC
-#define __CFConstantStringClassReference $S15SwiftFoundation19_NSCFConstantStringCN
+#define __CFConstantStringClassReference $s15SwiftFoundation19_NSCFConstantStringCN
 #else
-#define __CFConstantStringClassReference $S10Foundation19_NSCFConstantStringCN
+#define __CFConstantStringClassReference $s10Foundation19_NSCFConstantStringCN
 #endif
 
 CF_EXPORT void *__CFConstantStringClassReference[];

CoreFoundation/Base.subproj/SymbolAliases

@@ -98,3 +98,8 @@ _kCFNumberFormatterZeroSymbolKey		_kCFNumberFormatterZeroSymbol
 _kCFNumberFormatterUsesCharacterDirectionKey	_kCFNumberFormatterUsesCharacterDirection
 _kCFDateFormatterUsesCharacterDirectionKey	_kCFDateFormatterUsesCharacterDirection
 _kCFDateFormatterCalendarIdentifierKey		_kCFDateFormatterCalendarName
+
+# Workaround for being able to compile with a swift compiler with the old mangling prefix $S.
+# This can eventually be removed if everyone compiles with the ABI-stable Swift 5.0 compiler.
+_$S15SwiftFoundation19_NSCFConstantStringCN	_$s15SwiftFoundation19_NSCFConstantStringCN
+