Skip to contentSkip to conversation

x86/purgatory: fix disabling debug info

PATCH New Alyssa Ross 1 participant 1 message Apr 21, 2023 Stable branch

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/purgatory: fix disabling debug info

This is based on upstream commit
d83806c4c0cc ("purgatory: fix disabling debug info"), but adapted to the linker flags used in 5.15.y.

Since 0ee2f0567a56, the linker flags can contain -g instead of -Wa,-gdwarf-2 (when using the LLVM assembler). As a result, in that case, debug info was being generated for the purgatory objects, even though the intention was that it not be.

Fixes 0ee2f0567a56 ("Makefile.debug: re-enable debug info for .S files")
Cc Nick Desaulniers <[email protected]>
---
 arch/x86/purgatory/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
arch/x86/purgatory/Makefile +1 -2
index 95ea17a9d20c..ebaf329a2368 100644
@@ -64,8 +64,7 @@ CFLAGS_sha256.o			+= $(PURGATORY_CFLAGS)
 CFLAGS_REMOVE_string.o		+= $(PURGATORY_CFLAGS_REMOVE)
 CFLAGS_string.o			+= $(PURGATORY_CFLAGS)
 
-AFLAGS_REMOVE_setup-x86_$(BITS).o	+= -Wa,-gdwarf-2
-AFLAGS_REMOVE_entry64.o			+= -Wa,-gdwarf-2
+asflags-remove-y		+= -g -Wa,-gdwarf-2
 
 $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE
 		$(call if_changed,ld)
Signature · 1 line
2.37.1