From 393308cd5c550369217efb1089736addee816a0f Mon Sep 17 00:00:00 2001
From: Eduardo Souza <ledusou@gmail.com>
Date: Tue, 28 Jan 2025 03:41:47 +0000
Subject: [PATCH] Enables building with moving/non-moving, sticky/immix,
 debug/release using the binary builder

---
 Make.inc                  |  3 +++
 deps/checksums/mmtk_julia |  2 ++
 deps/mmtk_julia.mk        | 25 ++++++++++++++++++++++---
 deps/mmtk_julia.version   |  2 +-
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/Make.inc b/Make.inc
index 16e238c6f0683c..2cd5797e88a41c 100644
--- a/Make.inc
+++ b/Make.inc
@@ -844,6 +844,9 @@ MMTK_BUILD ?= release
 ifeq (${MMTK_PLAN},Immix)
 JCXXFLAGS += -DMMTK_PLAN_IMMIX
 JCFLAGS += -DMMTK_PLAN_IMMIX
+else ifeq (${MMTK_PLAN},StickyImmix)
+JCXXFLAGS += -DMMTK_PLAN_STICKYIMMIX
+JCFLAGS += -DMMTK_PLAN_STICKYIMMIX
 else
 $(error "Unsupported MMTk plan: $(MMTK_PLAN)")
 endif
diff --git a/deps/checksums/mmtk_julia b/deps/checksums/mmtk_julia
index 098937aea1991f..b191bf824d8c48 100644
--- a/deps/checksums/mmtk_julia
+++ b/deps/checksums/mmtk_julia
@@ -8,3 +8,5 @@ mmtk_julia-c9e046baf3a0d52fe75d6c8b28f6afd69b045d95.tar.gz/md5/73a8fbea71edce30a
 mmtk_julia-c9e046baf3a0d52fe75d6c8b28f6afd69b045d95.tar.gz/sha512/374848b7696b565dea66daa208830581f92c1fcb0138e7a7ab88564402e94bc79c54b6ed370ec68473e31e2bd411bf82c97793796c31d39aafbbfffea9c05588
 mmtk_julia.v0.30.4+0.x86_64-linux-gnu.tar.gz/md5/8cdeb14fd69945f64308be49f6912f9c
 mmtk_julia.v0.30.4+0.x86_64-linux-gnu.tar.gz/sha512/3692502f65dec8c0971b56b9bf8178641892b390d520cbcd69880d75b7500e6341534d87882246e68998f590f824ec54c18f4b8fb4aa09b8f313de065c48450e
+mmtk_julia.v0.30.5+0.x86_64-linux-gnu.tar.gz/md5/21911963c9fe46b8ce40fd1a49c3481a
+mmtk_julia.v0.30.5+0.x86_64-linux-gnu.tar.gz/sha512/f02821d619425336c860b8f7bd811c1df517ff031099d35c66e969c8967d7b5417cf8acde0ffc6f9004eeafc50e057ee45599ef7b4dd6ce3b833488ba56a5485
diff --git a/deps/mmtk_julia.mk b/deps/mmtk_julia.mk
index 424113fd4164c2..b443f9b6a25da5 100644
--- a/deps/mmtk_julia.mk
+++ b/deps/mmtk_julia.mk
@@ -1,9 +1,9 @@
 ## MMTK ##
 
 # Both MMTK_MOVING and MMTK_PLAN should be specified in the Make.user file.
-# At this point, since we only support non-moving this is always set to 0
-# FIXME: change it to `?:` when introducing moving plans
-MMTK_MOVING := 0
+# FIXME: By default we do a non-moving build. We should change the default to 1
+# once we support moving plans.
+MMTK_MOVING ?= 0
 MMTK_VARS := MMTK_PLAN=$(MMTK_PLAN) MMTK_MOVING=$(MMTK_MOVING)
 
 ifneq ($(USE_BINARYBUILDER_MMTK_JULIA),1)
@@ -75,6 +75,25 @@ endif # MMTK_JULIA_DIR
 else
 # We are building using the BinaryBuilder version of the binding
 
+# This will download all the versions of the binding that are available in the BinaryBuilder
 $(eval $(call bb-install,mmtk_julia,MMTK_JULIA,false))
 
+# Make sure we use the right version of $MMTK_PLAN, $MMTK_MOVING and $MMTK_BUILD
+ifeq (${MMTK_PLAN},Immix)
+LIB_PATH_PLAN = immix
+else ifeq (${MMTK_PLAN},StickyImmix)
+LIB_PATH_PLAN = sticky
+endif
+
+ifeq ($(MMTK_MOVING), 0)
+LIB_PATH_MOVING := non_moving
+else
+LIB_PATH_MOVING := moving
+endif
+
+version-check-mmtk_julia: $(BUILDROOT)/usr/lib/libmmtk_julia.so
+
+$(BUILDROOT)/usr/lib/libmmtk_julia.so: get-mmtk_julia
+	@ln -sf $(BUILDROOT)/usr/lib/$(LIB_PATH_PLAN)/$(LIB_PATH_MOVING)/$(MMTK_BUILD)/libmmtk_julia.so $@
+
 endif # USE_BINARYBUILDER_MMTK_JULIA
diff --git a/deps/mmtk_julia.version b/deps/mmtk_julia.version
index 684197bbe3e4eb..7500ab4caf95a2 100644
--- a/deps/mmtk_julia.version
+++ b/deps/mmtk_julia.version
@@ -2,5 +2,5 @@ MMTK_JULIA_BRANCH = master
 MMTK_JULIA_SHA1 = c9e046baf3a0d52fe75d6c8b28f6afd69b045d95
 MMTK_JULIA_GIT_URL := https://github.com/mmtk/mmtk-julia.git
 MMTK_JULIA_TAR_URL = https://github.com/mmtk/mmtk-julia/archive/refs/tags/v0.30.4.tar.gz
-MMTK_JULIA_JLL_VER := 0.30.4+0
+MMTK_JULIA_JLL_VER := 0.30.5+0
 MMTK_JULIA_JLL_NAME := mmtk_julia