$NetBSD: patch-ao,v 1.4 2013/06/23 17:39:43 jperkin Exp $

Support rhino.

Disable SunOS multiarch.

--- jdk/make/common/Release.gmk.orig	2013-06-21 13:12:13.781215177 +0000
+++ jdk/make/common/Release.gmk
@@ -67,7 +67,7 @@ EXPORTED_PRIVATE_PKGS = com.sun.servicet
 # 64-bit solaris has a few special cases. We define the variable
 # SOLARIS64 for use in this Makefile to easily test those cases
 ifeq ($(PLATFORM), solaris)
-  ifeq ($(ARCH_DATA_MODEL), 64)
+  ifeq ($(ARCH_DATA_MODEL), NOMULTIARCH64)
     SOLARIS64 = true
     IMAGE_BINDIR = bin/$(ARCH)
   endif
@@ -227,7 +227,7 @@ endif
 INITIAL_IMAGE_JRE=initial-image-jre
 INITIAL_IMAGE_JDK=initial-image-jdk
 ifeq ($(PLATFORM), solaris)
-  ifeq ($(ARCH_DATA_MODEL), 64)
+  ifeq ($(ARCH_DATA_MODEL), NOMULTIARCH64)
     INITIAL_IMAGE_JRE=initial-image-jre-sol64
     INITIAL_IMAGE_JDK=initial-image-jdk-sol64
   endif
@@ -842,6 +842,7 @@ initial-image-jre:: initial-image-jre-se
 	$(CP) $(RT_JAR) $(JRE_IMAGE_DIR)/lib/rt.jar
 	$(CP) $(RESOURCES_JAR) $(JRE_IMAGE_DIR)/lib/resources.jar
 	$(CP) $(JSSE_JAR) $(JRE_IMAGE_DIR)/lib/jsse.jar
+	$(CP) $(RHINO_JAR) $(JRE_IMAGE_DIR)/lib/rhino.jar
 ifneq ($(JFR_JAR),)
 	$(CP) $(JFR_JAR) $(JRE_IMAGE_DIR)/lib/jfr.jar
 endif
@@ -1170,7 +1171,8 @@ initial-image-jdk:: initial-image-jdk-se
 	@#
 	@# Swing BeanInfo generation
 	@#
-	$(CD) javax/swing/beaninfo && $(MAKE) swing-1.2-beans
+	@# XXX javadoc
+	@# $(CD) javax/swing/beaninfo && $(MAKE) swing-1.2-beans
 ifneq ($(PLATFORM), windows)
 	$(call copy-man-pages,$(JDK_IMAGE_DIR),$(JDK_MAN_PAGES))
 endif # !windows
