--- a/hotspot/make/bsd/makefiles/defs.make	Mon Feb 06 14:01:53 2012 -0500
+++ b/hotspot/make/bsd/makefiles/defs.make	Mon Feb 06 14:02:51 2012 -0500
@@ -185,6 +185,9 @@
 
     # Set universal export path but avoid using ARCH or PLATFORM subdirs
     EXPORT_PATH=$(OUTPUTDIR)/export-universal$(EXPORT_SUBDIR)
+    ifneq ($(ALT_EXPORT_PATH),)
+      EXPORT_PATH=$(ALT_EXPORT_PATH)
+    endif
 
     # Set universal image dir
     JDK_IMAGE_DIR=$(OUTPUTDIR)/jdk-universal$(EXPORT_SUBDIR)

--- a/hotspot/make/bsd/makefiles/universal.gmk	Mon Feb 06 14:01:53 2012 -0500
+++ b/hotspot/make/bsd/makefiles/universal.gmk	Mon Feb 06 14:02:51 2012 -0500
@@ -62,10 +62,14 @@
 
 # Copy built non-universal binaries in place
 $(UNIVERSAL_COPY_LIST):
-	BUILT_COPY_FILE="$(EXPORT_JRE_LIB_DIR)/i386/$(subst $(EXPORT_JRE_LIB_DIR)/,,$@)"; \
-	if [ -f $${BUILT_COPY_FILE} ]; then \
-	  $(MKDIR) -p $(shell dirname $@); \
-	  $(CP) $${BUILT_COPY_FILE} $@; \
+	BUILT_COPY_FILES="`find $(EXPORT_JRE_LIB_DIR)/{i386,amd64}/$(subst $(EXPORT_JRE_LIB_DIR)/,,$@) 2>/dev/null`"; \
+	if [ -n "$${BUILT_COPY_FILES}" ]; then \
+	  for i in $${BUILT_COPY_FILES}; do \
+	    if [ -f $${i} ]; then \
+	      $(MKDIR) -p $(shell dirname $@); \
+	      $(CP) $${i} $@; \
+	    fi; \
+	  done; \
 	fi