Merge
authorjbachorik
Fri, 18 Dec 2015 09:02:21 +0100
changeset 35187 3bba3801b83f
parent 35186 89076d5121c0 (current diff)
parent 35184 98d6fac15e3f (diff)
child 35188 c058f99ad8fe
child 35189 a69874af6697
Merge
--- a/hotspot/make/windows/build.bat	Fri Dec 18 08:55:47 2015 +0100
+++ b/hotspot/make/windows/build.bat	Fri Dec 18 09:02:21 2015 +0100
@@ -1,6 +1,6 @@
 @echo off
 REM
-REM Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+REM Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@@ -23,96 +23,62 @@
 REM  
 REM
 
+REM Set HotSpotWorkSpace to the directory two steps above this script
+for %%i in ("%~dp0..") do ( set HotSpotWorkSpace=%%~dpi)
 
 REM
 REM Since we don't have uname and we could be cross-compiling,
 REM Use the compiler to determine which ARCH we are building
 REM 
-REM Note: Running this batch file from the Windows command shell requires
-REM that "grep" be accessible on the PATH. An MKS install does this.
-REM 
-cl 2>&1 | grep "IA-64" >NUL
-if %errorlevel% == 0 goto isia64
-cl 2>&1 | grep "AMD64" >NUL
+cl 2>&1 1>&3 | findstr x64>NUL
 if %errorlevel% == 0 goto amd64
-cl 2>&1 | grep "x64" >NUL
-if %errorlevel% == 0 goto amd64
-set ARCH=x86
-set BUILDARCH=i486
-set Platform_arch=x86
-set Platform_arch_model=x86_32
-goto end
+set VCPROJ=%HotSpotWorkSpace%\build\vs-i486\jvm.vcxproj
+set PLATFORM=x86
+goto testmkshome
 :amd64
-set LP64=1
-set ARCH=x86
-set BUILDARCH=amd64
-set Platform_arch=x86
-set Platform_arch_model=x86_64
+set VCPROJ=%HotSpotWorkSpace%\build\vs-amd64\jvm.vcxproj
+set PLATFORM=x64
+goto testmkshome
+
+:testmkshome
+if not "%HOTSPOTMKSHOME%" == "" goto testjavahome
+if exist c:\cygwin\bin set HOTSPOTMKSHOME=c:\cygwin\bin
+if not "%HOTSPOTMKSHOME%" == "" goto testjavahome
+if exist c:\cygwin64\bin set HOTSPOTMKSHOME=c:\cygwin64\bin
+if not "%HOTSPOTMKSHOME%" == "" goto testjavahome
+echo Error: please set variable HOTSPOTMKSHOME to place where 
+echo          your MKS/Cygwin installation is
+echo.
 goto end
-:isia64
-set LP64=1
-set ARCH=ia64
-set Platform_arch=ia64
-set Platform_arch_model=ia64
-:end
 
-if "%4" == ""          goto usage
-if not "%7" == ""      goto usage
+:testjavahome
+if not "%JAVA_HOME%" == "" goto testbuildversion
+echo Error: please set variable JAVA_HOME to a bootstrap JDK 
+echo.
+goto end
 
-if "%1" == "product"   goto test1
-if "%1" == "debug"     goto test1
-if "%1" == "fastdebug" goto test1
-if "%1" == "tree"      goto test1
+:testbuildversion
+if "%1" == "compiler1" goto testdebuglevel
+if "%1" == "tiered"    goto testdebuglevel
 goto usage
 
-:test1
-if "%2" == "core"      goto test2
-if "%2" == "compiler1" goto test2
-if "%2" == "compiler2" goto test2
-if "%2" == "tiered"    goto test2
-if "%2" == "adlc"      goto build_adlc
-
-goto usage
-
-:test2
-if "%1" == "tree"      goto build_tree
-REM check_j2se_version
-REM jvmti.make requires J2SE 1.4.x or newer.
-REM If not found then fail fast.
-%4\bin\javap javax.xml.transform.TransformerFactory >NUL
-if %errorlevel% == 0 goto build
-echo.
-echo J2SE version found at %4\bin\java:
-%4\bin\java -version
-echo.
-echo An XSLT processor (J2SE 1.4.x or newer) is required to
-echo bootstrap this build
-echo.
-
+:testdebuglevel
+if "%2" == "product"   goto build
+if "%2" == "debug"     goto build
+if "%2" == "fastdebug" goto build
 goto usage
 
 :build
