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