Revert upstream trunk change to CoreFoundation that breaks the SDK build

Author: finagolfin

.github/workflows/sdks.yml

@@ -128,6 +128,7 @@ jobs:
             sed -i "s%abort(void) %abort(void);// %" android-ndk-r23/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/stdlib.h
           elif [ ${{ matrix.version }} = 'trunk' ]; then
             EXTRA_FLAGS="--skip-early-swift-driver"
+            git apply foundation-trunk-fix.patch
           fi
 
           ./swift/utils/build-script -RA --skip-build-cmark --build-llvm=0 --android --android-ndk $NDK --android-arch ${{ matrix.arch }} --android-api-level $ANDROID_API_LEVEL --android-icu-uc $SDK/usr/lib/libicuuc.so --android-icu-uc-include $SDK/usr/include --android-icu-i18n $SDK/usr/lib/libicui18n.so --android-icu-i18n-include $SDK/usr/include --android-icu-data $SDK/usr/lib/libicudata.so --build-swift-tools=0 --native-swift-tools-path=`pwd`/$SWIFT_TAG-ubuntu20.04/usr/bin --native-clang-tools-path=$NDK/toolchains/llvm/prebuilt/linux-x86_64/bin --cross-compile-hosts=android-${{ matrix.arch }} --cross-compile-deps-path=$SDK --skip-local-build --xctest --install-swift --install-libdispatch --install-foundation --install-xctest --install-destdir=$SDK --swift-install-components='clang-resource-dir-symlink;license;stdlib;sdk-overlay' $EXTRA_FLAGS

foundation-trunk-fix.patch

@@ -0,0 +1,21 @@
+diff --git a/swift-corelibs-foundation/CoreFoundation/Base.subproj/CFAvailability.h b/swift-corelibs-foundation/CoreFoundation/Base.subproj/CFAvailability.h
+index d790782a..ef4b6edb 100644
+--- a/swift-corelibs-foundation/CoreFoundation/Base.subproj/CFAvailability.h
++++ b/swift-corelibs-foundation/CoreFoundation/Base.subproj/CFAvailability.h
+@@ -135,13 +135,13 @@
+ #define __CF_ENUM_FIXED_IS_AVAILABLE (__cplusplus && __cplusplus >= 201103L && (__has_extension(cxx_strong_enums) || __has_feature(objc_fixed_enum))) || (!__cplusplus && (__has_feature(objc_fixed_enum) || __has_extension(cxx_fixed_enum)))
+ 
+ #if __CF_ENUM_FIXED_IS_AVAILABLE
+-#define __CF_NAMED_ENUM(_type, _name)     enum __CF_ENUM_ATTRIBUTES _name : _type _name; enum _name : _type
++#define __CF_NAMED_ENUM(_type, _name)     int __CF_ENUM_ ## _name; enum __CF_ENUM_ATTRIBUTES _name : _type; typedef enum _name _name; enum _name : _type
+ #define __CF_ANON_ENUM(_type)             enum __CF_ENUM_ATTRIBUTES : _type
+-#define CF_CLOSED_ENUM(_type, _name)      enum __CF_CLOSED_ENUM_ATTRIBUTES _name : _type _name; enum _name : _type
++#define CF_CLOSED_ENUM(_type, _name)      int __CF_ENUM_ ## _name; enum __CF_CLOSED_ENUM_ATTRIBUTES _name : _type; typedef enum _name _name; enum _name : _type
+ #if (__cplusplus)
+ #define CF_OPTIONS(_type, _name) _type _name; enum __CF_OPTIONS_ATTRIBUTES : _type
+ #else
+-#define CF_OPTIONS(_type, _name) enum __CF_OPTIONS_ATTRIBUTES _name : _type _name; enum _name : _type
++#define CF_OPTIONS(_type, _name) int __CF_OPTIONS_ ## _name; enum __CF_OPTIONS_ATTRIBUTES _name : _type; typedef enum _name _name; enum _name : _type
+ #endif
+ #else
+ #define __CF_NAMED_ENUM(_type, _name) _type _name; enum