[PATCH v2] purgatory: fix disabling debug info

[Masahiro Yamada]

On Mon, Mar 27, 2023 at 3:23 AM Alyssa Ross <hi at alyssa.is> wrote:
>
> 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 <hi at alyssa.is>
> Cc: stable at vger.kernel.org
> ---
>
> Difference from v2: replace each AFLAGS_REMOVE_* assignment with a
> single aflags-remove-y line, and use foreach to add the -Wa versions,
> as suggested by Masahiro Yamada.


Applied to linux-kbuild/fixes.
Thanks.


>  arch/riscv/purgatory/Makefile | 7 +------
>  arch/x86/purgatory/Makefile   | 3 +--
>  2 files changed, 2 insertions(+), 8 deletions(-)
>
> diff --git a/arch/riscv/purgatory/Makefile b/arch/riscv/purgatory/Makefile
> index d16bf715a586..5730797a6b40 100644
> --- a/arch/riscv/purgatory/Makefile
> +++ b/arch/riscv/purgatory/Makefile
> @@ -84,12 +84,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
> -AFLAGS_REMOVE_strcmp.o         += -Wa,-gdwarf-2
> -AFLAGS_REMOVE_strlen.o         += -Wa,-gdwarf-2
> -AFLAGS_REMOVE_strncmp.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/arch/x86/purgatory/Makefile b/arch/x86/purgatory/Makefile
> index 17f09dc26381..82fec66d46d2 100644
> --- 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)
>
> base-commit: da8e7da11e4ba758caf4c149cc8d8cd555aefe5f
> --
> 2.37.1
>


-- 
Best Regards
Masahiro Yamada