hotspot/make/lib/CompileJvm.gmk

*** 172,197 ****
      RC_DESC := 64-Bit$(SPACE)
    endif
    JVM_RCFLAGS += -D"HS_FILEDESC=$(HOTSPOT_VM_DISTRO) $(RC_DESC)$(JVM_VARIANT) VM"
  endif
  
- ifeq ($(OPENJDK_TARGET_OS), macosx)
-   # NOTE: The old build did not strip binaries on macosx.
-   JVM_STRIP_SYMBOLS := false
- else
-   JVM_STRIP_SYMBOLS := true
- endif
- 
  JVM_OPTIMIZATION ?= HIGHEST_JVM
  
  ################################################################################
  # Now set up the actual compilation of the main hotspot native library
  
  $(eval $(call SetupNativeCompilation, BUILD_LIBJVM, \
      TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
      LIBRARY := jvm, \
!     OUTPUT_DIR := $(JVM_OUTPUTDIR), \
      SRC := $(JVM_SRC_DIRS), \
      EXCLUDES := $(JVM_EXCLUDES), \
      EXCLUDE_FILES := $(JVM_EXCLUDE_FILES), \
      EXCLUDE_PATTERNS := $(JVM_EXCLUDE_PATTERNS), \
      EXTRA_OBJECT_FILES := $(DTRACE_EXTRA_OBJECT_FILES), \
--- 172,190 ----
      RC_DESC := 64-Bit$(SPACE)
    endif
    JVM_RCFLAGS += -D"HS_FILEDESC=$(HOTSPOT_VM_DISTRO) $(RC_DESC)$(JVM_VARIANT) VM"
  endif
  
  JVM_OPTIMIZATION ?= HIGHEST_JVM
  
  ################################################################################
  # Now set up the actual compilation of the main hotspot native library
  
  $(eval $(call SetupNativeCompilation, BUILD_LIBJVM, \
      TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
      LIBRARY := jvm, \
!     OUTPUT_DIR := $(JVM_LIB_OUTPUTDIR), \
      SRC := $(JVM_SRC_DIRS), \
      EXCLUDES := $(JVM_EXCLUDES), \
      EXCLUDE_FILES := $(JVM_EXCLUDE_FILES), \
      EXCLUDE_PATTERNS := $(JVM_EXCLUDE_PATTERNS), \
      EXTRA_OBJECT_FILES := $(DTRACE_EXTRA_OBJECT_FILES), \
*** 209,226 ****
      LIBS := $(JVM_LIBS), \
      OPTIMIZATION := $(JVM_OPTIMIZATION), \
      OBJECT_DIR := $(JVM_OUTPUTDIR)/objs, \
      MAPFILE := $(JVM_MAPFILE), \
      USE_MAPFILE_FOR_SYMBOLS := true, \
-     STRIP_SYMBOLS := $(JVM_STRIP_SYMBOLS), \
      EMBED_MANIFEST := true, \
      RC_FLAGS := $(JVM_RCFLAGS), \
      VERSIONINFO_RESOURCE := $(HOTSPOT_TOPDIR)/src/os/windows/vm/version.rc, \
      PRECOMPILED_HEADER := $(JVM_PRECOMPILED_HEADER), \
      PRECOMPILED_HEADER_EXCLUDE := $(JVM_PRECOMPILED_HEADER_EXCLUDE), \
  ))
  
  # AIX warning explanation:
  # 1500-010  : (W) WARNING in ...: Infinite loop.  Program may not stop.
  #             There are several infinite loops in the vm, so better suppress.
  # 1540-0198 : (W) The omitted keyword "private" is assumed for base class "...".
  # 1540-0216 : (W) An expression of type .. cannot be converted to type ..
--- 202,230 ----
      LIBS := $(JVM_LIBS), \
      OPTIMIZATION := $(JVM_OPTIMIZATION), \
      OBJECT_DIR := $(JVM_OUTPUTDIR)/objs, \
      MAPFILE := $(JVM_MAPFILE), \
      USE_MAPFILE_FOR_SYMBOLS := true, \
      EMBED_MANIFEST := true, \
      RC_FLAGS := $(JVM_RCFLAGS), \
      VERSIONINFO_RESOURCE := $(HOTSPOT_TOPDIR)/src/os/windows/vm/version.rc, \
      PRECOMPILED_HEADER := $(JVM_PRECOMPILED_HEADER), \
      PRECOMPILED_HEADER_EXCLUDE := $(JVM_PRECOMPILED_HEADER_EXCLUDE), \
  ))
  
+ ifeq ($(OPENJDK_TARGET_OS), windows)
+   # It doesn't matter which jvm.lib file gets exported, but we need
+   # to pick just one.
+   ifeq ($(JVM_VARIANT), $(firstword $(JVM_VARIANTS)))
+     $(eval $(call SetupCopyFiles, COPY_JVM_LIB, \
+         DEST := $(LIB_OUTPUTDIR), \
+         FILES :=$(JVM_VARIANT_OUTPUTDIR)/libjvm/objs/jvm.lib, \
+     ))
+     TARGETS += $(COPY_JVM_LIB)
+   endif
+ endif
+ 
  # AIX warning explanation:
  # 1500-010  : (W) WARNING in ...: Infinite loop.  Program may not stop.
  #             There are several infinite loops in the vm, so better suppress.
  # 1540-0198 : (W) The omitted keyword "private" is assumed for base class "...".
  # 1540-0216 : (W) An expression of type .. cannot be converted to type ..