From: Nick Desaulniers <ndesaulniers@google.com>
To: Masahiro Yamada <masahiroy@kernel.org>
Cc: Michal Marek <michal.lkml@markovi.net>,
Linux Kbuild mailing list <linux-kbuild@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
clang-built-linux <llvm@lists.linux.dev>,
Bill Wendling <morbo@google.com>,
Greg Thelen <gthelen@google.com>,
Alexey Alexandrov <aalexand@google.com>,
Nick Desaulniers <ndesaulniers@google.com>,
Nathan Chancellor <nathan@kernel.org>
Subject: [PATCH v4] Makefile.debug: re-enable debug info for .S files
Date: Mon, 19 Sep 2022 10:45:47 -0700 [thread overview]
Message-ID: <20220919174547.3730737-1-ndesaulniers@google.com> (raw)
In-Reply-To: <CAK7LNAT_cMLGLBz7ugaLpJD3QmZmY8FK56x9nihvWeYhJpi2ag@mail.gmail.com>
Alexey reported that the fraction of unknown filename instances in
kallsyms grew from ~0.3% to ~10% recently; Bill and Greg tracked it down
to assembler defined symbols, which regressed as a result of:
commit b8a9092330da ("Kbuild: do not emit debug info for assembly with LLVM_IAS=1")
In that commit, I allude to restoring debug info for assembler defined
symbols in a follow up patch, but it seems I forgot to do so in
commit a66049e2cf0e ("Kbuild: make DWARF version a choice")
Link: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=31bf18645d98b4d3d7357353be840e320649a67d
Fixes: b8a9092330da ("Kbuild: do not emit debug info for assembly with LLVM_IAS=1")
Reported-by: Alexey Alexandrov <aalexand@google.com>
Reported-by: Bill Wendling <morbo@google.com>
Reported-by: Greg Thelen <gthelen@google.com>
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
Suggested-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Nick Desaulniers <ndesaulniers@google.com>
---
Changes v3 -> v4:
* Break out into its own patch.
* Move addition of debug-flags-y to DEBUG_CFLAGS and KBUILD_AFLAGS up
grouping the -gdwarf-* handling together.
lib/Kconfig.debug | 4 +++-
scripts/Makefile.debug | 18 +++++++++---------
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index bcbe60d6c80c..d3e5f36bb01e 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -264,8 +264,10 @@ config DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT
config DEBUG_INFO_DWARF4
bool "Generate DWARF Version 4 debuginfo"
select DEBUG_INFO
+ depends on !CC_IS_CLANG || (CC_IS_CLANG && (AS_IS_LLVM || (AS_IS_GNU && AS_VERSION >= 23502)))
help
- Generate DWARF v4 debug info. This requires gcc 4.5+ and gdb 7.0+.
+ Generate DWARF v4 debug info. This requires gcc 4.5+, binutils 2.35.2
+ if using clang without clang's integrated assembler, and gdb 7.0+.
If you have consumers of DWARF debug info that are not ready for
newer revisions of DWARF, you may wish to choose this or have your
diff --git a/scripts/Makefile.debug b/scripts/Makefile.debug
index 26d6a9d97a20..d6aecd78b942 100644
--- a/scripts/Makefile.debug
+++ b/scripts/Makefile.debug
@@ -4,15 +4,15 @@ ifdef CONFIG_DEBUG_INFO_SPLIT
DEBUG_CFLAGS += -gsplit-dwarf
endif
-ifndef CONFIG_AS_IS_LLVM
-KBUILD_AFLAGS += -Wa,-gdwarf-2
-endif
-
-ifndef CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT
-dwarf-version-$(CONFIG_DEBUG_INFO_DWARF4) := 4
-dwarf-version-$(CONFIG_DEBUG_INFO_DWARF5) := 5
-DEBUG_CFLAGS += -gdwarf-$(dwarf-version-y)
+debug-flags-$(CONFIG_DEBUG_INFO_DWARF4) += -gdwarf-4
+debug-flags-$(CONFIG_DEBUG_INFO_DWARF5) += -gdwarf-5
+ifeq ($(CONFIG_CC_IS_CLANG)$(CONFIG_AS_IS_GNU),yy)
+# Clang does not pass -g or -gdwarf-* option down to GAS.
+# Add -Wa, prefix to explicitly specify the flags.
+KBUILD_AFLAGS += $(addprefix -Wa$(comma), $(debug-flags-y))
endif
+DEBUG_CFLAGS += $(debug-flags-y)
+KBUILD_AFLAGS += $(debug-flags-y)
ifdef CONFIG_DEBUG_INFO_REDUCED
DEBUG_CFLAGS += -fno-var-tracking
@@ -27,5 +27,5 @@ KBUILD_AFLAGS += -gz=zlib
KBUILD_LDFLAGS += --compress-debug-sections=zlib
endif
-KBUILD_CFLAGS += $(DEBUG_CFLAGS)
+KBUILD_CFLAGS += $(DEBUG_CFLAGS)
export DEBUG_CFLAGS
--
2.37.3.968.ga6b4b080e4-goog
next prev parent reply other threads:[~2022-09-19 17:45 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-07 4:59 [PATCH v3 0/5] fix debug info for asm and DEBUG_INFO_SPLIT Nick Desaulniers
2022-09-07 4:59 ` [PATCH v3 1/5] x86/boot/compressed: prefer cc-option for CFLAGS additions Nick Desaulniers
2022-09-09 21:05 ` Masahiro Yamada
2022-09-07 4:59 ` [PATCH v3 2/5] Makefile.compiler: Use KBUILD_AFLAGS for as-option Nick Desaulniers
2022-09-09 21:06 ` Masahiro Yamada
2022-09-07 4:59 ` [PATCH v3 3/5] Makefile.compiler: replace cc-ifversion with compiler-specific macros Nick Desaulniers
2022-09-09 21:59 ` Masahiro Yamada
2022-09-07 4:59 ` [PATCH v3 4/5] Makefile.debug: re-enable debug info for .S files Nick Desaulniers
2022-09-07 4:59 ` [PATCH v3 5/5] Makefile.debug: set -g unconditional on CONFIG_DEBUG_INFO_SPLIT Nick Desaulniers
2022-09-09 20:56 ` Masahiro Yamada
2022-09-09 21:02 ` Masahiro Yamada
2022-09-19 17:08 ` [PATCH v4] Makefile.compiler: replace cc-ifversion with compiler-specific macros Nick Desaulniers
2022-09-23 19:44 ` Masahiro Yamada
2022-09-24 14:28 ` Masahiro Yamada
2022-09-25 1:22 ` Masahiro Yamada
2022-09-26 21:41 ` Nick Desaulniers
2023-04-27 11:53 ` Shreeya Patel
2023-04-28 7:41 ` Thorsten Leemhuis
2023-05-02 9:48 ` Shreeya Patel
2023-05-02 11:58 ` Linux regression tracking (Thorsten Leemhuis)
2023-04-28 17:27 ` Nick Desaulniers
2023-05-03 21:02 ` Shreeya Patel
2023-05-03 21:15 ` Nick Desaulniers
2023-05-03 22:33 ` Shreeya Patel
2023-05-15 23:01 ` Nick Desaulniers
2023-05-17 8:34 ` Shreeya Patel
2023-05-17 15:39 ` Ricardo Cañuelo
2023-05-17 16:27 ` Nick Desaulniers
2023-05-18 14:23 ` Ricardo Cañuelo
2023-05-18 21:12 ` Nick Desaulniers
2023-05-19 8:35 ` Ricardo Cañuelo
2023-05-19 15:57 ` Nick Desaulniers
2023-05-22 10:09 ` Ricardo Cañuelo
2023-05-22 16:52 ` Greg KH
2023-05-22 19:52 ` Nick Desaulniers
2023-05-22 20:01 ` Greg KH
2023-05-22 20:16 ` Nick Desaulniers
2023-05-23 10:27 ` Shreeya Patel
2023-05-23 21:27 ` Nick Desaulniers
2023-06-12 10:10 ` Shreeya Patel
2023-06-20 4:19 ` Masahiro Yamada
2023-07-10 12:09 ` Linux regression tracking (Thorsten Leemhuis)
2023-07-11 11:16 ` Shreeya Patel
2023-08-29 11:28 ` Linux regression tracking (Thorsten Leemhuis)
2023-09-11 10:05 ` Thorsten Leemhuis
2023-09-15 9:33 ` Shreeya Patel
2023-09-30 10:24 ` Masahiro Yamada
2022-09-19 17:30 ` [PATCH v4] Makefile.debug: set -g unconditional on CONFIG_DEBUG_INFO_SPLIT Nick Desaulniers
2022-09-24 1:34 ` Masahiro Yamada
2022-09-19 17:45 ` Nick Desaulniers [this message]
2022-09-24 2:11 ` [PATCH v4] Makefile.debug: re-enable debug info for .S files Masahiro Yamada
2022-09-24 2:20 ` Nick Desaulniers
2022-09-24 6:43 ` Masahiro Yamada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220919174547.3730737-1-ndesaulniers@google.com \
--to=ndesaulniers@google.com \
--cc=aalexand@google.com \
--cc=gthelen@google.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=masahiroy@kernel.org \
--cc=michal.lkml@markovi.net \
--cc=morbo@google.com \
--cc=nathan@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).