On 2016-01-28 06:49, David Holmes wrote:
On 28/01/2016 8:40 AM, Magnus Ihse Bursie wrote:
A merge error occured in changeset 8b46c6cecc37 in the file hotspot.m4.
Very odd given the file was brand new prior to the merge.
I split out half the contents of the jdk-options.m4 into the new file
hotspot.m4. As usual, I used "hg cp" to do this, so changes in the "old"
jdk-options.m4 that relate to code that now resides in hotspot.m4 can be
tracked correctly. This normally works fine, but from time to time, I've
noticed that mercurial can get confused and suggest weird merges.
Bug: https://bugs.openjdk.java.net/browse/JDK-8148416
Patch inline:
diff --git a/common/autoconf/hotspot.m4 b/common/autoconf/hotspot.m4
--- a/common/autoconf/hotspot.m4
+++ b/common/autoconf/hotspot.m4
@@ -266,14 +266,3 @@
HOTSPOT_MAKE_ARGS="$HOTSPOT_TARGET"
AC_SUBST(HOTSPOT_MAKE_ARGS)
])
-
- # -g is already added by ENABLE_DEBUG_SYMBOLS and the hotspot
makefiles
- # will basically do slowdebug builds when DEBUG_BINARIES is set for
- # fastdebug builds
- DEBUG_BINARIES=false
- # Fastdebug builds with this setting will essentially be slowdebug
- # in hotspot.
- # -g is already added by ENABLE_DEBUG_SYMBOLS and the hotspot
makefiles
- # will basically do slowdebug builds when DEBUG_BINARIES is set for
- # fastdebug builds
- DEBUG_BINARIES=false
\ No newline at end of file
Looks good.
Thanks.
/Magnus
Thanks,
David
/Magnus
