diff options
| author | Jan Beulich <jbeulich@novell.com> | 2006-01-11 22:42:05 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-11 19:01:10 -0800 |
| commit | 6e0c47ede7b1473a4e2ab65a0fecf0385ab23c03 (patch) | |
| tree | b190f8d76776faf5a2fba9fbfa866c71ec793265 | |
| parent | 130951ccb14167c20b87e8bed52b60864ed53c2b (diff) | |
[PATCH] x86_64: Separate CONFIG_UNWIND_INFO from CONFIG_DEBUG_INFO
As a follow-up to the introduction of CONFIG_UNWIND_INFO, this
separates the generation of frame unwind information for x86-64 from
that of full debug information.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/x86_64/Makefile | 4 | ||||
| -rw-r--r-- | arch/x86_64/kernel/vmlinux.lds.S | 2 | ||||
| -rw-r--r-- | include/asm-x86_64/dwarf2.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile index 51d83288d62..2d3e9be229c 100644 --- a/arch/x86_64/Makefile +++ b/arch/x86_64/Makefile @@ -38,8 +38,10 @@ CFLAGS += -pipe # actually it makes the kernel smaller too. CFLAGS += -fno-reorder-blocks CFLAGS += -Wno-sign-compare -ifneq ($(CONFIG_DEBUG_INFO),y) +ifneq ($(CONFIG_UNWIND_INFO),y) CFLAGS += -fno-asynchronous-unwind-tables +endif +ifneq ($(CONFIG_DEBUG_INFO),y) # -fweb shrinks the kernel a bit, but the difference is very small # it also messes up debugging, so don't use it for now. #CFLAGS += $(call cc-option,-fweb) diff --git a/arch/x86_64/kernel/vmlinux.lds.S b/arch/x86_64/kernel/vmlinux.lds.S index 58b19215b4b..4cbbe7c4883 100644 --- a/arch/x86_64/kernel/vmlinux.lds.S +++ b/arch/x86_64/kernel/vmlinux.lds.S @@ -189,7 +189,7 @@ SECTIONS /* Sections to be discarded */ /DISCARD/ : { *(.exitcall.exit) -#ifndef CONFIG_DEBUG_INFO +#ifndef CONFIG_UNWIND_INFO *(.eh_frame) #endif } diff --git a/include/asm-x86_64/dwarf2.h b/include/asm-x86_64/dwarf2.h index fe062cba0a8..07654bd155b 100644 --- a/include/asm-x86_64/dwarf2.h +++ b/include/asm-x86_64/dwarf2.h @@ -14,7 +14,7 @@ away for older version. */ -#ifdef CONFIG_DEBUG_INFO +#ifdef CONFIG_UNWIND_INFO #define CFI_STARTPROC .cfi_startproc #define CFI_ENDPROC .cfi_endproc |