--- a/common/autoconf/jdk-options.m4	Thu Oct 10 10:08:45 2013 -0700
+++ b/common/autoconf/jdk-options.m4	Tue Oct 15 08:24:31 2013 -0700
@@ -518,11 +518,11 @@
 elif test "x$enable_debug_symbols" = "xno"; then
   ENABLE_DEBUG_SYMBOLS=false
 else
-  # default on macosx is false
-  if test "x$OPENJDK_TARGET_OS" = xmacosx; then
-    ENABLE_DEBUG_SYMBOLS=false
-  # Default is on if objcopy is found, otherwise off
-  elif test "x$OBJCOPY" != x || test "x$OPENJDK_TARGET_OS" = xwindows; then
+  # Default is on if objcopy is found
+  if test "x$OBJCOPY" != x; then
+    ENABLE_DEBUG_SYMBOLS=true
+  # MacOS X and Windows don't use objcopy but default is on for those OSes
+  elif test "x$OPENJDK_TARGET_OS" = xmacosx || test "x$OPENJDK_TARGET_OS" = xwindows; then
     ENABLE_DEBUG_SYMBOLS=true
   else
     ENABLE_DEBUG_SYMBOLS=false