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

fix: enabling parallel build of VM native code #451

Merged
merged 2 commits into from
Jan 13, 2020
Merged

fix: enabling parallel build of VM native code #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d656ba0
* dependencies to GC set where required, this fixes parallel build
dkimitsa Jan 12, 2020
706716c
Merge remote-tracking branch 'mobivm/jdk12' into jdk12-vm-parallel-build
dkimitsa Jan 13, 2020
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
1 change: 1 addition & 0 deletions compiler/vm/bc/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ add_library(robovm-bc STATIC
classinfo.c
MurmurHash3.c
)
add_dependencies(robovm-bc extgc)

set_target_properties(robovm-bc PROPERTIES SUFFIX "${LIB_SUFFIX}")
install(TARGETS robovm-bc DESTINATION ${INSTALL_DIR})
2 changes: 1 addition & 1 deletion compiler/vm/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SELF=$(basename $0)
BASE=$(cd $(dirname $0); pwd -P)
CLEAN=0
VERBOSE=
WORKERS=1
WORKERS=6

function usage {
cat <<EOF
Expand Down
6 changes: 6 additions & 0 deletions compiler/vm/core/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ set_target_properties(robovm-core PROPERTIES SUFFIX "${LIB_SUFFIX}")
install(TARGETS robovm-core DESTINATION ${INSTALL_DIR})

add_executable(test_call0 test/test_call0.c test/CuTest.c call0-${OS_FAMILY}-${ARCH}.s unwind.c)
add_dependencies(test_call0 extgc)
add_library(test_call0_lib STATIC test/test_call0.c test/CuTest.c call0-${OS_FAMILY}-${ARCH}.s unwind.c)
add_dependencies(test_call0_lib extgc)
set_property(SOURCE test/test_call0.c PROPERTY COMPILE_FLAGS "-O0") # Disable optimizations
add_test(testCall0ReturnByte test_call0 "testCall0ReturnByte")
add_test(testCall0ReturnInt test_call0 "testCall0ReturnInt")
Expand All @@ -64,7 +66,9 @@ add_test(testCall0ManyArgsOfEach test_call0 "testCall0ManyArgsOfEach")
add_test(testCall0Unwind test_call0 "testCall0Unwind")

add_executable(test_proxy0 test/test_proxy0.c test/CuTest.c proxy0-${OS_FAMILY}-${ARCH}.s unwind.c)
add_dependencies(test_proxy0 extgc)
add_library(test_proxy0_lib test/test_proxy0.c test/CuTest.c proxy0-${OS_FAMILY}-${ARCH}.s unwind.c)
add_dependencies(test_proxy0_lib extgc)
set_property(SOURCE test/test_proxy0.c PROPERTY COMPILE_FLAGS "-O0") # Disable optimizations
add_test(testProxy0ReturnByte test_proxy0 "testProxy0ReturnByte")
add_test(testProxy0ReturnInt test_proxy0 "testProxy0ReturnInt")
Expand All @@ -78,7 +82,9 @@ add_test(testProxy0Unwind test_proxy0 "testProxy0Unwind")
add_test(testProxy0ReturnAddress test_proxy0 "testProxy0ReturnAddress")

add_executable(test_trycatch test/test_trycatch.c test/CuTest.c trycatch-${OS_FAMILY}-${ARCH}.s)
add_dependencies(test_trycatch extgc)
add_library(test_trycatch_lib test/test_trycatch.c test/CuTest.c trycatch-${OS_FAMILY}-${ARCH}.s)
add_dependencies(test_trycatch_lib extgc)
set_property(SOURCE test/test_trycatch.c PROPERTY COMPILE_FLAGS "-O0") # Disable optimizations
add_test(testTrycatchEnterLeaveOnce test_trycatch "testTrycatchEnterLeaveOnce")
add_test(testTrycatchEnterLeaveMultiple test_trycatch "testTrycatchEnterLeaveMultiple")
Expand Down
1 change: 1 addition & 0 deletions compiler/vm/debug/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ set(SRC
)

add_library(robovm-debug STATIC ${SRC})
add_dependencies(robovm-debug extgc)

set_target_properties(robovm-debug PROPERTIES SUFFIX "${LIB_SUFFIX}")
install(TARGETS robovm-debug DESTINATION ${INSTALL_DIR})
2 changes: 1 addition & 1 deletion compiler/vm/frameworksupport/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ if(APPLE)
)

add_library(robovm-frameworksupport STATIC ${SRC})

add_dependencies(robovm-frameworksupport extgc)
set_target_properties(robovm-frameworksupport PROPERTIES SUFFIX "${LIB_SUFFIX}")
install(TARGETS robovm-frameworksupport DESTINATION ${INSTALL_DIR})
endif()
1 change: 1 addition & 0 deletions compiler/vm/rt/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ add_subdirectory(robovm)
add_subdirectory(android)

add_library(robovm-rt STATIC ${ROBOVM_RT_CORE_OBJECTS} ${ANDROID_OBJECTS})
add_dependencies(robovm-rt extgc)
set_target_properties(robovm-rt PROPERTIES SUFFIX "${LIB_SUFFIX}")
merge_static_lib_object_files(robovm-rt 'Java_*' 'rvmRT*')
install(TARGETS robovm-rt DESTINATION ${INSTALL_DIR})
1 change: 1 addition & 0 deletions compiler/vm/rt/robovm/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,6 @@ if(DARWIN)
endif()

add_library(robovm-rt-core OBJECT ${SRC})
add_dependencies(robovm-rt-core extgc)
set(ROBOVM_RT_CORE_OBJECTS $<TARGET_OBJECTS:robovm-rt-core> PARENT_SCOPE)