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

Add makefile support #82

Merged
merged 16 commits into from
Dec 17, 2024
Merged

Add makefile support #82

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3124e4e
Adding support for MMTk (non-moving Immix)
udesou Oct 25, 2024
67f3f87
Adding support for building Julia and the binding via makefile
udesou Dec 13, 2024
4cba7a9
Adding support for MMTk (non-moving Immix)
udesou Oct 25, 2024
fa683fe
Updating julia hash commit
udesou Dec 13, 2024
86e4add
Updating makefile
udesou Dec 16, 2024
4a34a8a
Do a release build on the binding by default and use MMTK_BUILD to sp…
udesou Dec 16, 2024
e15a108
Changing inline => STATIC_INLINE to fix debug build (?)
udesou Dec 16, 2024
f3537bd
Merge branch 'upstream-ready/immix' into add-makefile-support
udesou Dec 16, 2024
eed1bf2
Adding support for MMTk (non-moving Immix)
udesou Oct 25, 2024
13c0064
Merge branch 'upstream-ready/immix' into add-makefile-support
udesou Dec 16, 2024
4b2db4a
Adding support for MMTk (non-moving Immix)
udesou Oct 25, 2024
7963331
Merge branch 'upstream-ready/immix' into add-makefile-support
udesou Dec 16, 2024
2567f15
Adding support for MMTk (non-moving Immix)
udesou Oct 25, 2024
3a7ab50
Merge branch 'upstream-ready/immix' into add-makefile-support
udesou Dec 16, 2024
5f74303
Merge branch 'upstream-ready/immix' into add-makefile-support
udesou Dec 16, 2024
4b1b7b8
Updating binding version and checksum
udesou Dec 17, 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
Prev Previous commit
Next Next commit
Updating makefile
  • Loading branch information
@udesou
udesou committed Dec 16, 2024
commit 86e4add9390c7008ed32ff09098e1c04c54e70f9
1 change: 1 addition & 0 deletions deps/checksums/mmtk_julia-10b698e2f71792b1c692c3ec7ac4064bf355cdc7.tar.gz/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0152223ab7ed48cd37ae7807fa009f16
1 change: 1 addition & 0 deletions deps/checksums/mmtk_julia-10b698e2f71792b1c692c3ec7ac4064bf355cdc7.tar.gz/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
05a0e85b6bc3a4fac02987ffcdd7febe594552c9af6ce49376333c45e834c2ab0aa2b04d29a0bd5ead57f082f2199a8ca40cda0757a7bcd6b5d20073d0fd101f
1 change: 0 additions & 1 deletion deps/checksums/mmtk_julia-d0d69b28992e870ecd8239a1fd3261351628c83e.tar.gz/md5
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/mmtk_julia-d0d69b28992e870ecd8239a1fd3261351628c83e.tar.gz/sha512
View file
Open in desktop

This file was deleted.

16 changes: 8 additions & 8 deletions deps/mmtk_julia.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,22 @@ MMTK_VARS := MMTK_PLAN=$(MMTK_PLAN) MMTK_MOVING=$(MMTK_MOVING)
ifeq (${MMTK_JULIA_DIR},$(BUILDROOT)/usr/lib/mmtk_julia)
$(eval $(call git-external,mmtk_julia,MMTK_JULIA,,,$(BUILDDIR)))

MMTK_JULIA_DIR=$(BUILDDIR)/$(MMTK_JULIA_SRC_DIR)
MMTK_JULIA_DIR=$(BUILDROOT)/deps/$(BUILDDIR)/$(MMTK_JULIA_SRC_DIR)
MMTK_JULIA_LIB_PATH=$(MMTK_JULIA_DIR)/mmtk/target/$(MMTK_BUILD)
PROJECT_DIRS := JULIA_PATH=$(JULIAHOME) JULIA_BUILDROOT=$(BUILDROOT) MMTK_JULIA_DIR=$(SRCDIR)/$(MMTK_JULIA_DIR)
PROJECT_DIRS := JULIA_PATH=$(JULIAHOME) JULIA_BUILDROOT=$(BUILDROOT) MMTK_JULIA_DIR=$(MMTK_JULIA_DIR)

