make/lib/Lib-jdk.attach.gmk

rev 11875 : 8079360: AttachProviderImpl could not be instantiated
Reviewed-by:

*** 25,43 ****
  
  include LibCommon.gmk
  
  ################################################################################
  
  
  $(eval $(call SetupNativeCompilation,BUILD_LIBATTACH, \
      LIBRARY := attach, \
      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
      SRC := $(call FindSrcDirsForLib, jdk.attach, attach), \
      OPTIMIZATION := LOW, \
      CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) \
          -I$(SUPPORT_OUTPUTDIR)/headers/jdk.attach \
!         $(LIBJAVA_HEADER_FLAGS), \
      CFLAGS_windows := /Gy, \
      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libattach/mapfile-$(OPENJDK_TARGET_OS), \
      VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
      RC_FLAGS := $(RC_FLAGS) \
          -D "JDK_FNAME=attach.dll" \
--- 25,49 ----
  
  include LibCommon.gmk
  
  ################################################################################
  
+ ifeq ($(OPENJDK_TARGET_OS), windows)
+   # In (at least) VS2013 and later, -DPSAPI_VERSION=1 is needed to generate
+   # a binary that is compatible with windows versions older than 7/2008R2.
+   # See MSDN documentation for GetProcessMemoryInfo for more information.
+   LIBATTACH_CFLAGS := -DPSAPI_VERSION=1
+ endif
  
  $(eval $(call SetupNativeCompilation,BUILD_LIBATTACH, \
      LIBRARY := attach, \
      OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
      SRC := $(call FindSrcDirsForLib, jdk.attach, attach), \
      OPTIMIZATION := LOW, \
      CFLAGS := $(CFLAGS_JDKLIB) $(CFLAGS_WARNINGS_ARE_ERRORS) \
          -I$(SUPPORT_OUTPUTDIR)/headers/jdk.attach \
!         $(LIBJAVA_HEADER_FLAGS) $(LIBATTACH_CFLAGS), \
      CFLAGS_windows := /Gy, \
      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libattach/mapfile-$(OPENJDK_TARGET_OS), \
      VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
      RC_FLAGS := $(RC_FLAGS) \
          -D "JDK_FNAME=attach.dll" \