Update a few more symbol names; move the logic into the .c file instead of the header

Author: parkera

CoreFoundation/Base.subproj/CFRuntime.c

@@ -1048,6 +1048,16 @@ void __CFInitialize(void) {
 
 
 #if DEPLOYMENT_RUNTIME_SWIFT
+
+        #ifndef __CFSwiftGetBaseClass
+        #if TARGET_OS_LINUX
+        #define __CFSwiftGetBaseClass _TF10Foundation21__CFSwiftGetBaseClassFT_PMPs9AnyObject_
+        #elif TARGET_OS_MAC
+        #define __CFSwiftGetBaseClass _TF15SwiftFoundation21__CFSwiftGetBaseClassFT_PMPs9AnyObject_
+        #endif
+        #endif
+        extern uintptr_t __CFSwiftGetBaseClass();        
+
         uintptr_t NSCFType = __CFSwiftGetBaseClass();
         for (CFIndex idx = 1; idx < __CFRuntimeClassTableSize; idx++) {
             __CFRuntimeObjCClassTable[idx] = NSCFType;
@@ -1151,6 +1161,14 @@ void __CFInitialize(void) {
 #endif
 #endif
 #if DEPLOYMENT_RUNTIME_SWIFT
+        #ifndef __CFInitializeSwift
+        #if TARGET_OS_LINUX
+        #define __CFInitializeSwift _TF10Foundation19__CFInitializeSwiftFT_T_
+        #elif TARGET_OS_MAC
+        #define __CFInitializeSwift _TF15SwiftFoundation19__CFInitializeSwiftFT_T_
+        #endif
+        #endif
+        extern void __CFInitializeSwift();
         __CFInitializeSwift();
 #endif
         {

CoreFoundation/Base.subproj/DarwinSymbolAliases

@@ -1,7 +1,7 @@
 
 
 # This is specific to Swift open source; Foundation's NSCFConstantString is used as our constant string class reference
-__TMdC15SwiftFoundation19_NSCFConstantString ___CFConstantStringClassReference
+__TMC15SwiftFoundation19_NSCFConstantString ___CFConstantStringClassReference
 
 _kCFCalendarIdentifierBuddhist		_kCFBuddhistCalendar
 _kCFCalendarIdentifierChinese		_kCFChineseCalendar

CoreFoundation/Base.subproj/ForSwiftFoundationOnly.h

@@ -37,24 +37,6 @@ typedef struct __CFSwiftObject *CFSwiftRef;
     } \
 } while (0)
 
-#ifndef __CFSwiftGetBaseClass
-#if TARGET_OS_LINUX
-#define __CFSwiftGetBaseClass _TF10Foundation21__CFSwiftGetBaseClassFT_PMPs9AnyObject_
-#elif TARGET_OS_MAC
-#define __CFSwiftGetBaseClass _TF15SwiftFoundation21__CFSwiftGetBaseClassFT_PMPSs9AnyObject_
-#endif
-#endif
-extern uintptr_t __CFSwiftGetBaseClass();
-
-#ifndef __CFInitializeSwift
-#if TARGET_OS_LINUX
-#define __CFInitializeSwift _TF10Foundation19__CFInitializeSwiftFT_T_
-#elif TARGET_OS_MAC
-#define __CFInitializeSwift _TF15SwiftFoundation19__CFInitializeSwiftFT_T_
-#endif
-#endif
-extern void __CFInitializeSwift();
-
 extern bool _CFIsSwift(CFTypeID type, CFSwiftRef obj);
 extern void _CFDeinit(CFTypeRef cf);
 

CoreFoundation/Base.subproj/SymbolAliases

@@ -1,7 +1,7 @@
 
 
 # This is specific to Swift open source; Foundation's NSCFConstantString is used as our constant string class reference
-__TMdC15SwiftFoundation19_NSCFConstantString ___CFConstantStringClassReference
+__TMC15SwiftFoundation19_NSCFConstantString ___CFConstantStringClassReference
 
 _kCFCalendarIdentifierBuddhist		_kCFBuddhistCalendar
 _kCFCalendarIdentifierChinese		_kCFChineseCalendar