# HG changeset patch
# User never
# Date 1274818729 25200
# Node ID f9a202dd8899ef5eaeb13d2eb344403dec79ca7b
# Parent  1747f04ad0c400ad4b577bca2c70a33ce9e542a5# Parent  110501f54a99ee2c365d0af0e4ddfd604e13d000
Merge

diff -r 110501f54a99 -r f9a202dd8899 make/solaris/makefiles/defs.make
--- a/make/solaris/makefiles/defs.make	Tue May 25 02:38:48 2010 -0700
+++ b/make/solaris/makefiles/defs.make	Tue May 25 13:18:49 2010 -0700
@@ -80,12 +80,10 @@
   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.so 
   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_db.so 
   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.so 
-  ifeq ($(ARCH),sparc)
-    EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.so
-    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.so
-    EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.so
-    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.so
-  endif
+  EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_db.so
+  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.so
+  EXPORT_LIST += $(EXPORT_SERVER_DIR)/64/libjvm_dtrace.so
+  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.so
 endif
 
 EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so