diff -r cf4e16e9ca60 -r a294fd0c4b38 make/solaris/makefiles/defs.make
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/solaris/makefiles/defs.make	Wed Apr 09 14:22:48 2008 -0400
@@ -0,0 +1,90 @@
+#
+# Copyright 2006-2007 Sun Microsystems, Inc.  All Rights Reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# This code is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License version 2 only, as
+# published by the Free Software Foundation.
+#
+# This code is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# version 2 for more details (a copy is included in the LICENSE file that
+# accompanied this code).
+#
+# You should have received a copy of the GNU General Public License version
+# 2 along with this work; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+# CA 95054 USA or visit www.sun.com if you need additional information or
+# have any questions.
+#  
+#
+
+# The common definitions for hotspot solaris builds.
+# Include the top level defs.make under make directory instead of this one.
+# This file is included into make/defs.make.
+
+# Need PLATFORM (os-arch combo names) for jdk and hotspot, plus libarch name
+SLASH_JAVA ?= /java
+ARCH:=$(shell uname -p)
+PATH_SEP = :
+ifeq ($(LP64), 1)
+  ARCH_DATA_MODEL=64
+else
+  ARCH_DATA_MODEL=32
+endif
+
+ifeq ($(ARCH),sparc)
+  ifeq ($(ARCH_DATA_MODEL), 64)
+    MAKE_ARGS += LP64=1
+    PLATFORM=solaris-sparcv9
+    VM_PLATFORM=solaris_sparcv9
+  else
+    PLATFORM=solaris-sparc
+    VM_PLATFORM=solaris_sparc
+  endif
+  HS_ARCH=sparc
+else
+  ifeq ($(ARCH_DATA_MODEL), 64)
+    MAKE_ARGS += LP64=1
+    PLATFORM=solaris-amd64
+    VM_PLATFORM=solaris_amd64
+    HS_ARCH=x86
+  else
+    PLATFORM=solaris-i586
+    VM_PLATFORM=solaris_i486
+    HS_ARCH=x86
+  endif
+endif
+
+JDK_INCLUDE_SUBDIR=solaris
+
+# FIXUP: The subdirectory for a debug build is NOT the same on all platforms
+VM_DEBUG=jvmg
+
+EXPORT_LIST += $(EXPORT_DOCS_DIR)/platform/jvmti/jvmti.html
+EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server
+EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
+EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjsig.so
+EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.so
+EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_db.so
+EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm_dtrace.so
+ifeq ($(ARCH_DATA_MODEL), 32)
+  EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client
+  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
+  EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjsig.so
+  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
+endif
+
+EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
+EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar