OpenJDK / amber / amber
changeset 58309:f60f449f3959 stats-before-this-super
Automatic merge with default
line wrap: on
line diff
--- a/.hgtags Thu Sep 05 22:41:41 2019 +0000 +++ b/.hgtags Fri Oct 11 20:56:32 2019 +0000 @@ -585,3 +585,9 @@ bf4c808a4488025a415f867e54c8b088417e08a0 jdk-14+11 8570f22b9b6ac6bec673899b582150865696e425 jdk-14+12 fbbe6672ae15deaf350a9e935290a36f57ba9c25 jdk-14+13 +cddef3bde924f3ff4f17f3d369280cf69d0450e5 jdk-14+14 +9c250a7600e12bdb1e611835250af3204d4aa152 jdk-13-ga +778fc2dcbdaa8981e07e929a2cacef979c72261e jdk-14+15 +d29f0181ba424a95d881aba5eabf2e393abcc70f jdk-14+16 +5c83830390baafb76a1fbe33443c57620bd45fb9 jdk-14+17 +e84d8379815ba0d3e50fb096d28c25894cb50b8c jdk-14+18
--- a/doc/building.html Thu Sep 05 22:41:41 2019 +0000 +++ b/doc/building.html Fri Oct 11 20:56:32 2019 +0000 @@ -281,7 +281,7 @@ <tbody> <tr class="odd"> <td style="text-align: left;">Linux</td> -<td style="text-align: left;">gcc 8.2.0</td> +<td style="text-align: left;">gcc 8.3.0</td> </tr> <tr class="even"> <td style="text-align: left;">macOS</td> @@ -293,14 +293,14 @@ </tr> <tr class="even"> <td style="text-align: left;">Windows</td> -<td style="text-align: left;">Microsoft Visual Studio 2017 update 15.9.6</td> +<td style="text-align: left;">Microsoft Visual Studio 2017 update 15.9.16</td> </tr> </tbody> </table> <p>All compilers are expected to be able to compile to the C99 language standard, as some C99 features are used in the source code. Microsoft Visual Studio doesn't fully support C99 so in practice shared code is limited to using C99 features that it does support.</p> <h3 id="gcc">gcc</h3> <p>The minimum accepted version of gcc is 4.8. Older versions will generate a warning by <code>configure</code> and are unlikely to work.</p> -<p>The JDK is currently known to be able to compile with at least version 7.4 of gcc.</p> +<p>The JDK is currently known to be able to compile with at least version 8.3 of gcc.</p> <p>In general, any version between these two should be usable.</p> <h3 id="clang">clang</h3> <p>The minimum accepted version of clang is 3.2. Older versions will not be accepted by <code>configure</code>.</p>
--- a/doc/building.md Thu Sep 05 22:41:41 2019 +0000 +++ b/doc/building.md Fri Oct 11 20:56:32 2019 +0000 @@ -323,10 +323,10 @@ Operating system Toolchain version ------------------ ------------------------------------------------------- - Linux gcc 8.2.0 + Linux gcc 8.3.0 macOS Apple Xcode 10.1 (using clang 10.0.0) Solaris Oracle Solaris Studio 12.6 (with compiler version 5.15) - Windows Microsoft Visual Studio 2017 update 15.9.6 + Windows Microsoft Visual Studio 2017 update 15.9.16 All compilers are expected to be able to compile to the C99 language standard, as some C99 features are used in the source code. Microsoft Visual Studio @@ -338,7 +338,7 @@ The minimum accepted version of gcc is 4.8. Older versions will generate a warning by `configure` and are unlikely to work. -The JDK is currently known to be able to compile with at least version 7.4 of +The JDK is currently known to be able to compile with at least version 8.3 of gcc. In general, any version between these two should be usable.
--- a/doc/testing.html Thu Sep 05 22:41:41 2019 +0000 +++ b/doc/testing.html Fri Oct 11 20:56:32 2019 +0000 @@ -5,7 +5,7 @@ <meta name="generator" content="pandoc" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> <title>Testing the JDK</title> - <style type="text/css"> + <style> code{white-space: pre-wrap;} span.smallcaps{font-variant: small-caps;} span.underline{text-decoration: underline;} @@ -21,9 +21,9 @@ <header id="title-block-header"> <h1 class="title">Testing the JDK</h1> </header> -<nav id="TOC"> +<nav id="TOC" role="doc-toc"> <ul> -<li><a href="#using-make-test-the-run-test-framework">Using "make test" (the run-test framework)</a><ul> +<li><a href="#using-make-test-the-run-test-framework">Using "make test" (the run-test framework)</a><ul> <li><a href="#configuration">Configuration</a></li> </ul></li> <li><a href="#test-selection">Test selection</a><ul> @@ -42,10 +42,11 @@ <li><a href="#notes-for-specific-tests">Notes for Specific Tests</a><ul> <li><a href="#docker-tests">Docker Tests</a></li> <li><a href="#non-us-locale">Non-US locale</a></li> +<li><a href="#pkcs11-tests">PKCS11 Tests</a></li> </ul></li> </ul> </nav> -<h2 id="using-make-test-the-run-test-framework">Using "make test" (the run-test framework)</h2> +<h2 id="using-make-test-the-run-test-framework">Using "make test" (the run-test framework)</h2> <p>This new way of running tests is developer-centric. It assumes that you have built a JDK locally and want to test it. Running common test targets is simple, and more complex ad-hoc combination of tests is possible. The user interface is forgiving, and clearly report errors it cannot resolve.</p> <p>The main target <code>test</code> uses the jdk-image as the tested product. There is also an alternate target <code>exploded-test</code> that uses the exploded image instead. Not all tests will run successfully on the exploded image, but using this target can greatly improve rebuild times for certain workflows.</p> <p>Previously, <code>make test</code> was used to invoke an old system for running tests, and <code>make run-test</code> was used for the new test framework. For backward compatibility with scripts and muscle memory, <code>run-test</code> (and variants like <code>exploded-run-test</code> or <code>run-test-tier1</code>) are kept as aliases.</p> @@ -63,7 +64,7 @@ <p>To be able to run microbenchmarks, <code>configure</code> needs to know where to find the JMH dependency. Use <code>--with-jmh=<path to JMH jars></code> to point to a directory containing the core JMH and transitive dependencies. The recommended dependencies can be retrieved by running <code>sh make/devkit/createJMHBundle.sh</code>, after which <code>--with-jmh=build/jmh/jars</code> should work.</p> <h2 id="test-selection">Test selection</h2> <p>All functionality is available using the <code>test</code> make target. In this use case, the test or tests to be executed is controlled using the <code>TEST</code> variable. To speed up subsequent test runs with no source code changes, <code>test-only</code> can be used instead, which do not depend on the source and test image build.</p> -<p>For some common top-level tests, direct make targets have been generated. This includes all JTReg test groups, the hotspot gtest, and custom tests (if present). This means that <code>make test-tier1</code> is equivalent to <code>make test TEST="tier1"</code>, but the latter is more tab-completion friendly. For more complex test runs, the <code>test TEST="x"</code> solution needs to be used.</p> +<p>For some common top-level tests, direct make targets have been generated. This includes all JTReg test groups, the hotspot gtest, and custom tests (if present). This means that <code>make test-tier1</code> is equivalent to <code>make test TEST="tier1"</code>, but the latter is more tab-completion friendly. For more complex test runs, the <code>test TEST="x"</code> solution needs to be used.</p> <p>The test specifications given in <code>TEST</code> is parsed into fully qualified test descriptors, which clearly and unambigously show which tests will be run. As an example, <code>:tier1</code> will expand to <code>jtreg:$(TOPDIR)/test/hotspot/jtreg:tier1 jtreg:$(TOPDIR)/test/jdk:tier1 jtreg:$(TOPDIR)/test/langtools:tier1 jtreg:$(TOPDIR)/test/nashorn:tier1 jtreg:$(TOPDIR)/test/jaxp:tier1</code>. You can always submit a list of fully qualified test descriptors in the <code>TEST</code> variable if you want to shortcut the parser.</p> <h3 id="jtreg">JTReg</h3> <p>JTReg tests can be selected either by picking a JTReg test group, or a selection of files or directories containing JTReg tests.</p> @@ -103,8 +104,8 @@ <p>Additional work data is stored in <code>build/$BUILD/test-support/$TEST_ID</code>. For some frameworks, this directory might contain information that is useful in determining the cause of a failed test.</p> <h2 id="test-suite-control">Test suite control</h2> <p>It is possible to control various aspects of the test suites using make control variables.</p> -<p>These variables use a keyword=value approach to allow multiple values to be set. So, for instance, <code>JTREG="JOBS=1;TIMEOUT_FACTOR=8"</code> will set the JTReg concurrency level to 1 and the timeout factor to 8. This is equivalent to setting <code>JTREG_JOBS=1 JTREG_TIMEOUT_FACTOR=8</code>, but using the keyword format means that the <code>JTREG</code> variable is parsed and verified for correctness, so <code>JTREG="TMIEOUT_FACTOR=8"</code> would give an error, while <code>JTREG_TMIEOUT_FACTOR=8</code> would just pass unnoticed.</p> -<p>To separate multiple keyword=value pairs, use <code>;</code> (semicolon). Since the shell normally eats <code>;</code>, the recommended usage is to write the assignment inside qoutes, e.g. <code>JTREG="...;..."</code>. This will also make sure spaces are preserved, as in <code>JTREG="VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug"</code>.</p> +<p>These variables use a keyword=value approach to allow multiple values to be set. So, for instance, <code>JTREG="JOBS=1;TIMEOUT_FACTOR=8"</code> will set the JTReg concurrency level to 1 and the timeout factor to 8. This is equivalent to setting <code>JTREG_JOBS=1 JTREG_TIMEOUT_FACTOR=8</code>, but using the keyword format means that the <code>JTREG</code> variable is parsed and verified for correctness, so <code>JTREG="TMIEOUT_FACTOR=8"</code> would give an error, while <code>JTREG_TMIEOUT_FACTOR=8</code> would just pass unnoticed.</p> +<p>To separate multiple keyword=value pairs, use <code>;</code> (semicolon). Since the shell normally eats <code>;</code>, the recommended usage is to write the assignment inside qoutes, e.g. <code>JTREG="...;..."</code>. This will also make sure spaces are preserved, as in <code>JTREG="VM_OPTIONS=-XshowSettings -Xlog:gc+ref=debug"</code>.</p> <p>(Other ways are possible, e.g. using backslash: <code>JTREG=JOBS=1\;TIMEOUT_FACTOR=8</code>. Also, as a special technique, the string <code>%20</code> will be replaced with space for certain options, e.g. <code>JTREG=VM_OPTIONS=-XshowSettings%20-Xlog:gc+ref=debug</code>. This can be useful if you have layers of scripts and have trouble getting proper quoting of command line arguments through.)</p> <p>As far as possible, the names of the keywords have been standardized between test suites.</p> <h3 id="general-keywords-test_opts">General keywords (TEST_OPTS)</h3> @@ -159,7 +160,7 @@ <p>Set to <code>true</code> or <code>false</code>. If <code>true</code>, JTReg will use <code>-match:</code> option, otherwise <code>-exclude:</code> will be used. Default is <code>false</code>.</p> <h4 id="options">OPTIONS</h4> <p>Additional options to the JTReg test framework.</p> -<p>Use <code>JTREG="OPTIONS=--help all"</code> to see all available JTReg options.</p> +<p>Use <code>JTREG="OPTIONS=--help all"</code> to see all available JTReg options.</p> <h4 id="java_options-1">JAVA_OPTIONS</h4> <p>Additional Java options to JTReg (<code>-javaoption</code>).</p> <h4 id="vm_options-1">VM_OPTIONS</h4> @@ -172,7 +173,7 @@ <p>Default is 1. Set to -1 to repeat indefinitely. This can be especially useful combined with <code>OPTIONS=--gtest_break_on_failure</code> to reproduce an intermittent problem.</p> <h4 id="options-1">OPTIONS</h4> <p>Additional options to the Gtest test framework.</p> -<p>Use <code>GTEST="OPTIONS=--help"</code> to see all available Gtest options.</p> +<p>Use <code>GTEST="OPTIONS=--help"</code> to see all available Gtest options.</p> <h4 id="aot_modules-2">AOT_MODULES</h4> <p>Generate AOT modules before testing for the specified module, or set of modules. If multiple modules are specified, they should be separated by space (or, to help avoid quoting issues, the special value <code>%20</code>).</p> <h3 id="microbenchmark-keywords">Microbenchmark keywords</h3> @@ -199,8 +200,12 @@ <p>To run these tests correctly, additional parameters for the correct docker image are required on Ubuntu 18.04 by using <code>JAVA_OPTIONS</code>.</p> <pre><code>$ make test TEST="jtreg:test/hotspot/jtreg/containers/docker" JTREG="JAVA_OPTIONS=-Djdk.test.docker.image.name=ubuntu -Djdk.test.docker.image.version=latest"</code></pre> <h3 id="non-us-locale">Non-US locale</h3> -<p>If your locale is non-US, some tests are likely to fail. To work around this you can set the locale to US. On Unix platforms simply setting <code>LANG="en_US"</code> in the environment before running tests should work. On Windows, setting <code>JTREG="VM_OPTIONS=-Duser.language=en -Duser.country=US"</code> helps for most, but not all test cases. For example:</p> +<p>If your locale is non-US, some tests are likely to fail. To work around this you can set the locale to US. On Unix platforms simply setting <code>LANG="en_US"</code> in the environment before running tests should work. On Windows, setting <code>JTREG="VM_OPTIONS=-Duser.language=en -Duser.country=US"</code> helps for most, but not all test cases. For example:</p> <pre><code>$ export LANG="en_US" && make test TEST=... $ make test JTREG="VM_OPTIONS=-Duser.language=en -Duser.country=US" TEST=...</code></pre> +<h3 id="pkcs11-tests">PKCS11 Tests</h3> +<p>It is highly recommended to use the latest NSS version when running PKCS11 tests. Improper NSS version may lead to unexpected failures which are hard to diagnose. For example, sun/security/pkcs11/Secmod/AddTrustedCert.java may fail on Ubuntu 18.04 with the default NSS version in the system. To run these tests correctly, the system property <code>test.nss.lib.paths</code> is required on Ubuntu 18.04 to specify the alternative NSS lib directories. For example:</p> +<pre><code>$ make test TEST="jtreg:sun/security/pkcs11/Secmod/AddTrustedCert.java" JTREG="JAVA_OPTIONS=-Dtest.nss.lib.paths=/path/to/your/latest/NSS-libs"</code></pre> +<p>For more notes about the PKCS11 tests, please refer to test/jdk/sun/security/pkcs11/README.</p> </body> </html>
--- a/doc/testing.md Thu Sep 05 22:41:41 2019 +0000 +++ b/doc/testing.md Fri Oct 11 20:56:32 2019 +0000 @@ -407,6 +407,20 @@ $ export LANG="en_US" && make test TEST=... $ make test JTREG="VM_OPTIONS=-Duser.language=en -Duser.country=US" TEST=... +### PKCS11 Tests + +It is highly recommended to use the latest NSS version when running PKCS11 tests. +Improper NSS version may lead to unexpected failures which are hard to diagnose. +For example, sun/security/pkcs11/Secmod/AddTrustedCert.java may fail on Ubuntu +18.04 with the default NSS version in the system. +To run these tests correctly, the system property `test.nss.lib.paths` is required +on Ubuntu 18.04 to specify the alternative NSS lib directories. +For example: + + $ make test TEST="jtreg:sun/security/pkcs11/Secmod/AddTrustedCert.java" JTREG="JAVA_OPTIONS=-Dtest.nss.lib.paths=/path/to/your/latest/NSS-libs" + +For more notes about the PKCS11 tests, please refer to test/jdk/sun/security/pkcs11/README. + --- # Override some definitions in the global css file that are not optimal for # this document.
--- a/make/CreateJmods.gmk Thu Sep 05 22:41:41 2019 +0000 +++ b/make/CreateJmods.gmk Fri Oct 11 20:56:32 2019 +0000 @@ -86,16 +86,18 @@ # from there. These files were explicitly filtered or modified in <module>-copy # targets. For the rest, just pick up everything from the source legal dirs. LEGAL_NOTICES := \ - $(SUPPORT_OUTPUTDIR)/modules_legal/common \ + $(wildcard $(SUPPORT_OUTPUTDIR)/modules_legal/common) \ $(if $(wildcard $(SUPPORT_OUTPUTDIR)/modules_legal/$(MODULE)), \ $(wildcard $(SUPPORT_OUTPUTDIR)/modules_legal/$(MODULE)), \ $(call FindModuleLegalSrcDirs, $(MODULE)) \ ) -LEGAL_NOTICES_PATH := $(call PathList, $(LEGAL_NOTICES)) -DEPS += $(call FindFiles, $(LEGAL_NOTICES)) +ifneq ($(strip $(LEGAL_NOTICES)), ) + LEGAL_NOTICES_PATH := $(call PathList, $(LEGAL_NOTICES)) + DEPS += $(call FindFiles, $(LEGAL_NOTICES)) -JMOD_FLAGS += --legal-notices $(LEGAL_NOTICES_PATH) + JMOD_FLAGS += --legal-notices $(LEGAL_NOTICES_PATH) +endif ifeq ($(filter-out jdk.incubator.%, $(MODULE)), ) JMOD_FLAGS += --do-not-resolve-by-default
--- a/make/Main.gmk Thu Sep 05 22:41:41 2019 +0000 +++ b/make/Main.gmk Fri Oct 11 20:56:32 2019 +0000 @@ -707,6 +707,8 @@ $(foreach m, $(JAVA_MODULES), \ $(eval $m-java: $(addsuffix -java, $(filter $(JAVA_MODULES), \ $(call FindDepsForModule,$m))))) + # Declare dependencies between the module meta targets + $(foreach m, $(ALL_MODULES), $(eval $m: $(call FindDepsForModule,$m))) # Declare dependencies between <module>-rmic to <module>-java $(foreach m, $(RMIC_MODULES), $(eval $m-rmic: $m-java))
--- a/make/RunTests.gmk Thu Sep 05 22:41:41 2019 +0000 +++ b/make/RunTests.gmk Fri Oct 11 20:56:32 2019 +0000 @@ -98,13 +98,15 @@ JTREG_FAILURE_HANDLER_DIR := $(TEST_IMAGE_DIR)/failure_handler JTREG_FAILURE_HANDLER := $(JTREG_FAILURE_HANDLER_DIR)/jtregFailureHandler.jar +JTREG_FAILURE_HANDLER_TIMEOUT ?= 0 + ifneq ($(wildcard $(JTREG_FAILURE_HANDLER)), ) JTREG_FAILURE_HANDLER_OPTIONS := \ -timeoutHandlerDir:$(JTREG_FAILURE_HANDLER) \ -observerDir:$(JTREG_FAILURE_HANDLER) \ -timeoutHandler:jdk.test.failurehandler.jtreg.GatherProcessInfoTimeoutHandler \ -observer:jdk.test.failurehandler.jtreg.GatherDiagnosticInfoObserver \ - -timeoutHandlerTimeout:0 + -timeoutHandlerTimeout:$(JTREG_FAILURE_HANDLER_TIMEOUT) endif GTEST_LAUNCHER_DIRS := $(patsubst %/gtestLauncher, %, \ @@ -276,10 +278,11 @@ $(eval $(call SetTestOpt,JOBS,JTREG)) $(eval $(call SetTestOpt,TIMEOUT_FACTOR,JTREG)) +$(eval $(call SetTestOpt,FAILURE_HANDLER_TIMEOUT,JTREG)) $(eval $(call ParseKeywordVariable, JTREG, \ - SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR TEST_MODE ASSERT VERBOSE RETAIN \ - MAX_MEM RUN_PROBLEM_LISTS, \ + SINGLE_KEYWORDS := JOBS TIMEOUT_FACTOR FAILURE_HANDLER_TIMEOUT \ + TEST_MODE ASSERT VERBOSE RETAIN MAX_MEM RUN_PROBLEM_LISTS, \ STRING_KEYWORDS := OPTIONS JAVA_OPTIONS VM_OPTIONS KEYWORDS \ EXTRA_PROBLEM_LISTS AOT_MODULES, \ ))
--- a/make/RunTestsPrebuilt.gmk Thu Sep 05 22:41:41 2019 +0000 +++ b/make/RunTestsPrebuilt.gmk Fri Oct 11 20:56:32 2019 +0000 @@ -230,7 +230,7 @@ NUM_CORES := $(shell /usr/sbin/sysctl -n hw.ncpu) MEMORY_SIZE := $(shell $(EXPR) `/usr/sbin/sysctl -n hw.memsize` / 1024 / 1024) else ifeq ($(OPENJDK_TARGET_OS), solaris) - NUM_CORES := $(shell LC_MESSAGES=C /usr/sbin/psrinfo -v | $(GREP) -c on-line) + NUM_CORES := $(shell /usr/sbin/psrinfo -v | $(GREP) -c on-line) MEMORY_SIZE := $(shell \ /usr/sbin/prtconf 2> /dev/null | $(GREP) "^Memory [Ss]ize" | $(AWK) '{print $$3}' \ )
--- a/make/RunTestsPrebuiltSpec.gmk Thu Sep 05 22:41:41 2019 +0000 +++ b/make/RunTestsPrebuiltSpec.gmk Fri Oct 11 20:56:32 2019 +0000 @@ -27,6 +27,9 @@ # Fake minimalistic spec file for RunTestsPrebuilt.gmk. ################################################################################ +# Make sure all shell commands are executed with the C locale +export LC_ALL := C + define VerifyVariable ifeq ($$($1), ) $$(info Error: Variable $1 is missing, needed by RunTestPrebuiltSpec.gmk)
--- a/make/autoconf/basics.m4 Thu Sep 05 22:41:41 2019 +0000 +++ b/make/autoconf/basics.m4 Fri Oct 11 20:56:32 2019 +0000 @@ -205,6 +205,34 @@ fi ]) +################################################################################ +# This will make a path absolute. Assumes it's already a unix path. Also +# resolves ~ to homedir. +AC_DEFUN([BASIC_ABSOLUTE_PATH], +[ + if test "x[$]$1" != x; then + new_path="[$]$1" + + # Use eval to expand a potential ~. This technique does not work if there + # are spaces in the path (which is valid at this point on Windows), so only + # try to apply it if there is an actual ~ first in the path. + if [ [[ "$new_path" = "~"* ]] ]; then + eval new_path="$new_path" + if test ! -f "$new_path" && test ! -d "$new_path"; then + AC_MSG_ERROR([The new_path of $1, which resolves as "$new_path", is not found.]) + fi + fi + + if test -d "$new_path"; then + $1="`cd "$new_path"; $THEPWDCMD -L`" + else + dir="`$DIRNAME "$new_path"`" + base="`$BASENAME "$new_path"`" + $1="`cd "$dir"; $THEPWDCMD -L`/$base" + fi + fi +]) + ############################################################################### # This will make sure the given variable points to a full and proper # path. This means: @@ -217,7 +245,6 @@ AC_DEFUN([BASIC_FIXUP_PATH], [ # Only process if variable expands to non-empty - if test "x[$]$1" != x; then if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then BASIC_FIXUP_PATH_CYGWIN($1) @@ -234,19 +261,8 @@ AC_MSG_ERROR([Spaces are not allowed in this path.]) fi - # Use eval to expand a potential ~ - eval path="$path" - if test ! -f "$path" && test ! -d "$path"; then - AC_MSG_ERROR([The path of $1, which resolves as "$path", is not found.]) - fi - - if test -d "$path"; then - $1="`cd "$path"; $THEPWDCMD -L`" - else - dir="`$DIRNAME "$path"`" - base="`$BASENAME "$path"`" - $1="`cd "$dir"; $THEPWDCMD -L`/$base" - fi + BASIC_ABSOLUTE_PATH(path) + $1="$path" fi fi ]) @@ -411,7 +427,7 @@ # Save the path variable before it gets changed ORIGINAL_PATH="$PATH" AC_SUBST(ORIGINAL_PATH) - DATE_WHEN_CONFIGURED=`LANG=C date` + DATE_WHEN_CONFIGURED=`date` AC_SUBST(DATE_WHEN_CONFIGURED) AC_MSG_NOTICE([Configuration created at $DATE_WHEN_CONFIGURED.]) ])
--- a/make/autoconf/basics_windows.m4 Thu Sep 05 22:41:41 2019 +0000 +++ b/make/autoconf/basics_windows.m4 Fri Oct 11 20:56:32 2019 +0000 @@ -148,6 +148,8 @@ path="[$]$1" new_path=`$CYGPATH -u "$path"` + BASIC_ABSOLUTE_PATH(new_path) + # Cygwin tries to hide some aspects of the Windows file system, such that binaries are # named .exe but called without that suffix. Therefore, "foo" and "foo.exe" are considered # the same file, most of the time (as in "test -f"). But not when running cygpath -s, then @@ -181,6 +183,8 @@ new_path=`cmd //c echo $path` fi + BASIC_ABSOLUTE_PATH(new_path) + BASIC_MAKE_WINDOWS_SPACE_SAFE_MSYS([$new_path]) BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(new_path) if test "x$path" != "x$new_path"; then @@ -199,6 +203,8 @@ new_path="[$]$1" BASIC_WINDOWS_REWRITE_AS_UNIX_PATH([new_path]) + BASIC_ABSOLUTE_PATH(new_path) + # Call helper function which possibly converts this using DOS-style short mode. # If so, the updated path is stored in $new_path. BASIC_MAKE_WINDOWS_SPACE_SAFE_WSL([$new_path])
--- a/make/autoconf/build-performance.m4 Thu Sep 05 22:41:41 2019 +0000 +++ b/make/autoconf/build-performance.m4 Fri Oct 11 20:56:32 2019 +0000 @@ -35,7 +35,7 @@ FOUND_CORES=yes elif test -x /usr/sbin/psrinfo; then # Looks like a Solaris system - NUM_CORES=`LC_MESSAGES=C /usr/sbin/psrinfo -v | grep -c on-line` + NUM_CORES=`/usr/sbin/psrinfo -v | grep -c on-line` FOUND_CORES=yes elif test -x /usr/sbin/sysctl; then # Looks like a MacOSX system
--- a/make/autoconf/buildjdk-spec.gmk.in Thu Sep 05 22:41:41 2019 +0000 +++ b/make/autoconf/buildjdk-spec.gmk.in Fri Oct 11 20:56:32 2019 +0000 @@ -91,7 +91,7 @@ # Save speed and disk space by not enabling debug symbols for the buildjdk ENABLE_DEBUG_SYMBOLS := false -# Control wether Hotspot builds gtest tests +# Control whether Hotspot builds gtest tests BUILD_GTEST := false JVM_VARIANTS := server
--- a/make/autoconf/configure Thu Sep 05 22:41:41 2019 +0000 +++ b/make/autoconf/configure Fri Oct 11 20:56:32 2019 +0000 @@ -43,6 +43,9 @@ export CONFIG_SHELL=$BASH export _as_can_reexec=no +# Make sure all shell commands are executed with the C locale +export LC_ALL=C + if test "x$CUSTOM_CONFIG_DIR" != x; then custom_hook=$CUSTOM_CONFIG_DIR/custom-hook.m4 if test ! -e $custom_hook; then