Copy the compressed/full GC/GCCHK libs based on pointer mode

If compressed mode, only copy compressed GC/GCCHK lib.
If full mode, only copy full GC/GCCHK lib.
If mixed mode, copy both compressed and full GC/GCCHK libs.

Signed-off-by: Sharon Wang <[email protected]>

Author: sharon-wang

closed/autoconf/custom-hook.m4

@@ -350,7 +350,7 @@ AC_DEFUN([OPENJ9_PLATFORM_SETUP],
   # JVM will run).
   OPENJ9_PLATFORM_EXTRACT_VARS_FROM_CPU($host_cpu)
 
-  ENABLE_MIXED_REFERENCES=false
+  OPENJ9_ENABLE_MIXED_REFERENCES=false
   if test "x$with_mixedrefs" = x; then
     if test "x$with_noncompressedrefs" = x ; then
       OPENJ9_BUILDSPEC="${OPENJDK_BUILD_OS}_${OPENJ9_CPU}_cmprssptrs"
@@ -360,7 +360,7 @@ AC_DEFUN([OPENJ9_PLATFORM_SETUP],
       OPENJ9_LIBS_SUBDIR=default
     fi
   else
-    ENABLE_MIXED_REFERENCES=true
+    OPENJ9_ENABLE_MIXED_REFERENCES=true
     OPENJ9_BUILDSPEC="${OPENJDK_BUILD_OS}_${OPENJ9_CPU}_mxdptrs"
     OPENJ9_LIBS_SUBDIR=default
   fi
@@ -370,7 +370,7 @@ AC_DEFUN([OPENJ9_PLATFORM_SETUP],
       OPENJ9_PLATFORM_CODE=xa64
     elif test "x$OPENJDK_BUILD_OS" = xwindows ; then
       OPENJ9_PLATFORM_CODE=wa64
-      if test "x$ENABLE_MIXED_REFERENCES" = xfalse ; then
+      if test "x$OPENJ9_ENABLE_MIXED_REFERENCES" = xfalse ; then
         if test "x$OPENJ9_LIBS_SUBDIR" = xdefault ; then
           OPENJ9_BUILDSPEC=win_x86-64
         else
@@ -381,7 +381,7 @@ AC_DEFUN([OPENJ9_PLATFORM_SETUP],
       fi
     elif test "x$OPENJDK_BUILD_OS" = xmacosx ; then
       OPENJ9_PLATFORM_CODE=oa64
-      if test "x$ENABLE_MIXED_REFERENCES" = xfalse ; then
+      if test "x$OPENJ9_ENABLE_MIXED_REFERENCES" = xfalse ; then
         if test "x$OPENJ9_LIBS_SUBDIR" = xdefault ; then
           OPENJ9_BUILDSPEC=osx_x86-64
         else
@@ -395,7 +395,7 @@ AC_DEFUN([OPENJ9_PLATFORM_SETUP],
     fi
   elif test "x$OPENJ9_CPU" = xppc-64_le ; then
     OPENJ9_PLATFORM_CODE=xl64
-    if test "x$ENABLE_MIXED_REFERENCES" = xfalse ; then
+    if test "x$OPENJ9_ENABLE_MIXED_REFERENCES" = xfalse ; then
       if test "x$OPENJ9_LIBS_SUBDIR" != xdefault ; then
         OPENJ9_BUILDSPEC="${OPENJDK_BUILD_OS}_ppc-64_cmprssptrs_le"
       fi
@@ -428,6 +428,7 @@ AC_DEFUN([OPENJ9_PLATFORM_SETUP],
   AC_SUBST(OPENJ9_PLATFORM_CODE)
   AC_SUBST(COMPILER_VERSION_STRING)
   AC_SUBST(OPENJ9_LIBS_SUBDIR)
+  AC_SUBST(OPENJ9_ENABLE_MIXED_REFERENCES)
 ])
 
 AC_DEFUN([OPENJ9_CHECK_NASM_VERSION],

closed/autoconf/custom-spec.gmk.in

@@ -85,6 +85,9 @@ OPENJ9_PLATFORM_CODE    := @OPENJ9_PLATFORM_CODE@
 
 OPENJ9_LIBS_SUBDIR      := @OPENJ9_LIBS_SUBDIR@
 
+# Mixed References Mode
+OPENJ9_ENABLE_MIXED_REFERENCES := @OPENJ9_ENABLE_MIXED_REFERENCES@
+
 # Export autoconf cache variables for CC/CXX.
 # This is for the case where ccache is enabled.
 # It ensures that OMR autoconf uses the compiler, not ccache.

closed/custom/copy/Copy-java.base.gmk

@@ -59,13 +59,23 @@ $(call openj9_copy_files_and_debuginfos, \
 # CPU targets without JIT support.
 NO_JIT_CPUS := riscv64
 
+# Decide which GC lib(s) to copy
+POINTER_MODE := mixed
+ifeq (false,$(OPENJ9_ENABLE_MIXED_REFERENCES))
+	ifeq (compressedrefs,$(OPENJ9_LIBS_SUBDIR))
+		POINTER_MODE := compressed
+	else
+		POINTER_MODE := full
+	endif
+endif
+
 $(call openj9_copy_shlibs, \
 	$(if $(filter zos,$(OPENJDK_TARGET_OS)),j9a2e) \
 	j9dmp29 \
-	j9gc29 \
-	j9gc_full29 \
-	j9gcchk29 \
-	j9gcchk_full29 \
+	$(if $(filter compressed mixed,$(POINTER_MODE)),j9gc29) \
+	$(if $(filter full mixed,$(POINTER_MODE)),j9gc_full29) \
+	$(if $(filter compressed mixed,$(POINTER_MODE)),j9gcchk29) \
+	$(if $(filter full mixed,$(POINTER_MODE)),j9gcchk_full29) \
 	j9hookable29 \
 	$(if $(filter zos,$(OPENJDK_TARGET_OS)),j9ifa29) \
 	$(if $(filter $(NO_JIT_CPUS),$(OPENJDK_TARGET_CPU)),,j9jit29) \