diff -r 7ea4fdc536b6 -r 30ba61626044 common/autoconf/flags.m4
--- a/common/autoconf/flags.m4	Thu Jun 26 23:10:58 2014 -0700
+++ b/common/autoconf/flags.m4	Wed Jul 09 21:55:52 2014 +0000
@@ -407,11 +407,7 @@
         C_O_FLAG_HI="-O3"
         C_O_FLAG_NORM="-O2"
       fi
-      if test "x$HAS_CFLAG_OPTIMIZE_DEBUG" = "xtrue"; then
-        C_O_FLAG_DEBUG="$CFLAG_OPTIMIZE_DEBUG_FLAG"
-      else
-        C_O_FLAG_DEBUG="-O0"
-      fi
+      C_O_FLAG_DEBUG="-O0"
       C_O_FLAG_NONE="-O0"
     elif test "x$TOOLCHAIN_TYPE" = xclang; then
       if test "x$OPENJDK_TARGET_OS" = xmacosx; then