Skip to content

Add necessary missing TARGET_OS_BSD directives. #2990

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.

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 29, 2021

Conversation

3405691582
Copy link
Member

A number of Foundation tests are failing on OpenBSD due to these missing
directives, or are required for other reasons.

There is still more complex work to get full support for Foundation on
this platform but this will be handled in other commits.

@spevans
Copy link
Contributor

spevans commented Mar 18, 2021

@swift-ci test

@@ -1649,7 +1649,7 @@ int _CFOpenFile(const char *path, int opts) {
}

CF_CROSS_PLATFORM_EXPORT void *_CFReallocf(void *ptr, size_t size) {
#if TARGET_OS_WIN32 || TARGET_OS_LINUX
#if TARGET_OS_WIN32 || TARGET_OS_LINUX || defined(__OpenBSD__)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it be worth adding a TARGET_OS_OPENBSD?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know if it would be worth it. There shouldn't be too many points of divergence. Here, FreeBSD has reallocf and OpenBSD doesn't.

@spevans
Copy link
Contributor

spevans commented Mar 18, 2021

@swift-ci test linux

@3405691582
Copy link
Member Author

Test failure appears unrelated, I think.

@spevans
Copy link
Contributor

spevans commented Mar 20, 2021

@swift-ci test linux

@spevans
Copy link
Contributor

spevans commented Mar 22, 2021

@swift-ci test

@3405691582 3405691582 force-pushed the OpenBSDSupportSimple branch from ef1c56e to 51865df Compare June 27, 2021 16:15
A number of Foundation tests are failing on OpenBSD due to these missing
directives, or are required for other reasons.

Fuller Foundation support will be completed in other commits.
@3405691582 3405691582 force-pushed the OpenBSDSupportSimple branch from 51865df to 9ac5bbc Compare June 27, 2021 16:22
@3405691582
Copy link
Member Author

Directives added for CFUtilities.c while we are here. @spevans can we retest and merge if everything else is OK?

@spevans
Copy link
Contributor

spevans commented Jun 27, 2021

@swift-ci test

@spevans spevans merged commit 08979ae into swiftlang:main Jun 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants