rpms/kernel/F-13 linux-2.6-x86-cfi_sections.patch, NONE, 1.1 kernel.spec, 1.2038, 1.2039

[roland]

Author: roland

Update of /cvs/pkgs/rpms/kernel/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25045

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-x86-cfi_sections.patch 
Log Message:
x86: put assembly CFI in .debug_frame

linux-2.6-x86-cfi_sections.patch:
 Makefile             |    5 +++--
 include/asm/dwarf2.h |   13 ++++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-x86-cfi_sections.patch ---
>From 9e565292270a2d55524be38835104c564ac8f795 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland at redhat.com>
Date: Thu, 13 May 2010 21:43:03 -0700
Subject: [PATCH] x86: Use .cfi_sections for assembly code

The newer assemblers support the .cfi_sections directive so we can put
the CFI from .S files into the .debug_frame section that is preserved
in unstripped vmlinux and in separate debuginfo, rather than the
.eh_frame section that is now discarded by vmlinux.lds.S.

Signed-off-by: Roland McGrath <roland at redhat.com>
LKML-Reference: <20100514044303.A6FE7400BE at magilla.sf.frob.com>
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
---
 arch/x86/Makefile             |    5 +++--
 arch/x86/include/asm/dwarf2.h |   12 ++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 0a43dc5..8aa1b59 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -95,8 +95,9 @@ sp-$(CONFIG_X86_64) := rsp
 cfi := $(call as-instr,.cfi_startproc\n.cfi_rel_offset $(sp-y)$(comma)0\n.cfi_endproc,-DCONFIG_AS_CFI=1)
 # is .cfi_signal_frame supported too?
 cfi-sigframe := $(call as-instr,.cfi_startproc\n.cfi_signal_frame\n.cfi_endproc,-DCONFIG_AS_CFI_SIGNAL_FRAME=1)
-KBUILD_AFLAGS += $(cfi) $(cfi-sigframe)
-KBUILD_CFLAGS += $(cfi) $(cfi-sigframe)
+cfi-sections := $(call as-instr,.cfi_sections .debug_frame,-DCONFIG_AS_CFI_SECTIONS=1)
+KBUILD_AFLAGS += $(cfi) $(cfi-sigframe) $(cfi-sections)
+KBUILD_CFLAGS += $(cfi) $(cfi-sigframe) $(cfi-sections)
 
 LDFLAGS := -m elf_$(UTS_MACHINE)
 
diff --git a/arch/x86/include/asm/dwarf2.h b/arch/x86/include/asm/dwarf2.h
index ae6253a..733f7e9 100644
--- a/arch/x86/include/asm/dwarf2.h
+++ b/arch/x86/include/asm/dwarf2.h
@@ -34,6 +34,18 @@
 #define CFI_SIGNAL_FRAME
 #endif
 
+#if defined(CONFIG_AS_CFI_SECTIONS) && defined(__ASSEMBLY__)
+	/*
+	 * Emit CFI data in .debug_frame sections, not .eh_frame sections.
+	 * The latter we currently just discard since we don't do DWARF
+	 * unwinding at runtime.  So only the offline DWARF information is
+	 * useful to anyone.  Note we should not use this directive if this
+	 * file is used in the vDSO assembly, or if vmlinux.lds.S gets
+	 * changed so it doesn't discard .eh_frame.
+	 */
+	.cfi_sections .debug_frame
+#endif
+
 #else
 
 /*
-- 
1.7.0.1



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/kernel.spec,v
retrieving revision 1.2038
retrieving revision 1.2039
diff -u -p -r1.2038 -r1.2039
--- kernel.spec	18 May 2010 16:22:19 -0000	1.2038
+++ kernel.spec	19 May 2010 00:38:03 -0000	1.2039
@@ -794,6 +794,7 @@ Patch4000: linux-2.6-cpufreq-locking.pat
 Patch12010: linux-2.6-dell-laptop-rfkill-fix.patch
 Patch12011: linux-2.6-block-silently-error-unsupported-empty-barriers-too.patch
 Patch12013: linux-2.6-rfkill-all.patch
+Patch12014: linux-2.6-x86-cfi_sections.patch
 
 Patch12015: add-appleir-driver.patch
 
@@ -1277,6 +1278,7 @@ ApplyPatch linux-2.6-utrace-ptrace.patch
 # Architecture patches
 # x86(-64)
 ApplyPatch linux-2.6-dell-laptop-rfkill-fix.patch
+ApplyPatch linux-2.6-x86-cfi_sections.patch
 
 #
 # Intel IOMMU
@@ -2202,6 +2204,9 @@ fi
 # and build.
 
 %changelog
+* Wed May 19 2010 Roland McGrath <roland at redhat.com>
+- x86: put assembly CFI in .debug_frame
+
 * Tue May 18 2010 Kyle McMartin <kyle at redhat.com>
 - btrfs: check for read permission on src file in the clone ioctl
   (rhbz#593226)