-nmake -f %3/make/windows/build.make Variant=%2 WorkSpace=%3 BootStrapDir=%4 BuildUser="%USERNAME%" HOTSPOT_BUILD_VERSION="%5" %1
-goto end
-
-:build_adlc
-nmake -f %3/make/windows/build.make Variant=compiler2 WorkSpace=%3 BootStrapDir=%4 BuildUser="%USERNAME%" HOTSPOT_BUILD_VERSION=%5 ADLC_ONLY=1 %1
-goto end
-
-:build_tree
-nmake -f %3/make/windows/build.make Variant=%2 WorkSpace=%3 BootStrapDir=%4 BuildUser="%USERNAME%" HOTSPOT_BUILD_VERSION="%5" %1
+if NOT EXIST %VCPROJ% call %~dp0\create.bat %JAVA_HOME%
+msbuild /Property:Platform=%PLATFORM% /Property:Configuration=%1_%2 /v:m %VCPROJ%
 goto end
 
 :usage
-echo Usage: build flavor version workspace bootstrap_dir [build_id] [windbg_home]
+echo Usage: build version debuglevel
 echo.
 echo where:
-echo flavor is "product", "debug" or "fastdebug",
-echo version is "core", "compiler1", "compiler2", or "tiered",
-echo workspace is source directory without trailing slash, 
-echo bootstrap_dir is a full path to a JDK in which bin/java 
-echo   and bin/javac are present and working, and build_id is an 
-echo   optional build identifier displayed by java -version
+echo version is "compiler1" or "tiered",
+echo debuglevel is "product", "debug" or "fastdebug"
 exit /b 1
 
 :end
--- a/hotspot/make/windows/create.bat	Fri Dec 18 08:55:47 2015 +0100
+++ b/hotspot/make/windows/create.bat	Fri Dec 18 09:02:21 2015 +0100
@@ -1,6 +1,6 @@
 @echo off
 REM
-REM Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+REM Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
 REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 REM
 REM This code is free software; you can redistribute it and/or modify it
@@ -116,61 +116,62 @@
 if not "%HOTSPOTMKSHOME%" == "" goto makedir
 if exist c:\cygwin\bin set HOTSPOTMKSHOME=c:\cygwin\bin
 if not "%HOTSPOTMKSHOME%" == "" goto makedir
+if exist c:\cygwin64\bin set HOTSPOTMKSHOME=c:\cygwin64\bin
+if not "%HOTSPOTMKSHOME%" == "" goto makedir
 echo Warning: please set variable HOTSPOTMKSHOME to place where 
 echo          your MKS/Cygwin installation is
 echo.
 goto usage
 