$(MMTK_JULIA_DIR)/build-compiled: $(BUILDROOT)/usr/lib/libmmtk_julia.so
$(BUILDDIR)/$(MMTK_JULIA_SRC_DIR)/build-compiled: $(BUILDROOT)/usr/lib/libmmtk_julia.so
@echo 1 > $@

# NB: use the absolute dir when creating the symlink
$(BUILDROOT)/usr/lib/libmmtk_julia.so: $(MMTK_JULIA_DIR)/mmtk/target/$(MMTK_BUILD)/libmmtk_julia.so
@ln -sf $(SRCDIR)/$(MMTK_JULIA_DIR)/mmtk/target/$(MMTK_BUILD)/libmmtk_julia.so $@
$(BUILDROOT)/usr/lib/libmmtk_julia.so: $(MMTK_JULIA_LIB_PATH)/libmmtk_julia.so
@ln -sf $(MMTK_JULIA_LIB_PATH)/libmmtk_julia.so $@

$(MMTK_JULIA_DIR)/mmtk/target/$(MMTK_BUILD)/libmmtk_julia.so: $(MMTK_JULIA_DIR)/source-extracted
$(MMTK_JULIA_LIB_PATH)/libmmtk_julia.so: $(BUILDDIR)/$(MMTK_JULIA_SRC_DIR)/source-extracted
@$(PROJECT_DIRS) $(MMTK_VARS) $(MAKE) -C $(MMTK_JULIA_DIR) $(MMTK_BUILD)

get-mmtk_julia: $(MMTK_JULIA_SRC_FILE)
extract-mmtk_julia: $(MMTK_JULIA_DIR)/source-extracted
extract-mmtk_julia: $(BUILDDIR)/$(MMTK_JULIA_SRC_DIR)/source-extracted
configure-mmtk_julia: extract-mmtk_julia
compile-mmtk_julia: $(BUILDROOT)/usr/lib/libmmtk_julia.so
fastcheck-mmtk_julia: #none
Expand All @@ -37,7 +37,7 @@ $(eval $(call symlink_install,mmtk_julia,$$(MMTK_JULIA_SRC_DIR),$$(BUILDROOT)/us
# Build it and symlink libmmtk_julia.so file into $(BUILDROOT)/usr/lib
else

PROJECT_DIRS := JULIA_PATH=$(JULIAHOME) JULIA_BUILDROOT=$(BUILDROOT) MMTK_JULIA_DIR=$(SRCDIR)/$(MMTK_JULIA_DIR)
PROJECT_DIRS := JULIA_PATH=$(JULIAHOME) JULIA_BUILDROOT=$(BUILDROOT) MMTK_JULIA_DIR=$(MMTK_JULIA_DIR)
MMTK_JULIA_LIB_PATH=$(MMTK_JULIA_DIR)/mmtk/target/$(MMTK_BUILD)

install-mmtk_julia: compile-mmtk_julia $(build_prefix)/manifest/mmtk_julia
Expand Down
2 changes: 1 addition & 1 deletion deps/mmtk_julia.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# FIXME: Update these with a proper version from mmtk/mmtk-julia before merging
MMTK_JULIA_BRANCH = release-0.29.0
MMTK_JULIA_SHA1 = d0d69b28992e870ecd8239a1fd3261351628c83e
MMTK_JULIA_SHA1 = 10b698e2f71792b1c692c3ec7ac4064bf355cdc7
MMTK_JULIA_GIT_URL := https://github.com/udesou/mmtk-julia.git
MMTK_JULIA_TAR_URL = https://github.com/udesou/mmtk-julia/archive/refs/tags/v0.1.0-test.tar.gz