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 control flow guard for mono on windows #101293

Merged
merged 4 commits into from
Apr 22, 2024
Merged

Enable control flow guard for mono on windows #101293

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a637c04
Enable control flow guard for mono on windows
steveisok Apr 19, 2024
a1c2e2a
Add compiler flag too
steveisok Apr 19, 2024
2e9a97c
Case matters - add_compile_options didn't work, so append to C_FLAGS …
steveisok Apr 20, 2024
124e802
Update src/mono/CMakeLists.txt
jkotas Apr 20, 2024
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: 2 additions & 2 deletions src/mono/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,9 +277,9 @@ elseif(CLR_CMAKE_HOST_OS STREQUAL "windows")
add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4324>) # 'struct_name' : structure was padded due to __declspec(align())
add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/EHsc>) # set exception handling behavior
add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/FC>) # use full pathnames in diagnostics
add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/GUARD:cf) # Enable control flow guard
append("/guard:cf" CMAKE_C_FLAGS CMAKE_CXX_FLAGS) # Enable control flow guard
jkotas marked this conversation as resolved.
Show resolved Hide resolved
add_link_options(/STACK:0x800000) # set stack size to 8MB (default is 1MB)
add_link_options(/GUARD:cf)
add_link_options(/guard:cf)
if(CMAKE_BUILD_TYPE STREQUAL "Release")
add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/Oi>) # enable intrinsics
add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/GF>) # enable string pooling
steveisok marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
Loading