+:generatefiles
+if NOT EXIST %HotSpotBuildSpace%\%1\generated mkdir %HotSpotBuildSpace%\%1\generated
+copy %HotSpotWorkSpace%\make\windows\projectfiles\%1\* %HotSpotBuildSpace%\%1\generated > NUL
+
+REM force regneration of ProjectFile
+if exist %ProjectFile% del %ProjectFile%
+
+echo -- %1 --
+echo # Generated file!                                                        >    %HotSpotBuildSpace%\%1\local.make
+echo # Changing a variable below and then deleting %ProjectFile% will cause  >>    %HotSpotBuildSpace%\%1\local.make
+echo # %ProjectFile% to be regenerated with the new values.  Changing the    >>    %HotSpotBuildSpace%\%1\local.make
+echo # version requires rerunning create.bat.                                >>    %HotSpotBuildSpace%\%1\local.make
+echo.                                      >>    %HotSpotBuildSpace%\%1\local.make
+echo Variant=%1			           >>    %HotSpotBuildSpace%\%1\local.make
+echo WorkSpace=%HotSpotWorkSpace%   	   >>    %HotSpotBuildSpace%\%1\local.make
+echo HOTSPOTWORKSPACE=%HotSpotWorkSpace%   >>    %HotSpotBuildSpace%\%1\local.make
+echo HOTSPOTBUILDROOT=%HotSpotBuildRoot%   >>    %HotSpotBuildSpace%\%1\local.make
+echo HOTSPOTBUILDSPACE=%HotSpotBuildSpace% >>    %HotSpotBuildSpace%\%1\local.make
+echo HOTSPOTJDKDIST=%HotSpotJDKDist%       >>    %HotSpotBuildSpace%\%1\local.make
+echo ARCH=%ARCH%                           >>    %HotSpotBuildSpace%\%1\local.make
+echo BUILDARCH=%BUILDARCH%                 >>    %HotSpotBuildSpace%\%1\local.make
+echo Platform_arch=%Platform_arch%         >>    %HotSpotBuildSpace%\%1\local.make
+echo Platform_arch_model=%Platform_arch_model% >>    %HotSpotBuildSpace%\%1\local.make
+echo MSC_VER=%MSC_VER% 			   >>    %HotSpotBuildSpace%\%1\local.make
+
+for /D %%j in (debug, fastdebug, product) do (
+  if NOT EXIST %HotSpotBuildSpace%\%1\%%j mkdir %HotSpotBuildSpace%\%1\%%j
+)
+
+pushd %HotSpotBuildSpace%\%1\generated
+nmake /nologo
+popd
+
+goto :eof
+
+
 :makedir
 echo NOTE: Using the following settings:
 echo   HotSpotWorkSpace=%HotSpotWorkSpace%
 echo   HotSpotBuildSpace=%HotSpotBuildSpace%
 echo   HotSpotJDKDist=%HotSpotJDKDist%
 
-
-REM This is now safe to do.
-:copyfiles
-for /D %%i in (compiler1, compiler2, tiered ) do (
-if NOT EXIST %HotSpotBuildSpace%\%%i\generated mkdir %HotSpotBuildSpace%\%%i\generated
-copy %HotSpotWorkSpace%\make\windows\projectfiles\%%i\* %HotSpotBuildSpace%\%%i\generated > NUL
-)
-
-REM force regneration of ProjectFile
-if exist %ProjectFile% del %ProjectFile%
-
-for /D %%i in (compiler1, compiler2, tiered ) do (
-echo -- %%i --
-echo # Generated file!                                                        >    %HotSpotBuildSpace%\%%i\local.make
-echo # Changing a variable below and then deleting %ProjectFile% will cause  >>    %HotSpotBuildSpace%\%%i\local.make
-echo # %ProjectFile% to be regenerated with the new values.  Changing the    >>    %HotSpotBuildSpace%\%%i\local.make
-echo # version requires rerunning create.bat.                                >>    %HotSpotBuildSpace%\%%i\local.make
-echo.                                      >>    %HotSpotBuildSpace%\%%i\local.make
-echo Variant=%%i			   >>    %HotSpotBuildSpace%\%%i\local.make
-echo WorkSpace=%HotSpotWorkSpace%   	   >>    %HotSpotBuildSpace%\%%i\local.make
-echo HOTSPOTWORKSPACE=%HotSpotWorkSpace%   >>    %HotSpotBuildSpace%\%%i\local.make
-echo HOTSPOTBUILDROOT=%HotSpotBuildRoot%   >>    %HotSpotBuildSpace%\%%i\local.make
-echo HOTSPOTBUILDSPACE=%HotSpotBuildSpace% >>    %HotSpotBuildSpace%\%%i\local.make
-echo HOTSPOTJDKDIST=%HotSpotJDKDist%       >>    %HotSpotBuildSpace%\%%i\local.make
-echo ARCH=%ARCH%                           >>    %HotSpotBuildSpace%\%%i\local.make
-echo BUILDARCH=%BUILDARCH%                 >>    %HotSpotBuildSpace%\%%i\local.make
-echo Platform_arch=%Platform_arch%         >>    %HotSpotBuildSpace%\%%i\local.make
-echo Platform_arch_model=%Platform_arch_model% >>    %HotSpotBuildSpace%\%%i\local.make
-echo MSC_VER=%MSC_VER% 			   >>    %HotSpotBuildSpace%\%%i\local.make
-
-for /D %%j in (debug, fastdebug, product) do (
-if NOT EXIST %HotSpotBuildSpace%\%%i\%%j mkdir %HotSpotBuildSpace%\%%i\%%j
-)
-
-pushd %HotSpotBuildSpace%\%%i\generated
-nmake /nologo
-popd
-
-)
+echo COPYFILES %BUILDARCH%
+call :generatefiles compiler1
+call :generatefiles tiered
 
 pushd %HotSpotBuildRoot%
