--- old/common/autoconf/generated-configure.sh	2015-11-19 20:12:06.636665512 +0900
+++ new/common/autoconf/generated-configure.sh	2015-11-19 20:12:06.439664038 +0900
@@ -683,6 +683,9 @@
 GCOV_ENABLED
 ZIP_DEBUGINFO_FILES
 ENABLE_DEBUG_SYMBOLS
+STRIP_POLICY
+DEBUG_BINARIES
+DEBUG_SYMBOLS
 CFLAGS_WARNINGS_ARE_ERRORS
 DISABLE_WARNING_PREFIX
 HOTSPOT_SET_WARNINGS_AS_ERRORS
@@ -1084,6 +1087,9 @@
 with_build_devkit
 with_jtreg
 enable_warnings_as_errors
+with_debug_symbols
+enable_debug_binaries
+with_strip_policy
 enable_debug_symbols
 enable_zip_debug_info
 enable_native_coverage
@@ -1858,6 +1864,8 @@
   --disable-warnings-as-errors
                           do not consider native warnings to be an error
                           [enabled]
+  --disable-debug-binaries
+                          disable generating debug information [enabled]
   --disable-debug-symbols disable generation of debug symbols [enabled]
   --disable-zip-debug-info
                           disable zipping of debug-info files [enabled]
@@ -1951,6 +1959,10 @@
                           dependent]
   --with-build-devkit     Devkit to use for the build platform toolchain
   --with-jtreg            Regression Test Harness [probed]
+  --with-debug-symbols    set the debug symbol configuration (none, internal,
+                          external, zipped) [zipped]
+  --with-strip-policy     set the policy of strip (all_strip, min_strip,
+                          no_strip) [min_strip]
   --with-stdc++lib=<static>,<dynamic>,<default>
                           force linking of the C++ runtime on Linux to either
                           static or dynamic, default is static with dynamic as
@@ -4610,7 +4622,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1446762265
+DATE_WHEN_GENERATED=1447929925
 
 ###############################################################################
 #
@@ -45306,10 +45318,107 @@
 
 # Setup debug symbols (need objcopy from the toolchain for that)
 
+  DEBUG_BINARIES=false
+  STRIP_POLICY=min_strip
+
+  #
+  # DEBUG_SYMBOLS
+  #
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking what type of debug symbols to use" >&5
+$as_echo_n "checking what type of debug symbols to use... " >&6; }
+
+# Check whether --with-debug-symbols was given.
+if test "${with_debug_symbols+set}" = set; then :
+  withval=$with_debug_symbols;
+else
+  with_debug_symbols="zipped"
+fi
+
+  DEBUG_SYMBOLS=$with_debug_symbols
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEBUG_SYMBOLS" >&5
+$as_echo "$DEBUG_SYMBOLS" >&6; }
+
+  if test "x$DEBUG_SYMBOLS" = xzipped; then
+    ENABLE_DEBUG_SYMBOLS=true
+    ZIP_DEBUGINFO_FILES=true
+    DEBUG_BINARIES=true
+    STRIP_POLICY=min_strip
+    JAVAC_FLAGS="$JAVAC_FLAGS -g"
+  elif test "x$DEBUG_SYMBOLS" = xnone; then
+    ENABLE_DEBUG_SYMBOLS=false
+    ZIP_DEBUGINFO_FILES=false
+    DEBUG_BINARIES=false
+    STRIP_POLICY=min_strip
+  elif test "x$DEBUG_SYMBOLS" = xinternal; then
+    ENABLE_DEBUG_SYMBOLS=false  # -g option only
+    ZIP_DEBUGINFO_FILES=false
+    DEBUG_BINARIES=true
+    STRIP_POLICY=no_strip
+    STRIP=""
+    JAVAC_FLAGS="$JAVAC_FLAGS -g"
+  elif test "x$DEBUG_SYMBOLS" = xexternal; then
+    ENABLE_DEBUG_SYMBOLS=true
+    ZIP_DEBUGINFO_FILES=false
+    DEBUG_BINARIES=true
+    STRIP_POLICY=min_strip
+    JAVAC_FLAGS="$JAVAC_FLAGS -g"
+  else
+    as_fn_error $? "Allowed debug symbols are: none, internal, external, zipped" "$LINENO" 5
+  fi
+
+  #
+  # DEBUG_BINARIES
+  #
+  if test "x$DEBUG_BINARIES" = xtrue; then
+    enable_debug_binaries=yes
+  else
+    enable_debug_binaries=no
+  fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should generate debug information" >&5
+$as_echo_n "checking if we should generate debug information... " >&6; }
+  # Check whether --enable-debug-binaries was given.
+if test "${enable_debug_binaries+set}" = set; then :
+  enableval=$enable_debug_binaries;
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_debug_binaries" >&5
+$as_echo "$enable_debug_binaries" >&6; }
+  if test "x$enable_debug_binaries" = xyes; then
+    DEBUG_BINARIES=true
+  else
+    DEBUG_BINARIES=false
+  fi
+
+  #
+  # STRIP_POLICY
+  #
+  strip_policy=$STRIP_POLICY
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking what policy of strip" >&5
+$as_echo_n "checking what policy of strip... " >&6; }
+
+# Check whether --with-strip-policy was given.
+if test "${with_strip_policy+set}" = set; then :
+  withval=$with_strip_policy; STRIP_POLICY=$strip_policy
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP_POLICY" >&5
+$as_echo "$STRIP_POLICY" >&6; }
+
+  if test "x$STRIP_POLICY" != xall_strip && \
+      test "x$STRIP_POLICY" != xmin_strip && \
+      test "x$STRIP_POLICY" != xno_strip; then
+    as_fn_error $? "Allowed strip policies are: all_strip, min_strip, no_strip" "$LINENO" 5
+  fi
+
   #
   # ENABLE_DEBUG_SYMBOLS
   # This must be done after the toolchain is setup, since we're looking at objcopy.
   #
+  if test "x$ENABLE_DEBUG_SYMBOLS" = xtrue; then
+    enable_debug_symbols=yes
+  else
+    enable_debug_symbols=no
+  fi
   # Check whether --enable-debug-symbols was given.
 if test "${enable_debug_symbols+set}" = set; then :
   enableval=$enable_debug_symbols;
@@ -45347,13 +45456,16 @@
   #
   # ZIP_DEBUGINFO_FILES
   #
+  if test "x$ZIP_DEBUGINFO_FILES" = xtrue; then
+    enable_zip_debug_info=yes
+  else
+    enable_zip_debug_info=no
+  fi
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should zip debug-info files" >&5
 $as_echo_n "checking if we should zip debug-info files... " >&6; }
   # Check whether --enable-zip-debug-info was given.
 if test "${enable_zip_debug_info+set}" = set; then :
-  enableval=$enable_zip_debug_info; enable_zip_debug_info="${enableval}"
-else
-  enable_zip_debug_info="yes"
+  enableval=$enable_zip_debug_info;
 fi
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_zip_debug_info}" >&5
@@ -45367,6 +45479,9 @@
 
 
 
+
+
+
 
 
   # Check whether --enable-native-coverage was given.