Copy gc_full libs only when in mixedrefs static mode

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

Author: sharon-wang

closed/OpenJ9.gmk

@@ -338,10 +338,10 @@ ifeq (true,$(OPENJ9_ENABLE_CMAKE))
 	-DJ9VM_OMR_DIR="$(OPENJ9OMR_TOPDIR)" \
 	-DJAVA_SPEC_VERSION=$(VERSION_FEATURE) \
 	-DOMR_DDR=$(OPENJ9_ENABLE_DDR) \
+	-DOMR_MIXED_REFERENCES_MODE=$(OMR_MIXED_REFERENCES_MODE) \
 	-DOPENJ9_BUILD=true \
 	-DOPENJ9_SHA=$(OPENJ9_SHA) \
 	-DOPENJDK_VERSION_NUMBER_FOUR_POSITIONS=$(VERSION_NUMBER_FOUR_POSITIONS) \
-	-DOMR_MIXED_REFERENCES_MODE="$(OMR_MIXED_REFERENCES_MODE)" \
 	#
 
   ifeq (windows,$(OPENJDK_TARGET_OS))

closed/autoconf/custom-hook.m4

@@ -78,7 +78,7 @@ AC_DEFUN([OPENJ9_CONFIGURE_CMAKE],
 
     # Currently, mixedrefs mode is only available with CMake enabled
     if test "x$OMR_MIXED_REFERENCES_MODE" != xoff ; then
-      AC_MSG_ERROR([--with-mixedrefs=[static|dynamic] requires --with-cmake])
+      AC_MSG_ERROR([[--with-mixedrefs=[static|dynamic] requires --with-cmake]])
     fi
   else
     OPENJ9_ENABLE_CMAKE=true

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

@@ -59,22 +59,13 @@ $(call openj9_copy_files_and_debuginfos, \
 # CPU targets without JIT support.
 NO_JIT_CPUS := riscv64
 
-# Decide which GC lib(s) to copy
-ifneq (off,$(OMR_MIXED_REFERENCES_MODE))
-  POINTER_MODE := mixed
-else ifeq (compressedrefs,$(OPENJ9_LIBS_SUBDIR))
-  POINTER_MODE := compressed
-else
-  POINTER_MODE := full
-endif
-
 $(call openj9_copy_shlibs, \
 	$(if $(filter zos,$(OPENJDK_TARGET_OS)),j9a2e) \
 	j9dmp29 \
-	$(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) \
+	j9gc29 \
+	$(if $(filter static,$(OMR_MIXED_REFERENCES_MODE)),j9gc_full29) \
+	j9gcchk29 \
+	$(if $(filter static,$(OMR_MIXED_REFERENCES_MODE)),j9gcchk_full29) \
 	j9hookable29 \
 	$(if $(filter zos,$(OPENJDK_TARGET_OS)),j9ifa29) \
 	$(if $(filter $(NO_JIT_CPUS),$(OPENJDK_TARGET_CPU)),,j9jit29) \