Split mixedrefs mode into static and dynamic

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

Author: sharon-wang

closed/OpenJ9.gmk

@@ -341,6 +341,7 @@ ifeq (true,$(OPENJ9_ENABLE_CMAKE))
 	-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$OPENJ9_ENABLE_MIXED_REFERENCES" = xtrue ; then
-      AC_MSG_ERROR([--with-mixedrefs requires --with-cmake])
+      AC_MSG_ERROR([--with-mixedrefs=[static|dynamic] requires --with-cmake])
     fi
   else
     OPENJ9_ENABLE_CMAKE=true
@@ -358,7 +358,14 @@ AC_DEFUN([OPENJ9_PLATFORM_SETUP],
   # Default OPENJ9_BUILD_OS=OPENJDK_BUILD_OS, but override with OpenJ9 equivalent as appropriate
   OPENJ9_BUILD_OS="${OPENJDK_BUILD_OS}"
 
-  if test "x$with_mixedrefs" = xyes ; then
+  if test "x$with_mixedrefs" != x -a "x$with_mixedrefs" != xno; then
+    if test "x$with_mixedrefs" = xyes -o "x$with_mixedrefs" = xstatic; then
+      OMR_MIXED_REFERENCES_MODE=static
+    elif test "x$with_mixedrefs" = xdynamic; then
+      OMR_MIXED_REFERENCES_MODE=dynamic
+    else
+      AC_MSG_ERROR([OpenJ9 supports --with-mixedrefs=static and --with-mixedrefs=dynamic])
+    fi
     OPENJ9_BUILD_MODE_ARCH="${OPENJ9_CPU}_mxdptrs"
     OPENJ9_ENABLE_MIXED_REFERENCES=true
     OPENJ9_LIBS_SUBDIR=default
@@ -423,6 +430,7 @@ AC_DEFUN([OPENJ9_PLATFORM_SETUP],
   AC_SUBST(COMPILER_VERSION_STRING)
   AC_SUBST(OPENJ9_LIBS_SUBDIR)
   AC_SUBST(OPENJ9_ENABLE_MIXED_REFERENCES)
+  AC_SUBST(OMR_MIXED_REFERENCES_MODE)
 ])
 
 AC_DEFUN([OPENJ9_CHECK_NASM_VERSION],

closed/autoconf/custom-spec.gmk.in

@@ -87,6 +87,7 @@ OPENJ9_LIBS_SUBDIR      := @OPENJ9_LIBS_SUBDIR@
 
 # Mixed References Mode
 OPENJ9_ENABLE_MIXED_REFERENCES := @OPENJ9_ENABLE_MIXED_REFERENCES@
+OMR_MIXED_REFERENCES_MODE   := @OMR_MIXED_REFERENCES_MODE@
 
 # Export autoconf cache variables for CC/CXX.
 # This is for the case where ccache is enabled.