makefiles/Images.gmk

*** 188,197 ****
--- 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) \
*** 728,738 ****
  ################################################################################
  # Main targets
  
  jre-image: $(JRE_BIN_TARGETS) $(JRE_LIB_TARGETS) $(JRE_IMAGE_DIR)/lib/applet \
          $(JRE_IMAGE_DIR)/lib/meta-index $(JRE_IMAGE_DIR)/lib/ext/meta-index \
!         $(JRE_MAN_PAGE_LIST) $(JRE_DOC_TARGETS) $(JRE_INFO_FILE) $(JRE_STRIP_LIST)
  
  jdk-image: $(JDK_BIN_TARGETS) $(JDKJRE_BIN_TARGETS) \
          $(JDK_LIB_TARGETS) $(JDKJRE_LIB_TARGETS) \
          $(JDK_IMAGE_DIR)/jre/lib/applet \
          $(JDK_DEMO_TARGETS) \
--- 748,759 ----
  ################################################################################
  # Main targets
  
  jre-image: $(JRE_BIN_TARGETS) $(JRE_LIB_TARGETS) $(JRE_IMAGE_DIR)/lib/applet \
          $(JRE_IMAGE_DIR)/lib/meta-index $(JRE_IMAGE_DIR)/lib/ext/meta-index \
!         $(JRE_MAN_PAGE_LIST) $(JRE_DOC_TARGETS) $(JRE_INFO_FILE) $(JRE_STRIP_LIST) \
!         $(JRE_BIN_ISADIR_LINK_TARGETS)
  
  jdk-image: $(JDK_BIN_TARGETS) $(JDKJRE_BIN_TARGETS) \
          $(JDK_LIB_TARGETS) $(JDKJRE_LIB_TARGETS) \
          $(JDK_IMAGE_DIR)/jre/lib/applet \
          $(JDK_DEMO_TARGETS) \
*** 739,749 ****
          $(JDK_IMAGE_DIR)/jre/lib/meta-index $(JDK_IMAGE_DIR)/jre/lib/ext/meta-index \
          $(JDK_MAN_PAGE_LIST) $(JDK_SAMPLE_TARGETS) \
          $(JDK_DB_TARGETS) $(JDK_INCLUDE_TARGETS) \
          $(JDKJRE_DOC_TARGETS) $(JDK_DOC_TARGETS) \
          $(JDK_INFO_FILE) $(JDKJRE_STRIP_LIST) $(JDK_BIN_STRIP_LIST) \
!         $(JDK_IMAGE_DIR)/src.zip
  
  jre-overlay-image: $(JRE_OVERLAY_BIN_TARGETS) $(JRE_OVERLAY_LIB_TARGETS) \
           $(JRE_OVERLAY_INFO_FILE) $(JRE_OVERLAY_STRIP_LIST)
  
  jdk-overlay-image: $(JDK_OVERLAY_BIN_TARGETS) $(JDKJRE_OVERLAY_BIN_TARGETS) \
--- 760,771 ----
          $(JDK_IMAGE_DIR)/jre/lib/meta-index $(JDK_IMAGE_DIR)/jre/lib/ext/meta-index \
          $(JDK_MAN_PAGE_LIST) $(JDK_SAMPLE_TARGETS) \
          $(JDK_DB_TARGETS) $(JDK_INCLUDE_TARGETS) \
          $(JDKJRE_DOC_TARGETS) $(JDK_DOC_TARGETS) \
          $(JDK_INFO_FILE) $(JDKJRE_STRIP_LIST) $(JDK_BIN_STRIP_LIST) \
!         $(JDK_IMAGE_DIR)/src.zip \
!         $(JDK_BIN_ISADIR_LINK_TARGETS) $(JDKJRE_BIN_ISADIR_LINK_TARGETS)
  
  jre-overlay-image: $(JRE_OVERLAY_BIN_TARGETS) $(JRE_OVERLAY_LIB_TARGETS) \
           $(JRE_OVERLAY_INFO_FILE) $(JRE_OVERLAY_STRIP_LIST)
  
  jdk-overlay-image: $(JDK_OVERLAY_BIN_TARGETS) $(JDKJRE_OVERLAY_BIN_TARGETS) \