Makefile.debug: re-enable debug info for .S files

[linux-stable] / scripts / Makefile.debug

diff --git a/scripts/Makefile.debug b/scripts/Makefile.debug
index 26d6a9d97a20ed201941a7dda0b1637b1e92b5e3..8cf1cb22dd934365658eef08b135789458f7dce9 100644 (file)
--- a/scripts/Makefile.debug
+++ b/scripts/Makefile.debug
@@ -1,18 +1,19 @@
-DEBUG_CFLAGS   := -g
+DEBUG_CFLAGS   :=
+debug-flags-y  := -g
 
 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 +28,5 @@ KBUILD_AFLAGS += -gz=zlib
 KBUILD_LDFLAGS += --compress-debug-sections=zlib
 endif
 
-KBUILD_CFLAGS += $(DEBUG_CFLAGS)
+KBUILD_CFLAGS  += $(DEBUG_CFLAGS)
 export DEBUG_CFLAGS