-
-REM It doesn't matter which variant we use here, "compiler1" is as good as any of the others - we need the common variables
-nmake /nologo /F %HotSpotWorkSpace%/make/windows/projectfiles/common/Makefile LOCAL_MAKE=%HotSpotBuildSpace%\compiler1\local.make %ProjectFile%
+REM It doesn't matter which variant we use here, "tiered" is as good as any of the others - we need the common variables
+nmake /nologo /F %HotSpotWorkSpace%/make/windows/projectfiles/common/Makefile LOCAL_MAKE=%HotSpotBuildSpace%\tiered\local.make %ProjectFile%
 
 popd
 
--- a/hotspot/make/windows/makefiles/projectcreator.make	Fri Dec 18 08:55:47 2015 +0100
+++ b/hotspot/make/windows/makefiles/projectcreator.make	Fri Dec 18 09:02:21 2015 +0100
@@ -70,6 +70,7 @@
         -ignorePath zero \
         -ignorePath aix \
         -ignorePath aarch64 \
+        -ignorePath jdk.vm.ci \
         -hidePath .hg
 
 
@@ -120,19 +121,23 @@
 # Add in build-specific options
 !if "$(BUILDARCH)" == "i486"
 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
-	-platformName Win32 \
+        -platformName Win32 \
+        -ignorePath x86_64 \
+        -ignorePath src\share\vm\jvmci \
+        -ignoreFile jvmciCodeInstaller_x86.cpp \
         -define IA32 \
-        -ignorePath x86_64 \
+        -define INCLUDE_JVMCI=0 \
         -define TARGET_ARCH_MODEL_x86_32
 !else
 !if "$(BUILDARCH)" == "amd64"
 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
-	-platformName x64 \
+        -platformName x64 \
+        -ignorePath x86_32 \
         -define AMD64 \
-	-define _LP64 \
-        -ignorePath x86_32 \
+        -define _LP64 \
+        -define INCLUDE_JVMCI=1 \
         -define TARGET_ARCH_MODEL_x86_64 \
-	-define TARGET_OS_ARCH_MODEL_windows_x86_64
+        -define TARGET_OS_ARCH_MODEL_windows_x86_64
 !endif
 !endif
 
@@ -141,10 +146,6 @@
  -ignorePath_TARGET tiered \
  -ignorePath_TARGET c1_
 
-ProjectCreatorIDEOptionsIgnoreJVMCI=\
- -ignorePath_TARGET src/share/vm/jvmci \
- -ignorePath_TARGET vm/jvmci
-
 ProjectCreatorIDEOptionsIgnoreCompiler2=\
  -ignorePath_TARGET compiler2 \
  -ignorePath_TARGET tiered \
@@ -165,8 +166,6 @@
 ##################################################
 ProjectCreatorIDEOptions=$(ProjectCreatorIDEOptions) \
  -define_compiler1 COMPILER1 \
- -define_compiler1 INCLUDE_JVMCI=0 \
-$(ProjectCreatorIDEOptionsIgnoreJVMCI:TARGET=compiler1) \
 $(ProjectCreatorIDEOptionsIgnoreCompiler2:TARGET=compiler1)
 
 ##################################################
--- a/hotspot/make/windows/projectfiles/common/Makefile	Fri Dec 18 08:55:47 2015 +0100
+++ b/hotspot/make/windows/projectfiles/common/Makefile	Fri Dec 18 09:02:21 2015 +0100
@@ -80,21 +80,25 @@
 
 !include $(HOTSPOTWORKSPACE)/make/jdk_version
 
