[GR-60088] Add org.graalvm.nativeimage.libgraal module.

compiler/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 This changelog summarizes newly introduced optimizations and other compiler related changes.
 
+## GraalVM for JDK 25 (Internal Version 25.0.0)
+* (GR-60088): This PR adds the `org.graalvm.nativeimage.libgraal` SDK module. With this module, all logic for building
+  libgraal has been moved into the compiler suite in a new `jdk.graal.compiler.libgraal` module
+  which has no dependency on Native Image internals. This
+  is required for Galahad CE where libgraal must be buildable from the Graal compiler sources in the OpenJDK
+  while using Native Image as an external tool.
+
 ## GraalVM for JDK 24 (Internal Version 24.2.0)
 * (GR-57209): The default number of JVMCI threads is now the same as the number of C2 threads (`-XX:JVMCINativeLibraryThreadFraction=0.66`).
   This benefits the program warmup but could increase the maximum RSS.

compiler/mx.compiler/mx_compiler.py

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 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
@@ -1485,6 +1485,7 @@ def __init__(self):
         __graal_config = GraalConfig()
     return __graal_config
 
+# The jars needed for jargraal.
 def _jvmci_jars():
     return [
         'compiler:GRAAL',

compiler/mx.compiler/suite.py

@@ -218,7 +218,6 @@
       "jacoco" : "include",
       "jacocoExcludePackages" : [
         "jdk.graal.compiler.test",
-        "org.graalvm.libgraal.jni",
         "jdk.graal.compiler.replacements",
         "jdk.graal.compiler.hotspot.test",
         "jdk.graal.compiler.replacements.test",
@@ -472,13 +471,48 @@
       "graalCompilerSourceEdition": "ignore",
     },
 
+    # ------------- libgraal -------------
+
+    # See jdk.graal.compiler.core.common.LibGraalSupport for the SPI
+    # used by core compiler classes to access libgraal specific
+    # functionality without requiring the compiler classes to directly
+    # depend on libgraal specific modules.
+    "jdk.graal.compiler.libgraal" : {
+      "subDir" : "src",
+      "sourceDirs" : ["src"],
+      "workingSets" : "Graal",
+      "javaCompliance" : "21+",
+      "dependencies" : [
+        "GRAAL",
+        "sdk:NATIVEIMAGE_LIBGRAAL",
+        "sdk:JNIUTILS",
+        "sdk:NATIVEBRIDGE"
+      ],
+      "requiresConcealed" : {
+        "java.base" : [
+          "jdk.internal.module",
+          "jdk.internal.misc"
+        ],
+        "jdk.internal.vm.ci" : [
+          "jdk.vm.ci.code",
+          "jdk.vm.ci.meta",
+          "jdk.vm.ci.runtime",
+          "jdk.vm.ci.services",
+          "jdk.vm.ci.hotspot",
+        ],
+      },
+      "annotationProcessors" : [
+        "truffle:TRUFFLE_LIBGRAAL_PROCESSOR",
+      ],
+    },
+
     "jdk.graal.compiler.libgraal.loader" : {
       "subDir" : "src",
       "sourceDirs" : ["src"],
       "workingSets" : "Graal",
       "javaCompliance" : "21+",
       "dependencies" : [
-        "jdk.graal.compiler",
+        "sdk:NATIVEIMAGE_LIBGRAAL",
       ],
       "requiresConcealed" : {
         "java.base" : [
@@ -557,7 +591,8 @@
       "moduleInfo" : {
         "name" : "jdk.graal.compiler",
         "exports" : [
-          """* to com.oracle.graal.graal_enterprise,
+          """* to jdk.graal.compiler.libgraal,
+                  com.oracle.graal.graal_enterprise,
                   org.graalvm.nativeimage.pointsto,
                   org.graalvm.nativeimage.builder,
                   org.graalvm.nativeimage.foreign,
@@ -583,6 +618,7 @@
         "uses" : [
           "jdk.graal.compiler.code.DisassemblerProvider",
           "jdk.graal.compiler.core.match.MatchStatementSet",
+          "jdk.graal.compiler.core.common.LibGraalSupport",
           "jdk.graal.compiler.debug.DebugHandlersFactory",
           "jdk.graal.compiler.debug.TTYStreamProvider",
           "jdk.graal.compiler.debug.PathUtilitiesProvider",
@@ -634,6 +670,38 @@
       },
     },
 
+    "LIBGRAAL_LOADER" : {
+      "subDir": "src",
+      "dependencies" : [
+        "jdk.graal.compiler.libgraal.loader"
+      ],
+      "distDependencies" : [
+        "sdk:NATIVEIMAGE_LIBGRAAL",
+        "GRAAL",
+      ],
+      "maven": False,
+    },
+
+    "LIBGRAAL": {
+      "moduleInfo" : {
+        "name" : "jdk.graal.compiler.libgraal",
+      },
+      "subDir": "src",
+      "description" : "Module that builds libgraal",
+      "javaCompliance" : "21+",
+      "dependencies": [
+        "jdk.graal.compiler.libgraal",
+      ],
+      "distDependencies": [
+        "GRAAL",
+        "sdk:NATIVEIMAGE_LIBGRAAL",
+        "sdk:JNIUTILS",
+        "sdk:NATIVEIMAGE",
+        "sdk:NATIVEBRIDGE"
+      ],
+      "maven": False,
+    },
+
     "GRAAL_COMPILER_WHITEBOX_MICRO_BENCHMARKS" : {
       "subDir" : "src",
       "dependencies" : [
@@ -711,17 +779,6 @@
       "graalCompilerSourceEdition": "ignore",
     },
 
-    "LIBGRAAL_LOADER" : {
-      "subDir": "src",
-      "dependencies" : [
-        "jdk.graal.compiler.libgraal.loader",
-      ],
-      "distDependencies" : [
-        "GRAAL",
-      ],
-      "maven": False,
-    },
-
     "GRAAL_PROFDIFF_TEST" : {
       "subDir" : "src",
       "dependencies" : [