From b55759f19e009752e6e2d1ba0945089d79e073fa Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 23 Apr 2023 15:15:14 +0200 Subject: [PATCH] 6.1-stable patches added patches: purgatory-fix-disabling-debug-info.patch --- .../purgatory-fix-disabling-debug-info.patch | 51 +++++++++++++++++++ queue-6.1/series | 1 + 2 files changed, 52 insertions(+) create mode 100644 queue-6.1/purgatory-fix-disabling-debug-info.patch diff --git a/queue-6.1/purgatory-fix-disabling-debug-info.patch b/queue-6.1/purgatory-fix-disabling-debug-info.patch new file mode 100644 index 00000000000..26fc133525f --- /dev/null +++ b/queue-6.1/purgatory-fix-disabling-debug-info.patch @@ -0,0 +1,51 @@ +From d83806c4c0cccc0d6d3c3581a11983a9c186a138 Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Sun, 26 Mar 2023 18:21:21 +0000 +Subject: purgatory: fix disabling debug info + +From: Alyssa Ross + +commit d83806c4c0cccc0d6d3c3581a11983a9c186a138 upstream. + +Since 32ef9e5054ec, -Wa,-gdwarf-2 is no longer used in KBUILD_AFLAGS. +Instead, it includes -g, the appropriate -gdwarf-* flag, and also the +-Wa versions of both of those if building with Clang and GNU as. As a +result, debug info was being generated for the purgatory objects, even +though the intention was that it not be. + +Fixes: 32ef9e5054ec ("Makefile.debug: re-enable debug info for .S files") +Signed-off-by: Alyssa Ross +Cc: stable@vger.kernel.org +Acked-by: Nick Desaulniers +Signed-off-by: Masahiro Yamada +Signed-off-by: Greg Kroah-Hartman +--- + arch/riscv/purgatory/Makefile | 4 +--- + arch/x86/purgatory/Makefile | 3 +-- + 2 files changed, 2 insertions(+), 5 deletions(-) + +--- a/arch/riscv/purgatory/Makefile ++++ b/arch/riscv/purgatory/Makefile +@@ -74,9 +74,7 @@ CFLAGS_string.o += $(PURGATORY_CFLAGS) + CFLAGS_REMOVE_ctype.o += $(PURGATORY_CFLAGS_REMOVE) + CFLAGS_ctype.o += $(PURGATORY_CFLAGS) + +-AFLAGS_REMOVE_entry.o += -Wa,-gdwarf-2 +-AFLAGS_REMOVE_memcpy.o += -Wa,-gdwarf-2 +-AFLAGS_REMOVE_memset.o += -Wa,-gdwarf-2 ++asflags-remove-y += $(foreach x, -g -gdwarf-4 -gdwarf-5, $(x) -Wa,$(x)) + + $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE + $(call if_changed,ld) +--- a/arch/x86/purgatory/Makefile ++++ b/arch/x86/purgatory/Makefile +@@ -69,8 +69,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 += $(foreach x, -g -gdwarf-4 -gdwarf-5, $(x) -Wa,$(x)) + + $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE + $(call if_changed,ld) diff --git a/queue-6.1/series b/queue-6.1/series index e2e2eae3dfd..71a3fa53c8f 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -83,3 +83,4 @@ kvm-arm64-make-vcpu-flag-updates-non-preemptible.patch kvm-arm64-fix-buffer-overflow-in-kvm_arm_set_fw_reg.patch mips-define-runtime_discard_exit-in-ld-script.patch fuse-always-revalidate-rename-target-dentry.patch +purgatory-fix-disabling-debug-info.patch -- 2.47.3