From 22dcbe8897b4f3a4e42a606c26dd69f0239ae424 Mon Sep 17 00:00:00 2001 From: Honggang Li Date: Tue, 29 Oct 2019 16:16:22 +0800 Subject: [PATCH] temporally replace '-g3' with default '-g' rpm debugedit might corrupt the debug file strings when source files have been build with gcc -g3 which generates a .debug_macro section which shares strings with the .debuginfo section. https://bugzilla.redhat.com/show_bug.cgi?id=1630926 When bz1630926 got fixed, we no longer need this workaround. Signed-off-by: Honggang Li --- buildflags.mak | 6 +++--- compat/buildflags.mak | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/buildflags.mak b/buildflags.mak index 10ec288..4c597e1 100644 --- a/buildflags.mak +++ b/buildflags.mak @@ -163,9 +163,9 @@ ifneq (,${HFI_BRAKE_DEBUG}) BASECFLAGS += -DHFI_BRAKE_DEBUG endif ifneq (,${PSM_DEBUG}) - BASECFLAGS += -O -g3 -DPSM_DEBUG -D_HFI_DEBUGGING -funit-at-a-time -Wp,-D_FORTIFY_SOURCE=2 + BASECFLAGS += -O -g -DPSM_DEBUG -D_HFI_DEBUGGING -funit-at-a-time -Wp,-D_FORTIFY_SOURCE=2 else - BASECFLAGS += -O3 -g3 + BASECFLAGS += -O3 -g endif ifneq (,${PSM_COVERAGE}) # This check must come after PSM_DEBUG to override optimization setting BASECFLAGS += -O -fprofile-arcs -ftest-coverage @@ -196,7 +196,7 @@ endif BASECFLAGS += -fpic -fPIC -D_GNU_SOURCE -ASFLAGS += -g3 -fpic +ASFLAGS += -g -fpic BASECFLAGS += ${OPA_CFLAGS} diff --git a/compat/buildflags.mak b/compat/buildflags.mak index b448e4e..ab501d5 100644 --- a/compat/buildflags.mak +++ b/compat/buildflags.mak @@ -84,10 +84,10 @@ BASECFLAGS +=-Wall $(WERROR) BASECFLAGS += -fpic -fPIC -ASFLAGS += -g3 -fpic +ASFLAGS += -g -fpic ifeq (${CCARCH},icc) - BASECFLAGS += -O3 -g3 + BASECFLAGS += -O3 -g LDFLAGS += -static-intel else ifeq (${CCARCH},gcc) -- 2.21.0