--- old/common/autoconf/jdk-options.m4	2015-11-16 18:23:19.833269136 +0900
+++ new/common/autoconf/jdk-options.m4	2015-11-16 18:23:19.719398963 +0900
@@ -624,8 +624,29 @@
     ZIP_DEBUGINFO_FILES=true
   fi
 
+  #
+  # DEBUG_SYMBOL
+  #
+  AC_MSG_CHECKING([type of debug symbol])
+  DEBUG_SYMBOL="zipped"
+  AC_ARG_WITH([debug-symbols], [AS_HELP_STRING([--with-debug-symbols],
+      [set the debug symbol configuration (none, internal, external, zipped) @<:@zipped@:>@])],
+      [
+        DEBUG_SYMBOL="${withval}"
+      ])
+
+  if test "x$DEBUG_SYMBOL" != xzipped && \
+      test "x$DEBUG_SYMBOL" != xnone && \
+      test "x$DEBUG_SYMBOL" != xinternal && \
+      test "x$DEBUG_SYMBOL" != xexternal; then
+    AC_MSG_ERROR([Allowed debug symbols are: none, internal, external, zipped])
+  fi
+
+  AC_MSG_RESULT([$DEBUG_SYMBOL])
+
   AC_SUBST(ENABLE_DEBUG_SYMBOLS)
   AC_SUBST(ZIP_DEBUGINFO_FILES)
+  AC_SUBST(DEBUG_SYMBOL)
 ])
 
 ################################################################################