From dca61d8fd6ee80b3c9357fe705395cf7c1ca39d0 Mon Sep 17 00:00:00 2001
From: Arjun Harikumar <s21008@students.iitmandi.ac.in>
Date: Mon, 13 Nov 2023 12:13:49 +0000
Subject: [PATCH] Changes in make files for Primitive JCL classes.

---
 make/CompileInterimLangtools.gmk | 2 +-
 make/CompileJavaModules.gmk      | 2 +-
 make/CompileToolsJdk.gmk         | 4 ++--
 make/JrtfsJar.gmk                | 5 +++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/make/CompileInterimLangtools.gmk b/make/CompileInterimLangtools.gmk
index 0d13c4dc26c..23eb8793d15 100755
--- a/make/CompileInterimLangtools.gmk
+++ b/make/CompileInterimLangtools.gmk
@@ -104,7 +104,7 @@ define SetupInterimModule
       COPY := .gif .png .xml .css .svg .js .js.template .txt javax.tools.JavaCompilerTool, \
       BIN := $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules/$1.interim, \
       DISABLED_WARNINGS := module options, \
-      JAVAC_FLAGS := -XDenablePrimitiveClasses\
+      JAVAC_FLAGS := -XDenablePrimitiveClasses \
           --module-path $(BUILDTOOLS_OUTPUTDIR)/interim_langtools_modules \
           $$(INTERIM_LANGTOOLS_ADD_EXPORTS) \
           --patch-module java.base=$(BUILDTOOLS_OUTPUTDIR)/gensrc/java.base.interim \
diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk
index 9231ba9541a..74e10ada157 100755
--- a/make/CompileJavaModules.gmk
+++ b/make/CompileJavaModules.gmk
@@ -107,7 +107,7 @@ $(eval $(call SetupJavaCompilation, $(MODULE), \
     EXCLUDES := $(EXCLUDES), \
     EXCLUDE_FILES := $(EXCLUDE_FILES), \
     KEEP_ALL_TRANSLATIONS := $(KEEP_ALL_TRANSLATIONS), \
-    JAVAC_FLAGS := -XDenablePrimitiveClasses\
+    JAVAC_FLAGS := -XDenablePrimitiveClasses \
         $(DOCLINT) \
         $(JAVAC_FLAGS) \
         --module-source-path $(MODULESOURCEPATH) \
diff --git a/make/CompileToolsJdk.gmk b/make/CompileToolsJdk.gmk
index 5415dbfbc8b..4b54c85e104 100755
--- a/make/CompileToolsJdk.gmk
+++ b/make/CompileToolsJdk.gmk
@@ -54,7 +54,7 @@ $(eval $(call SetupJavaCompilation, BUILD_TOOLS_JDK, \
         , \
     BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes, \
     DISABLED_WARNINGS := options, \
-    JAVAC_FLAGS := -XDenablePrimitiveClasses\
+    JAVAC_FLAGS := -XDenablePrimitiveClasses \
         --add-exports java.desktop/sun.awt=ALL-UNNAMED \
         --add-exports java.base/sun.text=ALL-UNNAMED \
         --add-exports java.base/sun.security.util=ALL-UNNAMED, \
@@ -77,7 +77,7 @@ $(eval $(call SetupJavaCompilation, COMPILE_DEPEND, \
     INCLUDES := build/tools/depend, \
     BIN := $(BUILDTOOLS_OUTPUTDIR)/depend, \
     DISABLED_WARNINGS := options, \
-    JAVAC_FLAGS := -XDenablePrimitiveClasses\
+    JAVAC_FLAGS := -XDenablePrimitiveClasses \
         --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
         --add-exports jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \
         --add-exports jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED \
diff --git a/make/JrtfsJar.gmk b/make/JrtfsJar.gmk
index 278b7657a82..27b962a3b05 100755
--- a/make/JrtfsJar.gmk
+++ b/make/JrtfsJar.gmk
@@ -47,13 +47,14 @@ JIMAGE_PKGS := \
     #
 
 $(eval $(call SetupJavaCompilation, BUILD_JRTFS, \
-    COMPILER := bootjdk, \
+    COMPILER := interim, \
     DISABLED_WARNINGS := options, \
-    TARGET_RELEASE := $(TARGET_RELEASE_JDK8), \
+    TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \
     SRC := $(TOPDIR)/src/java.base/share/classes, \
     EXCLUDE_FILES := module-info.java, \
     INCLUDES := $(JIMAGE_PKGS), \
     BIN := $(SUPPORT_OUTPUTDIR)/jrtfs_classes, \
+    JAVAC_FLAGS := -XDenablePrimitiveClasses, \
 ))
 
 # Because of the explicit INCLUDES in the compilation setup above, the service provider