Skip to content
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

Enable aligned_alloc on macOS #94298

Merged
merged 3 commits into from
Nov 14, 2023
Merged

Enable aligned_alloc on macOS #94298

merged 3 commits into from
Nov 14, 2023

Conversation

jkotas
Copy link
Member

@jkotas jkotas commented Nov 2, 2023

Fixes #54296

@ghost
Copy link

ghost commented Nov 2, 2023

Tagging subscribers to this area: @dotnet/interop-contrib
See info in area-owners.md if you want to be subscribed.

Issue Details

Fixes #54296

Author: jkotas
Assignees: -
Labels:

area-System.Runtime.InteropServices

Milestone: -

@@ -608,14 +607,10 @@ elseif(CLR_CMAKE_TARGET_ANDROID)
elseif(CLR_CMAKE_TARGET_BROWSER OR CLR_CMAKE_TARGET_WASI)
set(HAVE_FORK 0)
else()
if(CLR_CMAKE_TARGET_OSX)
unset(HAVE_ALIGNED_ALLOC) # only exists on OSX 10.15+
Copy link
Member Author

Choose a reason for hiding this comment

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

Our minimum supported macOS version is 10.15 so this block is no longer needed.

@lambdageek lambdageek added os-mac-os-x macOS aka OSX os-ios Apple iOS labels Nov 2, 2023
@ghost
Copy link

ghost commented Nov 2, 2023

Tagging subscribers to 'os-ios': @steveisok, @akoeplinger, @kotlarmilos
See info in area-owners.md if you want to be subscribed.

Issue Details

Fixes #54296

Author: jkotas
Assignees: jkotas
Labels:

area-System.Runtime.InteropServices, os-mac-os-x, os-ios

Milestone: -

@lambdageek
Copy link
Member

/azp run runtime-ioslike

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@jkotas
Copy link
Member Author

jkotas commented Nov 13, 2023

@kotlarmilos @ivanpovazan Could you please review and approve?

@@ -581,23 +581,22 @@ if(CLR_CMAKE_TARGET_IOS)
# Manually set results from check_c_source_runs() since it's not possible to actually run it during CMake configure checking
unset(HAVE_SHM_OPEN_THAT_WORKS_WELL_ENOUGH_WITH_MMAP)
unset(HAVE_ALIGNED_ALLOC) # only exists on iOS 13+
unset(HAVE_CLOCK_MONOTONIC) # only exists on iOS 10+
unset(HAVE_CLOCK_REALTIME) # only exists on iOS 10+
set(HAVE_CLOCK_MONOTONIC)
Copy link
Member

Choose a reason for hiding this comment

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

@akoeplinger could this change cause issues related to: #73650

@jkotas jkotas merged commit 475c28e into dotnet:main Nov 14, 2023
131 of 133 checks passed
@jkotas jkotas deleted the aligned_alloc branch November 27, 2023 18:28
@github-actions github-actions bot locked and limited conversation to collaborators Dec 28, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update SystemNative_AlignedAlloc to properly check aligned_alloc availability for Apple targets
7 participants