Re: [PATCH v4 2/3] Kbuild: make DWARF version a choice

From: Sedat Dilek
Date: Wed Jan 13 2021 - 16:31:07 EST


On Wed, Jan 13, 2021 at 1:32 AM Nick Desaulniers
<ndesaulniers@xxxxxxxxxx> wrote:
>
> Modifies CONFIG_DEBUG_INFO_DWARF4 to be a member of a choice. Adds an
> explicit CONFIG_DEBUG_INFO_DWARF2, which is the default. Does so in a
> way that's forward compatible with existing configs, and makes adding
> future versions more straightforward.
>
> Suggested-by: Fangrui Song <maskray@xxxxxxxxxx>
> Suggested-by: Masahiro Yamada <masahiroy@xxxxxxxxxx>
> Signed-off-by: Nick Desaulniers <ndesaulniers@xxxxxxxxxx>
> ---
> Makefile | 14 +++++++++-----
> lib/Kconfig.debug | 21 ++++++++++++++++-----
> 2 files changed, 25 insertions(+), 10 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index d49c3f39ceb4..656fff17b331 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -826,12 +826,16 @@ else
> DEBUG_CFLAGS += -g
> endif
>
> -ifneq ($(LLVM_IAS),1)
> -KBUILD_AFLAGS += -Wa,-gdwarf-2
> +dwarf-version-$(CONFIG_DEBUG_INFO_DWARF2) := 2
> +dwarf-version-$(CONFIG_DEBUG_INFO_DWARF4) := 4
> +DEBUG_CFLAGS += -gdwarf-$(dwarf-version-y)
> +ifneq ($(dwarf-version-y)$(LLVM_IAS),21)
> +# Binutils 2.35+ required for -gdwarf-4+ support.
> +dwarf-aflag := $(call as-option,-Wa$(comma)-gdwarf-$(dwarf-version-y))
> +ifdef CONFIG_CC_IS_CLANG
> +DEBUG_CFLAGS += $(dwarf-aflag)
> endif

Why is that "ifdef CONFIG_CC_IS_CLANG"?
When I use GCC v10.2.1 DEBUG_CFLAGS are not set.

- Sedat -

> -
> -ifdef CONFIG_DEBUG_INFO_DWARF4
> -DEBUG_CFLAGS += -gdwarf-4
> +KBUILD_AFLAGS += $(dwarf-aflag)
> endif
>
> ifdef CONFIG_DEBUG_INFO_REDUCED
> diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
> index dd7d8d35b2a5..e80770fac4f0 100644
> --- a/lib/Kconfig.debug
> +++ b/lib/Kconfig.debug
> @@ -256,13 +256,24 @@ config DEBUG_INFO_SPLIT
> to know about the .dwo files and include them.
> Incompatible with older versions of ccache.
>
> +choice
> + prompt "DWARF version"
> + help
> + Which version of DWARF debug info to emit.
> +
> +config DEBUG_INFO_DWARF2
> + bool "Generate DWARF Version 2 debuginfo"
> + help
> + Generate DWARF v2 debug info.
> +
> config DEBUG_INFO_DWARF4
> - bool "Generate dwarf4 debuginfo"
> + bool "Generate DWARF Version 4 debuginfo"
> help
> - Generate dwarf4 debug info. This requires recent versions
> - of gcc and gdb. It makes the debug information larger.
> - But it significantly improves the success of resolving
> - variables in gdb on optimized code.
> + Generate DWARF v4 debug info. This requires gcc 4.5+ and gdb 7.0+.
> + It makes the debug information larger, but it significantly
> + improves the success of resolving variables in gdb on optimized code.
> +
> +endchoice # "DWARF version"
>
> config DEBUG_INFO_BTF
> bool "Generate BTF typeinfo"
> --
> 2.30.0.284.gd98b1dd5eaa7-goog
>