From 1def43055d3563ecfeddaa8881f3d910e7fd55a5 Mon Sep 17 00:00:00 2001
From: Honggang Li <honli@redhat.com>
Date: Mon, 24 Sep 2018 17:04:16 +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 <honli@redhat.com>
---
 buildflags.mak        | 6 +++---
 compat/buildflags.mak | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/buildflags.mak b/buildflags.mak
index f59958c..633a010 100644
--- a/buildflags.mak
+++ b/buildflags.mak
@@ -147,9 +147,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
@@ -185,7 +185,7 @@ else
   BASECFLAGS += -DNVALGRIND
 endif
 
-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.14.4