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.

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

Jump to bottom

Enable aligned_alloc on macOS #94298

Merged
merged 3 commits into from
Nov 14, 2023
Merged

Enable aligned_alloc on macOS #94298

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa9ea5e
Enable aligned_alloc on macOS
jkotas Nov 2, 2023
1ce55e2
Update src/native/libs/configure.cmake
jkotas Nov 13, 2023
27aad12
Apply suggestions from code review
jkotas Nov 13, 2023
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
4 changes: 1 addition & 3 deletions src/native/libs/System.Native/pal_memory.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@
void* SystemNative_AlignedAlloc(uintptr_t alignment, uintptr_t size)
{
#if HAVE_ALIGNED_ALLOC
// We want to prefer the standardized aligned_alloc function. However
// it cannot be used on __APPLE__ since we target 10.13 and it was
// only added in 10.15, but we might be compiling on a 10.15 box.
// We want to prefer the standardized aligned_alloc function.
return aligned_alloc(alignment, size);
#elif HAVE_POSIX_MEMALIGN
void* result = NULL;
Expand Down
25 changes: 10 additions & 15 deletions src/native/libs/configure.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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+
jkotas marked this conversation as resolved.
Show resolved Hide resolved
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

set(HAVE_CLOCK_REALTIME)
jkotas marked this conversation as resolved.
Show resolved Hide resolved
unset(HAVE_FORK) # exists but blocked by kernel
elseif(CLR_CMAKE_TARGET_MACCATALYST)
# Manually set results from check_c_source_runs() since it's not possible to actually run it during CMake configure checking
# TODO: test to see if these all actually hold true on Mac Catalyst
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)
set(HAVE_CLOCK_REALTIME)
jkotas marked this conversation as resolved.
Show resolved Hide resolved
unset(HAVE_FORK) # exists but blocked by kernel
elseif(CLR_CMAKE_TARGET_TVOS)
# 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)
set(HAVE_CLOCK_REALTIME)
jkotas marked this conversation as resolved.
Show resolved Hide resolved
unset(HAVE_FORK) # exists but blocked by kernel
elseif(CLR_CMAKE_TARGET_ANDROID)
# Manually set results from check_c_source_runs() since it's not possible to actually run it during CMake configure checking
Expand All @@ -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.

else()
check_symbol_exists(
aligned_alloc
stdlib.h
HAVE_ALIGNED_ALLOC)
endif()
check_symbol_exists(
aligned_alloc
stdlib.h
HAVE_ALIGNED_ALLOC)

check_c_source_runs(
"
Expand Down
Loading