+VERSION_MAJOR=$(STANDALONE_JDK_MAJOR_VER)
+VERSION_MINOR=$(STANDALONE_JDK_MINOR_VER)
+VERSION_SECURITY=$(STANDALONE_JDK_SECURITY_VER)
+VERSION_PATCH=$(STANDALONE_JDK_PATCH_VER)
+
+!if "$(VERSION_BUILD)" == ""
+VERSION_BUILD=0
+!endif
+
 !if "$(VERSION_OPT)" != ""
-HOTSPOT_BUILD_VERSION = internal-$(VERSION_OPT)
-!else
-HOTSPOT_BUILD_VERSION = internal
-!endif
-!if "$(VERSION_STRING)" != ""
-JRE_RELEASE_VERSION="\\\"$(VERSION_STRING)\\\""
+HOTSPOT_PRE = internal-$(VERSION_OPT)
 !else
-JRE_RELEASE_VERSION="\\\"$(STANDALONE_JDK_MAJOR_VER).$(STANDALONE_JDK_MINOR_VER).$(STANDALONE_JDK_SECURITY_VER)\\\""
+HOTSPOT_PRE = internal
 !endif
-!if "$(HOTSPOT_RELEASE_VERSION)" != ""
-HOTSPOT_RELEASE_VERSION="\\\"$(HOTSPOT_RELEASE_VERSION)\\\""
-!else
-HOTSPOT_RELEASE_VERSION=$(JRE_RELEASE_VERSION)
+!if "$(VERSION_STRING)" == ""
+VERSION_STRING="\\\"$(VERSION_MAJOR)-$(HOTSPOT_PRE)+$(VERSION_BUILD)-$(USERNAME).vsbuild\\\""
 !endif
+HOTSPOT_VERSION_STRING=$(VERSION_STRING)
+
 # Define HOTSPOT_VM_DISTRO if HOTSPOT_VM_DISTRO is set,
 # and if it is not see if we have the src/closed directory
 !if "$(HOTSPOT_VM_DISTRO)" != ""
@@ -105,17 +109,12 @@
 !else
 HOTSPOT_VM_DISTRO="\\\"OpenJDK\\\""
 !endif
-!if "$(VERSION_BUILD)" == ""
-VERSION_BUILD=0
-!endif
+
 !endif
 
-VERSION_MAJOR=$(STANDALONE_JDK_MAJOR_VER)
-VERSION_MINOR=$(STANDALONE_JDK_MINOR_VER)
-VERSION_SECURITY=$(STANDALONE_JDK_SECURITY_VER)
-VERSION_PATCH=$(STANDALONE_JDK_PATCH_VER)
+
 
-ReleaseOptions = -define HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) -define JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) -define HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO) -define VERSION_MAJOR=$(VERSION_MAJOR) -define VERSION_MINOR=$(VERSION_MINOR) -define VERSION_SECURITY=$(VERSION_SECURITY) -define VERSION_PATCH=$(VERSION_PATCH) -define DEBUG_LEVEL=$(DEBUG_LEVEL) -define VISUAL_STUDIO_BUILD=true
+ReleaseOptions = -define HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO) -define HOTSPOT_VERSION_STRING=$(HOTSPOT_VERSION_STRING) -define VERSION_MAJOR=$(VERSION_MAJOR) -define VERSION_MINOR=$(VERSION_MINOR) -define VERSION_SECURITY=$(VERSION_SECURITY) -define VERSION_PATCH=$(VERSION_PATCH) -define VERSION_BUILD=$(VERSION_BUILD) -define VERSION_STRING=$(VERSION_STRING)
 ProjectCreatorIDEOptions = $(ProjectCreatorIDEOptions) $(ReleaseOptions)
 
 $(HOTSPOTBUILDSPACE)/$(ProjectFile): $(HOTSPOTBUILDSPACE)/classes/ProjectCreator.class
--- a/hotspot/src/share/tools/ProjectCreator/BuildConfig.java	Fri Dec 18 08:55:47 2015 +0100
+++ b/hotspot/src/share/tools/ProjectCreator/BuildConfig.java	Fri Dec 18 09:02:21 2015 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. 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
@@ -222,7 +222,7 @@
         } else {
             sysDefines.add("HOTSPOT_LIB_ARCH=\\\"amd64\\\"");
         }
