From e87fc0bfde8bd48b449e123c1bdd28e1359e8c77 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Thu, 15 Dec 2011 16:59:17 +0100 Subject: Revert "enable -gdwarf-4 by default if possible" It turns out even quite recent gdb (7.1) reportedly does not support DWARF4, moreover while the produced binaries are smaller, faster and make gdb initially use less memory, this quickly ceases to the case as soon as one actually does anything in gdb. Presumably the DWARF4 handling in current gdb is very inefficient (http://sourceware.org/bugzilla/show_bug.cgi?id=13498). This reverts commit 5214f7843ca48f2207945fbfe32ba164afe7b3aa. Conflicts: solenv/gbuild/platform/WNT_INTEL_GCC.mk solenv/gbuild/platform/unxgcc.mk --- configure.in | 18 ------------------ set_soenv.in | 1 - solenv/gbuild/platform/WNT_INTEL_GCC.mk | 7 ------- solenv/gbuild/platform/unxgcc.mk | 7 ------- 4 files changed, 33 deletions(-) diff --git a/configure.in b/configure.in index 59cb7fb793f3..354fa521a23a 100644 --- a/configure.in +++ b/configure.in @@ -3823,24 +3823,6 @@ fi AC_SUBST(HAVE_GCC_VISIBILITY_FEATURE) AC_SUBST(HAVE_GCC_VISIBILITY_BROKEN) -dnl =================================================================== -dnl gcc DWARF-4 support (smaller debug info) -dnl =================================================================== -if test "$GCC" = "yes"; then - AC_MSG_CHECKING([whether $CC supports -gdwarf-4]) - save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -Werror -gdwarf-4" - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ HAVE_GCC_DWARF_4=TRUE ],[]) - CFLAGS=$save_CFLAGS - if test "$HAVE_GCC_DWARF_4" = "TRUE"; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi -fi - -AC_SUBST(HAVE_GCC_DWARF_4) - dnl =================================================================== dnl allocator dnl =================================================================== diff --git a/set_soenv.in b/set_soenv.in index 2150be5a6551..150636662ea7 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -1700,7 +1700,6 @@ ToFile( "HAVE_GCC_VISIBILITY_FEATURE", "@HAVE_GCC_VISIBILITY_FEATURE@", "e" ); ToFile( "HAVE_GCC_VISIBILITY_BROKEN", "@HAVE_GCC_VISIBILITY_BROKEN@", "e" ); -ToFile( "HAVE_GCC_DWARF_4","@HAVE_GCC_DWARF_4@","e" ); ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_HASH_STYLE@","e" ); ToFile( "WITH_LINKER_HASH_STYLE","@WITH_LINKER_HASH_STYLE@","e" ); ToFile( "HAVE_LD_BSYMBOLIC_FUNCTIONS", diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 5b49bff68eb2..c7387e9d857e 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -98,9 +98,6 @@ gb_LinkTarget_LDFLAGS += -shared-libgcc endif gb_DEBUG_CFLAGS := -ggdb2 -finline-limit=0 -fno-inline -fno-default-inline -ifeq ($(HAVE_GCC_DWARF_4),TRUE) -gb_DEBUG_CFLAGS += -gdwarf-4 -endif gb_STDLIBS := \ mingwthrd \ @@ -154,10 +151,6 @@ gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR) ifeq ($(gb_SYMBOL),$(true)) gb_LinkTarget_CXXFLAGS += -ggdb2 gb_LinkTarget_CFLAGS += -ggdb2 -ifeq ($(HAVE_GCC_DWARF_4),TRUE) -gb_LinkTarget_CXXFLAGS += -gdwarf-4 -gb_LinkTarget_CFLAGS += -gdwarf-4 -endif endif gb_LinkTarget_INCLUDE +=\ diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 851e020255a2..4b80cee3ecc5 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -162,9 +162,6 @@ gb_LINKEROPTFLAGS := -Wl,-O1 endif gb_DEBUG_CFLAGS := -ggdb2 -finline-limit=0 -fno-inline -fno-default-inline -ifeq ($(HAVE_GCC_DWARF_4),TRUE) -gb_DEBUG_CFLAGS += -gdwarf-4 -endif gb_COMPILERNOOPTFLAGS := -O0 @@ -209,10 +206,6 @@ gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) $(gb_CXXFLAGS_WERROR) ifeq ($(gb_SYMBOL),$(true)) gb_LinkTarget_CXXFLAGS += -ggdb2 gb_LinkTarget_CFLAGS += -ggdb2 -ifeq ($(HAVE_GCC_DWARF_4),TRUE) -gb_LinkTarget_CXXFLAGS += -gdwarf-4 -gb_LinkTarget_CFLAGS += -gdwarf-4 -endif endif # note that `cat $(extraobjectlist)` is needed to build with older gcc versions, e.g. 4.1.2 on SLED10 -- cgit