diff -r 5a74c7d52dde -r d0e2516cc2a2 common/autoconf/jdk-options.m4
--- a/common/autoconf/jdk-options.m4	Fri Dec 11 17:45:48 2015 -0800
+++ b/common/autoconf/jdk-options.m4	Thu Dec 17 10:16:27 2015 +0100
@@ -515,7 +515,10 @@
 
     ENABLE_DEBUG_SYMBOLS=true
     ZIP_DEBUGINFO_FILES=true
-    DEBUG_BINARIES=true
+    # -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
     STRIP_POLICY=min_strip
   elif test "x$NATIVE_DEBUG_SYMBOLS" = xnone; then
     ENABLE_DEBUG_SYMBOLS=false
@@ -525,6 +528,8 @@
   elif test "x$NATIVE_DEBUG_SYMBOLS" = xinternal; then
     ENABLE_DEBUG_SYMBOLS=false  # -g option only
     ZIP_DEBUGINFO_FILES=false
+    # Fastdebug builds with this setting will essentially be slowdebug
+    # in hotspot.
     DEBUG_BINARIES=true
     STRIP_POLICY=no_strip
     STRIP=""
@@ -540,7 +545,10 @@
 
     ENABLE_DEBUG_SYMBOLS=true
     ZIP_DEBUGINFO_FILES=false
-    DEBUG_BINARIES=true
+    # -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
     STRIP_POLICY=min_strip
   else
     AC_MSG_ERROR([Allowed native debug symbols are: none, internal, external, zipped])