From 73a9cc055933e49cb656474267fd0bd5d9fe2e71 Mon Sep 17 00:00:00 2001
From: Giovanni Bussi <giovanni.bussi@gmail.com>
Date: Mon, 30 Apr 2018 16:00:13 +0200
Subject: [PATCH] Revert "Added more debug options for gcc"
This reverts commit 2128bada5fa5852bea1aa8b6ef0985cddacb3b1d.
Giving false positive in master branch - no idea why and cannot debug it
---
configure | 10 +++-------
configure.ac | 6 ++----
2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/configure b/configure
index a14560c35..7cd59fd58 100755
--- a/configure
+++ b/configure
@@ -6712,16 +6712,12 @@ $as_echo "$as_me: Release mode, adding -DNDEBUG" >&6;}
fi
-# in debug-glibcxx mode, add other debug macros
+# in debug-glibcxx mode, add -D_GLIBCXX_DEBUG
if test "$debug_glibcxx" == true ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: Enabling libstdc++ debug options, adding -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -D_GLIBCXX_ASSERTIONS" >&5
-$as_echo "$as_me: Enabling libstdc++ debug options, adding -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -D_GLIBCXX_ASSERTIONS" >&6;}
+ { $as_echo "$as_me:${as_lineno-$LINENO}: Check boundaries, adding -D_GLIBCXX_DEBUG" >&5
+$as_echo "$as_me: Check boundaries, adding -D_GLIBCXX_DEBUG" >&6;}
$as_echo "#define _GLIBCXX_DEBUG 1" >>confdefs.h
- $as_echo "#define _GLIBCXX_DEBUG_PEDANTIC 1" >>confdefs.h
-
- $as_echo "#define _GLIBCXX_DEBUG_ASSERTIONS 1" >>confdefs.h
-
fi
if test "$cxx_exceptions" == true ; then
diff --git a/configure.ac b/configure.ac
index 3a2ccae7c..80d1775bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -542,12 +542,10 @@ if test "$debug" == false ; then
AC_DEFINE([NDEBUG])
fi
-# in debug-glibcxx mode, add other debug macros
+# in debug-glibcxx mode, add -D_GLIBCXX_DEBUG
if test "$debug_glibcxx" == true ; then
- AC_MSG_NOTICE([Enabling libstdc++ debug options, adding -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC -D_GLIBCXX_ASSERTIONS])
+ AC_MSG_NOTICE([Check boundaries, adding -D_GLIBCXX_DEBUG])
AC_DEFINE([_GLIBCXX_DEBUG])
- AC_DEFINE([_GLIBCXX_DEBUG_PEDANTIC])
- AC_DEFINE([_GLIBCXX_DEBUG_ASSERTIONS])
fi
if test "$cxx_exceptions" == true ; then
--
GitLab