makefiles/CopyFiles.gmk

*** 290,319 ****
    JVMCFG_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/$(JVMCFG_ARCH)/jvm.cfg
  endif
  JVMCFG_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
  JVMCFG := $(JVMCFG_DIR)/jvm.cfg
  
  
! ifeq ($(OPENJDK_TARGET_CPU_BITS),32)
    # On 32-bit machines we have three potential VMs: client, server and minimal.
    # Historically we usually have both client and server and so that is what the
    # committed jvm.cfg expects (including platform specific ergonomics switches
    # to decide whether to use client or server by default). So when we have anything
    # other than client and server we need to define a new jvm.cfg file.
    # The main problem is deciding whether to use aliases for the VMs that are not
    # present and the current position is that we add aliases for client and server, but
    # not for minimal.
-   # To do: should this also support, -zero and -zeroshark?
- 
    CLIENT_AND_SERVER := $(and $(findstring true,$(JVM_VARIANT_SERVER)),$(findstring true,$(JVM_VARIANT_CLIENT)))
- 
    ifeq ($(CLIENT_AND_SERVER), true)
!     # Use the committed jvm.cfg for this 32 bit setup (the minimal
!     # VM is already KNOWN on platforms that potentially support it)
      $(JVMCFG): $(JVMCFG_SRC)
          $(call install-file)
!   else
      $(JVMCFG):
          $(MKDIR) -p $(@D)
          $(RM) $(@)
  
      # Now check for other permutations
--- 290,327 ----
    JVMCFG_SRC := $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/bin/$(JVMCFG_ARCH)/jvm.cfg
  endif
  JVMCFG_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
  JVMCFG := $(JVMCFG_DIR)/jvm.cfg
  
+ # To do: should this also support -zeroshark?
  
! ifeq ($(OPENJDK_TARGET_CPU_BITS),64)
!   COPY_JVM_CFG_FILE := true
! else
    # On 32-bit machines we have three potential VMs: client, server and minimal.
    # Historically we usually have both client and server and so that is what the
    # committed jvm.cfg expects (including platform specific ergonomics switches
    # to decide whether to use client or server by default). So when we have anything
    # other than client and server we need to define a new jvm.cfg file.
    # The main problem is deciding whether to use aliases for the VMs that are not
    # present and the current position is that we add aliases for client and server, but
    # not for minimal.
    CLIENT_AND_SERVER := $(and $(findstring true,$(JVM_VARIANT_SERVER)),$(findstring true,$(JVM_VARIANT_CLIENT)))
    ifeq ($(CLIENT_AND_SERVER), true)
!     COPY_JVM_CFG_FILE := true
!   else
!     # For zero, the default jvm.cfg file is sufficient
!     ifeq ($(JVM_VARIANT_ZERO), true)
!       COPY_JVM_CFG_FILE := true
!     endif
!   endif
! endif
! 
! ifeq ($(COPY_JVM_CFG_FILE), true)
      $(JVMCFG): $(JVMCFG_SRC)
          $(call install-file)
! else
      $(JVMCFG):
          $(MKDIR) -p $(@D)
          $(RM) $(@)
  
      # Now check for other permutations
*** 336,351 ****
                  $(PRINTF) "-server ALIASED_TO -minimal\n">>$(@)
                  $(PRINTF) "-client ALIASED_TO -minimal\n">>$(@)
              endif
          endif
      endif
-   endif
- 
- else
-     # Use the default jvm.cfg for this 64 bit setup.
-     $(JVMCFG): $(JVMCFG_SRC)
-         $(call install-file)
  endif
  
  COPY_FILES += $(JVMCFG)
  
  ##########################################################################################
--- 344,353 ----