From b2153e9d08b95c12c82b3d75cfaba837734c561b Mon Sep 17 00:00:00 2001
From: Mark Dickinson <dickinsm@gmail.com>
Date: Wed, 5 May 2010 22:31:36 +0000
Subject: [PATCH] Merged revisions 80832 via svnmerge from
 svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80832 | mark.dickinson | 2010-05-05 23:23:58 +0100 (Wed, 05 May 2010) | 2 lines

  Issue #8625:  Turn off gcc optimization in debug builds.
........
---
 Misc/NEWS    | 6 ++++++
 configure    | 7 ++++---
 configure.in | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
index 050a8f5b52e..ef00387c14f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1145,6 +1145,12 @@ Extension Modules
 Build
 -----
 
+- Issue #8625: Turn off optimization in --with-pydebug builds with
+  gcc.  (Optimization was unintentionally turned on in gcc
+  --with-pydebug builds as a result of the issue #1628484 fix,
+  combined with autoconf's strange choice of default CFLAGS produced
+  by AC_PROG_CC for gcc.)
+
 - Issue #3646: It is now easily possible to install a Python framework into
   your home directory on MacOSX, see Mac/README for more information.
 
diff --git a/configure b/configure
index d3fce2f38f0..5b08c3a0ffb 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 80666 .
+# From configure.in Revision: 80728 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65 for python 3.2.
 #
@@ -5288,7 +5288,7 @@ then
 	    if test "$Py_DEBUG" = 'true' ; then
 		# Optimization messes up debuggers, so turn it off for
 		# debug builds.
-		OPT="-g -Wall $STRICT_PROTO"
+		OPT="-g -O0 -Wall $STRICT_PROTO"
 	    else
 		OPT="-g $WRAP -O3 -Wall $STRICT_PROTO"
 	    fi
@@ -13553,13 +13553,14 @@ fi
 
 
 
-
 case $ac_sys_system in
   OSF*) as_fn_error "OSF* systems are deprecated unless somebody volunteers. Check http://bugs.python.org/issue8606" "$LINENO" 5 ;;
 esac
 
 
 
+
+
 for h in `(cd $srcdir;echo Python/thread_*.h)`
 do
   THREADHEADERS="$THREADHEADERS \$(srcdir)/$h"
diff --git a/configure.in b/configure.in
index 7aa86d46cf6..5993e05f0ff 100644
--- a/configure.in
+++ b/configure.in
@@ -875,7 +875,7 @@ then
 	    if test "$Py_DEBUG" = 'true' ; then
 		# Optimization messes up debuggers, so turn it off for
 		# debug builds.
-		OPT="-g -Wall $STRICT_PROTO"
+		OPT="-g -O0 -Wall $STRICT_PROTO"
 	    else
 		OPT="-g $WRAP -O3 -Wall $STRICT_PROTO"
 	    fi