diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk
index b4a193dfadee6..149a8beb09441 100644
--- a/make/CompileJavaModules.gmk
+++ b/make/CompileJavaModules.gmk
@@ -106,7 +106,7 @@ $(eval $(call SetupJavaCompilation, $(MODULE), \
     FAIL_NO_SRC := $(FAIL_NO_SRC), \
     BIN := $(if $($(MODULE)_BIN), $($(MODULE)_BIN), $(JDK_OUTPUTDIR)/modules), \
     HEADERS := $(SUPPORT_OUTPUTDIR)/headers, \
-    CREATE_API_DIGEST := true, \
+    CREATE_API_DIGEST := $(if $(CREATE_API_DIGEST), $(CREATE_API_DIGEST), true), \
     CLEAN := $(CLEAN), \
     CLEAN_FILES := $(CLEAN_FILES), \
     COPY := $(COPY), \
@@ -118,7 +118,7 @@ $(eval $(call SetupJavaCompilation, $(MODULE), \
         $(DOCLINT) \
         $(JAVAC_FLAGS) \
         --module-source-path $(MODULESOURCEPATH) \
-        --module-path $(MODULEPATH) \
+        --module-path $(MODULEPATH):$(MODULEPATH_EXTRA) \
         --system none, \
 ))
 
diff --git a/make/Main.gmk b/make/Main.gmk
index eda3b79265ad7..392a55933646f 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -52,6 +52,7 @@ endif
 
 # All modules for the current target platform.
 ALL_MODULES := $(call FindAllModules)
+#$(info ALL_MODULES $(ALL_MODULES))
 
 ################################################################################
 #
diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk
index 663e9075cf8f2..bda60d69e31af 100644
--- a/make/common/Modules.gmk
+++ b/make/common/Modules.gmk
@@ -111,6 +111,9 @@ FindModuleInfosForSrcDir = \
         $(patsubst %,%/*/module-info.java, $(strip $1)) \
     )
 
+#$(error XXXX $(notdir $(patsubst %/,%, $(dir $(patsubst %/,%, $(dir $(patsubst %/,%, $(dir /Users/dnsimon/dev/galahad-ee/graal/sdk/src/org.graalvm.word/share/classes/module-info.java))))))) XXXX)
+#$(notdir $(patsubst %/,%, $(dir $(patsubst %/,%, $(dir $(patsubst %/,%, $(dir $(mi)))))))))))
+
 # Extract the module names from the paths of module-info.java files. The
 # position of the module directory differs depending on if this is an imported
 # src dir or not.
@@ -173,6 +176,10 @@ GetModuleSrcPath = \
 MODULE_DEPS_MAKEFILE := $(MAKESUPPORT_OUTPUTDIR)/module-deps.gmk
 
 MODULE_INFOS := $(call FindAllModuleInfos, *)
+#$(info MODULE_INFOS $(MODULE_INFOS))
+
+#$(info MODULE_INFOS: $(MODULE_INFOS))
+#$(info MODULE_DEPS_MAKEFILE: $(MODULE_DEPS_MAKEFILE))
 
 ifeq ($(GENERATE_MODULE_DEPS_FILE), true)
   $(MODULE_DEPS_MAKEFILE): $(MODULE_INFOS) \
diff --git a/make/modules/jdk.graal.compiler/Java.gmk b/make/modules/jdk.graal.compiler/Java.gmk
new file mode 100644
index 0000000000000..86766b29db559
--- /dev/null
+++ b/make/modules/jdk.graal.compiler/Java.gmk
@@ -0,0 +1,56 @@
+#
+# Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.  Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the LICENSE file that accompanied this code.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
+#
+
+################################################################################
+
+PROCESSOR_JARS := \
+    $(BUILDTOOLS_OUTPUTDIR)/graal_processor \
+    #
+PROCESSOR_PATH := $(call PathList, $(PROCESSOR_JARS))
+
+DISABLED_WARNINGS_java += processing
+
+# Add the external GraalVM dependencies
+MODULEPATH_EXTRA = $(GRAALVM_JDK)/lib/truffle/truffle-compiler.jar
+
+JAVAC_FLAGS += -processorpath $(PROCESSOR_PATH) \
+    --add-exports=jdk.internal.vm.ci/jdk.vm.ci.meta=jdk.graal.compiler \
+    --add-exports=jdk.internal.vm.ci/jdk.vm.ci.code=jdk.graal.compiler \
+    --add-exports=jdk.internal.vm.ci/jdk.vm.ci.code.site=jdk.graal.compiler \
+    --add-exports=jdk.internal.vm.ci/jdk.vm.ci.code.stack=jdk.graal.compiler \
+    --add-exports=jdk.internal.vm.ci/jdk.vm.ci.common=jdk.graal.compiler \
+    --add-exports=jdk.internal.vm.ci/jdk.vm.ci.amd64=jdk.graal.compiler \
+    --add-exports=jdk.internal.vm.ci/jdk.vm.ci.aarch64=jdk.graal.compiler \
+    --add-exports=jdk.internal.vm.ci/jdk.vm.ci.riscv64=jdk.graal.compiler \
+    --add-exports=jdk.internal.vm.ci/jdk.vm.ci.services=jdk.graal.compiler \
+    --add-exports=jdk.internal.vm.ci/jdk.vm.ci.runtime=jdk.graal.compiler \
+    --add-exports=jdk.internal.vm.ci/jdk.vm.ci.hotspot=jdk.graal.compiler \
+    --add-exports=jdk.internal.vm.ci/jdk.vm.ci.hotspot.amd64=jdk.graal.compiler \
+    --add-exports=jdk.internal.vm.ci/jdk.vm.ci.hotspot.aarch64=jdk.graal.compiler \
+    --add-exports=jdk.internal.vm.ci/jdk.vm.ci.hotspot.riscv64=jdk.graal.compiler
+
+CREATE_API_DIGEST = false
+
+################################################################################