changeset 1913:8f6de5564fba

8148416: Fix merge error in hotspot.m4 introduced in Merge changeset 8b46c6cecc37 Reviewed-by: dholmes
author ihse
date Thu, 28 Jan 2016 07:59:44 +0100
parents 9702a1ff8ef8
children f2e63f76b3d2
files common/autoconf/generated-configure.sh common/autoconf/hotspot.m4
diffstat 2 files changed, 1 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh	Tue Jan 26 09:18:12 2016 +0000
+++ b/common/autoconf/generated-configure.sh	Thu Jan 28 07:59:44 2016 +0100
@@ -4119,16 +4119,6 @@
 
 
 
-    # -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
 #
 # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -4849,7 +4839,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1453385294
+DATE_WHEN_GENERATED=1453964370
 
 ###############################################################################
 #
--- a/common/autoconf/hotspot.m4	Tue Jan 26 09:18:12 2016 +0000
+++ b/common/autoconf/hotspot.m4	Thu Jan 28 07:59:44 2016 +0100
@@ -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