*** old/make/windows/makefiles/defs.make	Tue Sep 13 12:20:49 2011
--- new/make/windows/makefiles/defs.make	Tue Sep 13 12:20:49 2011

*** 107,116 ****
--- 107,119 ----
    endif
  endif
  
  JDK_INCLUDE_SUBDIR=win32
  
+ # Library suffix
+ LIBRARY_SUFFIX=dll
+ 
  # HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined
  # and added to MAKE_ARGS list in $(GAMMADIR)/make/defs.make.
  
  # next parameters are defined in $(GAMMADIR)/make/defs.make.
  MAKE_ARGS += JDK_MKTG_VERSION=$(JDK_MKTG_VERSION)

*** 173,200 ****
--- 176,203 ----
  EXPORT_SERVER_DIR = $(EXPORT_JRE_BIN_DIR)/server
  EXPORT_CLIENT_DIR = $(EXPORT_JRE_BIN_DIR)/client
  EXPORT_KERNEL_DIR = $(EXPORT_JRE_BIN_DIR)/kernel
  
  EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt
! EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.dll
! EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.$(LIBRARY_SUFFIX)
  EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.pdb
  EXPORT_LIST += $(EXPORT_SERVER_DIR)/jvm.map
  EXPORT_LIST += $(EXPORT_LIB_DIR)/jvm.lib
  ifeq ($(ARCH_DATA_MODEL), 32)
    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt
!   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.dll
!   EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.$(LIBRARY_SUFFIX)
    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.pdb
    EXPORT_LIST += $(EXPORT_CLIENT_DIR)/jvm.map
    # kernel vm
    EXPORT_LIST += $(EXPORT_KERNEL_DIR)/Xusage.txt
!   EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.dll
!   EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.$(LIBRARY_SUFFIX)
    EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.pdb
    EXPORT_LIST += $(EXPORT_KERNEL_DIR)/jvm.map
  endif
  
  ifeq ($(BUILD_WIN_SA), 1)
!   EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.dll
!   EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.$(LIBRARY_SUFFIX)
    EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.pdb
    EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.map
    EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
    # Must pass this down to nmake.
    MAKE_ARGS += BUILD_WIN_SA=1