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

CMake: Add windows support to the vm #5271

Merged
merged 1 commit into from
Mar 28, 2019
Merged

CMake: Add windows support to the vm #5271

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 10 additions & 5 deletions runtime/vm/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,19 +129,22 @@ add_library(j9vm SHARED
if(OMR_ARCH_X86)
j9vm_gen_asm(xcinterp.m4)

if(OMR_ENV_DATA64)
if(OMR_OS_LINUX AND OMR_ENV_DATA64)
j9vm_gen_asm(
xa64/stackswap.m4
xa64/unsafeHelper.m4
)
target_sources(j9vm PRIVATE unsafeHelper.s)
elseif(OMR_OS_WINDOWS AND OMR_ENV_DATA64)
j9vm_gen_asm(wa64/stackswap.m4)
else()
message(SEND_ERROR "x86-32 is not currently supported")
message(SEND_ERROR "Unsupported platform")
endif()

target_sources(j9vm
PRIVATE
unsafeHelper.s
xcinterp.s
stackswap.s
xcinterp.s
stackswap.s
)
elseif(OMR_ARCH_POWER) #TODO check linux and 64bit
j9vm_gen_asm(pcinterp.m4)
Expand All @@ -154,6 +157,8 @@ elseif(OMR_ARCH_POWER) #TODO check linux and 64bit
xl64/unsafeHelper.s
pcinterp.s
)
else()
message(SEND_ERROR "Unsupported platform")
endif()

target_include_directories(j9vm
Expand Down