From: Nick Alcock Date: Fri, 12 Dec 2014 18:45:37 +0000 (+0000) Subject: ctf: Prohibit a bunch of debug info options we don't support. X-Git-Tag: v4.1.12-92~313^2~26 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=53e95b790f86a3efc8c50440687ef9329f364a90;p=users%2Fjedix%2Flinux-maple.git ctf: Prohibit a bunch of debug info options we don't support. CONFIG_DEBUG_INFO_DWARF4 and CONFIG_DEBUG_INFO_SPLIT will require significant changes to dwarf2ctf, but will eventually be supported. CONFIG_DEBUG_INFO_REDUCED fundamentally breaks the type deduplicator and will never be supported. Unfortunately this forces us to change the DEBUG_INFO select to a depends, so you have to remember to turn CONFIG_DEBUG_INFO on or half of dtrace won't work. Orabug: 20456825 Signed-off-by: Nick Alcock Acked-by: Kris Van Hees --- diff --git a/kernel/ctf/Kconfig b/kernel/ctf/Kconfig index 8bbad30772af..571e26c51b96 100644 --- a/kernel/ctf/Kconfig +++ b/kernel/ctf/Kconfig @@ -1,6 +1,8 @@ config CTF bool "Compact Type Format generation" default n + select STRIP_ASM_SYMS + depends on DEBUG_INFO && !DEBUG_INFO_REDUCED && !DEBUG_INFO_SPLIT && !DEBUG_INFO_DWARF4 help Emit a compact, compressed description of the kernel's datatypes and global variables into .ctf sections in kernel modules. A module diff --git a/kernel/dtrace/Kconfig b/kernel/dtrace/Kconfig index e2c3f7bd44c4..80aadd503d4a 100644 --- a/kernel/dtrace/Kconfig +++ b/kernel/dtrace/Kconfig @@ -11,8 +11,6 @@ menuconfig DTRACE select KALLSYMS select WAITFD select CTF if (!DT_DISABLE_CTF) - select STRIP_ASM_SYMS if (!DT_DISABLE_CTF) - select DEBUG_INFO if (!DT_DISABLE_CTF) help To be written.