Skip to content

Commit 69c28a8

Browse files
committed
Use /safeseh for masm/i386
1 parent 3372187 commit 69c28a8

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

CMakeLists.txt

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,13 @@ unset(_default_ext)
8585
set(BOOST_CONTEXT_IMPLEMENTATION "fcontext" CACHE STRING "Boost.Context implementation (fcontext, ucontext, winfib)")
8686
set_property(CACHE BOOST_CONTEXT_IMPLEMENTATION PROPERTY STRINGS fcontext ucontext winfib)
8787

88-
message(STATUS "Boost.Context: binary format ${BOOST_CONTEXT_BINARY_FORMAT}, ABI ${BOOST_CONTEXT_ABI}, assembler ${BOOST_CONTEXT_ASSEMBLER}, asm suffix ${BOOST_CONTEXT_ASM_SUFFIX}, implementation ${BOOST_CONTEXT_IMPLEMENTATION}")
88+
message(STATUS "Boost.Context: "
89+
"architecture ${BOOST_CONTEXT_ARCHITECTURE}, "
90+
"binary format ${BOOST_CONTEXT_BINARY_FORMAT}, "
91+
"ABI ${BOOST_CONTEXT_ABI}, "
92+
"assembler ${BOOST_CONTEXT_ASSEMBLER}, "
93+
"asm suffix ${BOOST_CONTEXT_ASM_SUFFIX}, "
94+
"implementation ${BOOST_CONTEXT_IMPLEMENTATION}")
8995

9096
# Enable the right assembler
9197

@@ -116,7 +122,13 @@ unset(_asm_suffix)
116122
#
117123

118124
if(BOOST_CONTEXT_IMPLEMENTATION STREQUAL "fcontext")
125+
119126
set(IMPL_SOURCES ${ASM_SOURCES})
127+
128+
if(BOOST_CONTEXT_ASSEMBLER STREQUAL masm AND BOOST_CONTEXT_ARCHITECTURE STREQUAL i386)
129+
set_source_files_properties(${ASM_SOURCES} PROPERTIES COMPILE_FLAGS "/safeseh")
130+
endif()
131+
120132
else()
121133
set(IMPL_SOURCES
122134
src/continuation.cpp

0 commit comments

Comments
 (0)