make/Images.gmk

*** 188,217 ****
  $(foreach f,$(filter $(OVERLAY_FILTER),$(JDK_BIN_LIST)), \
      $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR),$f,JDK_BIN_TARGETS)))
  $(foreach f,$(filter $(OVERLAY_FILTER),$(JDKJRE_BIN_LIST)), \
      $(eval $(call AddFileToCopy,$(JDK_OUTPUTDIR),$(JDK_OVERLAY_IMAGE_DIR)/jre,$f,JDKJRE_BIN_TARGETS)))
  
- ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_BITS),solaris-64)
-   define AddIsadirLink
-     # Param 1 - src file
-     # Param 2 - variable to add targets to
- 
-     $1_LINK := $$(dir $1)$(OPENJDK_TARGET_CPU_ISADIR)/$$(notdir $1)
- 
-     $$($1_LINK):
-         $(ECHO) $(LOG_INFO) Creating link $$(patsubst $(OUTPUT_ROOT)/%,%,$$@)
-         $(MKDIR) -p $$(@D)
-         $(LN) -s ../$$(@F) $$@
- 
-     $2 += $$($1_LINK)
-   endef
- 
-   $(foreach f,$(JRE_BIN_TARGETS),$(eval $(call AddIsadirLink,$f,JRE_BIN_ISADIR_LINK_TARGETS)))
-   $(foreach f,$(JDK_BIN_TARGETS),$(eval $(call AddIsadirLink,$f,JDK_BIN_ISADIR_LINK_TARGETS)))
-   $(foreach f,$(JDKJRE_BIN_TARGETS),$(eval $(call AddIsadirLink,$f,JDKJRE_BIN_ISADIR_LINK_TARGETS)))
- endif
- 
  ################################################################################
  # /lib dir
  ifneq ($(OPENJDK_TARGET_OS), macosx)
    JDKJRE_LIB_FILES := \
        $(LIBRARY_PREFIX)attach$(SHARED_LIBRARY_SUFFIX) \
--- 188,197 ----