Skip to content

[Xcode] Don’t use a bridging header in a framework target #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 20, 2023
Merged

[Xcode] Don’t use a bridging header in a framework target #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion Sources/Atomics/Unmanaged extensions.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,14 @@
#if ATOMICS_NATIVE_BUILTINS
import Swift
#endif
#if !ATOMICS_SINGLE_MODULE

#if ATOMICS_SINGLE_MODULE
@_silgen_name("_sa_retain_n")
internal func _sa_retain_n(_ object: UnsafeMutableRawPointer, _ delta: UInt32)

@_silgen_name("_sa_release_n")
internal func _sa_release_n(_ object: UnsafeMutableRawPointer, _ delta: UInt32)
#else
import _AtomicsShims
#endif

Expand Down
10 changes: 8 additions & 2 deletions Sources/_AtomicsShims/include/_AtomicsShims.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@
#define SWIFTATOMIC_SWIFT_NAME(name) __attribute__((swift_name(#name)))
#define SWIFTATOMIC_ALIGNED(alignment) __attribute__((aligned(alignment)))

#if __has_attribute(swiftcall)
# define SWIFTATOMIC_SWIFTCC __attribute__((swiftcall))
#else
# define SWIFTATOMIC_SWIFTCC
#endif

#if ATOMICS_SINGLE_MODULE
# if __has_attribute(visibility) && !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(_WIN32)
# define SWIFTATOMIC_SHIMS_EXPORT __attribute__((visibility("hidden")))
Expand Down Expand Up @@ -228,7 +234,7 @@ SWIFTATOMIC_DEFINE_TYPE(DoubleWord, _sa_dword)

#endif //!defined(ATOMICS_NATIVE_BUILTINS) && defined(__swift__)

SWIFTATOMIC_SHIMS_EXPORT void _sa_retain_n(void *object, uint32_t n);
SWIFTATOMIC_SHIMS_EXPORT void _sa_release_n(void *object, uint32_t n);
SWIFTATOMIC_SWIFTCC SWIFTATOMIC_SHIMS_EXPORT void _sa_retain_n(void *object, uint32_t n);
SWIFTATOMIC_SWIFTCC SWIFTATOMIC_SHIMS_EXPORT void _sa_release_n(void *object, uint32_t n);

#endif //SWIFTATOMIC_HEADER_INCLUDED
1 change: 0 additions & 1 deletion Xcode/Atomics.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ VERSION_INFO_PREFIX =
DYLIB_COMPATIBILITY_VERSION = $(CURRENT_PROJECT_VERSION)
DYLIB_CURRENT_VERSION = $(CURRENT_PROJECT_VERSION)

SWIFT_OBJC_BRIDGING_HEADER = ../Sources/_AtomicsShims/include/_AtomicsShims.h
OTHER_SWIFT_FLAGS = $(inherited) -Xfrontend -parse-stdlib
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) ATOMICS_SINGLE_MODULE=1 ATOMICS_NATIVE_BUILTINS=1

Expand Down
5 changes: 0 additions & 5 deletions Xcode/AtomicsTests.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,6 @@ PRODUCT_BUNDLE_IDENTIFIER = org.swift.AtomicsTests
SUPPORTED_PLATFORMS = macosx iphoneos iphonesimulator watchos watchsimulator appletvos appletvsimulator
ARCHS = $(ARCHS_STANDARD)

MACOSX_DEPLOYMENT_TARGET = 12.0
IPHONEOS_DEPLOYMENT_TARGET = 15.0
WATCHOS_DEPLOYMENT_TARGET = 8.0
TVOS_DEPLOYMENT_TARGET = 15.0

CURRENT_PROJECT_VERSION = 1
MARKETING_VERSION = 1.0

Expand Down