-
+        sysDefines.add("DEBUG_LEVEL=\\\"" + get("Build")+"\\\"");
         sysDefines.addAll(defines);
 
         put("Define", sysDefines);
@@ -540,28 +540,6 @@
     }
 }
 
-class C2DebugConfig extends GenericDebugNonKernelConfig {
-    String getOptFlag() {
-        return getCI().getNoOptFlag();
-    }
-
-    C2DebugConfig() {
-        initNames("compiler2", "debug", "jvm.dll");
-        init(getIncludes(), getDefines());
-    }
-}
-
-class C2FastDebugConfig extends GenericDebugNonKernelConfig {
-    String getOptFlag() {
-        return getCI().getOptFlag();
-    }
-
-    C2FastDebugConfig() {
-        initNames("compiler2", "fastdebug", "jvm.dll");
-        init(getIncludes(), getDefines());
-    }
-}
-
 class TieredDebugConfig extends GenericDebugNonKernelConfig {
     String getOptFlag() {
         return getCI().getNoOptFlag();
@@ -603,13 +581,6 @@
     }
 }
 
-class C2ProductConfig extends ProductConfig {
-    C2ProductConfig() {
-        initNames("compiler2", "product", "jvm.dll");
-        init(getIncludes(), getDefines());
-    }
-}
-
 class TieredProductConfig extends ProductConfig {
     TieredProductConfig() {
         initNames("tiered", "product", "jvm.dll");
--- a/hotspot/src/share/tools/ProjectCreator/WinGammaPlatform.java	Fri Dec 18 08:55:47 2015 +0100
+++ b/hotspot/src/share/tools/ProjectCreator/WinGammaPlatform.java	Fri Dec 18 09:02:21 2015 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2015, Oracle and/or its affiliates. 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
@@ -25,12 +25,9 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.Iterator;
-import java.util.List;
 import java.util.Stack;
-import java.util.TreeSet;
 import java.util.Vector;
 
 abstract class HsArgHandler extends ArgHandler {
@@ -571,10 +568,6 @@
         allConfigs.add(new C1FastDebugConfig());
         allConfigs.add(new C1ProductConfig());
 
-        allConfigs.add(new C2DebugConfig());
-        allConfigs.add(new C2FastDebugConfig());
-        allConfigs.add(new C2ProductConfig());
-
         allConfigs.add(new TieredDebugConfig());
         allConfigs.add(new TieredFastDebugConfig());
         allConfigs.add(new TieredProductConfig());
--- a/hotspot/src/share/vm/runtime/vm_version.cpp	Fri Dec 18 08:55:47 2015 +0100
+++ b/hotspot/src/share/vm/runtime/vm_version.cpp	Fri Dec 18 09:02:21 2015 +0100
@@ -68,16 +68,7 @@
   #error DEBUG_LEVEL must be defined
 #endif
 
-// NOTE: Builds within Visual Studio do not define the build target in
-//       HOTSPOT_VERSION_STRING, so it must be done here
-#if defined(VISUAL_STUDIO_BUILD) && !defined(PRODUCT)
-  #ifndef HOTSPOT_BUILD_TARGET
-    #error HOTSPOT_BUILD_TARGET must be defined
-  #endif
-  #define VM_RELEASE HOTSPOT_VERSION_STRING "-" HOTSPOT_BUILD_TARGET
-#else
-  #define VM_RELEASE HOTSPOT_VERSION_STRING
-#endif
+#define VM_RELEASE HOTSPOT_VERSION_STRING
 
 // HOTSPOT_VERSION_STRING equals the JDK VERSION_STRING (unless overridden
 // in a standalone build).
--- a/hotspot/test/runtime/logging/MonitorInflationTest.java	Fri Dec 18 08:55:47 2015 +0100
+++ b/hotspot/test/runtime/logging/MonitorInflationTest.java	Fri Dec 18 09:02:21 2015 +0100
@@ -26,6 +26,7 @@
  * @bug 8133885
  * @summary monitorinflation=debug should have logging from each of the statements in the code
  * @library /testlibrary
+ * @ignore 8145587
  * @modules java.base/sun.misc
  *          java.management
  * @build MonitorInflationTest