1.1 --- a/make/java/redist/Makefile	Mon Sep 13 02:54:35 2010 -0700
     1.2 +++ b/make/java/redist/Makefile	Mon Sep 13 13:10:26 2010 -0400
     1.3 @@ -43,6 +43,7 @@
     1.4  CLIENT_LOCATION = client
     1.5  
     1.6  DB_SUFFIX = _db
     1.7 +DTRACE_SUFFIX = _dtrace
     1.8  
     1.9  ifeq ($(PLATFORM), windows)
    1.10    LIB_LOCATION = $(BINDIR)
    1.11 @@ -56,6 +57,7 @@
    1.12  JVMPDB_NAME            = $(LIB_PREFIX)jvm.pdb
    1.13  LIBJSIG_NAME           = $(LIB_PREFIX)jsig.$(LIBRARY_SUFFIX)
    1.14  JVMDB_NAME             = $(LIB_PREFIX)jvm$(DB_SUFFIX).$(LIBRARY_SUFFIX)
    1.15 +JVMDTRACE_NAME         = $(LIB_PREFIX)jvm$(DTRACE_SUFFIX).$(LIBRARY_SUFFIX)
    1.16  
    1.17  CLASSSHARINGDATA_DIR   = $(BUILDDIR)/tools/sharing
    1.18  
    1.19 @@ -161,6 +163,12 @@
    1.20  
    1.21  ifeq ($(PLATFORM), solaris)
    1.22    IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDB_NAME)
    1.23 +# The conditional can be removed when import JDKs contain these files.
    1.24 +ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/$(JVMDTRACE_NAME)),)
    1.25 +  IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDTRACE_NAME)
    1.26 +else
    1.27 +  $(warning WARNING: $(HOTSPOT_SERVER_PATH)/$(JVMDB_NAME) not found!)
    1.28 +endif 
    1.29  endif 
    1.30  
    1.31  ifneq ($(ZERO_BUILD), true)
    1.32 @@ -171,14 +179,29 @@
    1.33  ifeq ($(PLATFORM), solaris)
    1.34  #  solaris   vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv  solaris
    1.35  
    1.36 -ifeq ($(ARCH), sparc)
    1.37 -  IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDB_NAME)
    1.38 +IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDB_NAME)
    1.39 +
    1.40 +# The conditional can be removed when import JDKs contain these files.
    1.41 +ifneq ($(wildcard $(HOTSPOT_CLIENT_PATH)/$(JVMDTRACE_NAME)),)
    1.42 +  IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDTRACE_NAME)
    1.43 +  IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDB_NAME)
    1.44 +  IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDTRACE_NAME)
    1.45 +else
    1.46 +  $(warning WARNING: $(HOTSPOT_CLIENT_PATH)/$(JVMDTRACE_NAME) not found!)
    1.47  endif
    1.48  
    1.49 -IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDB_NAME)
    1.50 +# The conditional can be removed when import JDKs contain these files.
    1.51 +ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/64/$(JVMDB_NAME)),)
    1.52 +  IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDB_NAME)
    1.53 +else
    1.54 +  $(warning WARNING: $(HOTSPOT_SERVER_PATH)/64/$(JVMDB_NAME) not found!)
    1.55 +endif
    1.56  
    1.57 -ifeq ($(ARCH), sparc)
    1.58 -  IMPORT_LIST += $(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDB_NAME)
    1.59 +# The conditional can be removed when import JDKs contain these files.
    1.60 +ifneq ($(wildcard $(HOTSPOT_SERVER_PATH)/64/$(JVMDTRACE_NAME)),)
    1.61 +  IMPORT_LIST += $(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDTRACE_NAME)
    1.62 +else
    1.63 +  $(warning WARNING: $(HOTSPOT_SERVER_PATH)/64/$(JVMDTRACE_NAME) not found!)
    1.64  endif
    1.65  
    1.66  # For backwards compatability, make a link of the 32-bit client JVM to $(LIBDIR)
    1.67 @@ -224,6 +247,18 @@
    1.68  $(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDB_NAME): $(HOTSPOT_SERVER_PATH)/64/$(JVMDB_NAME)
    1.69  	$(install-import-file)
    1.70  
    1.71 +$(LIB_LOCATION)/$(CLIENT_LOCATION)/$(JVMDTRACE_NAME): $(HOTSPOT_CLIENT_PATH)/$(JVMDTRACE_NAME)
    1.72 +	$(install-import-file)
    1.73 +
    1.74 +$(LIB_LOCATION)/$(CLIENT_LOCATION)/64/$(JVMDTRACE_NAME): $(HOTSPOT_CLIENT_PATH)/64/$(JVMDTRACE_NAME)
    1.75 +	$(install-import-file)
    1.76 +
    1.77 +$(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVMDTRACE_NAME): $(HOTSPOT_SERVER_PATH)/$(JVMDTRACE_NAME)
    1.78 +	$(install-import-file)
    1.79 +
    1.80 +$(LIB_LOCATION)/$(SERVER_LOCATION)/64/$(JVMDTRACE_NAME): $(HOTSPOT_SERVER_PATH)/64/$(JVMDTRACE_NAME)
    1.81 +	$(install-import-file)
    1.82 +
    1.83  $(LIB_LOCATION)/$(SERVER_LOCATION)/$(JVM_NAME): $(HOTSPOT_SERVER_PATH)/$(JVM_NAME)
    1.84  	$(install-import-file)
    1.85