5 files changed, 20 insertions, 0 deletions

diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 508cdbeb3a09..7cc0b189b82b 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -50,6 +50,10 @@ CFLAGS				+= $(shell if [ $(call cc-version) -lt 0400 ] ; then echo $(call cc-op
 cflags-y += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,)
 AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,)
 
+# is .cfi_signal_frame supported too?
+cflags-y += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,)
+AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,)
+
 CFLAGS += $(cflags-y)
 
 # Default subarch .c files
diff --git a/arch/i386/kernel/entry.S b/arch/i386/kernel/entry.S
index 284f2e908ad0..5a63d6fdb70e 100644
--- a/arch/i386/kernel/entry.S
+++ b/arch/i386/kernel/entry.S
@@ -183,18 +183,21 @@ VM_MASK		= 0x00020000
 
 #define RING0_INT_FRAME \
         CFI_STARTPROC simple;\
+        CFI_SIGNAL_FRAME;\
         CFI_DEF_CFA esp, 3*4;\
         /*CFI_OFFSET cs, -2*4;*/\
         CFI_OFFSET eip, -3*4
 
 #define RING0_EC_FRAME \
         CFI_STARTPROC simple;\
+        CFI_SIGNAL_FRAME;\
         CFI_DEF_CFA esp, 4*4;\
         /*CFI_OFFSET cs, -2*4;*/\
         CFI_OFFSET eip, -3*4
 
 #define RING0_PTREGS_FRAME \
         CFI_STARTPROC simple;\
+        CFI_SIGNAL_FRAME;\
         CFI_DEF_CFA esp, OLDESP-EBX;\
         /*CFI_OFFSET cs, CS-OLDESP;*/\
         CFI_OFFSET eip, EIP-OLDESP;\
@@ -275,6 +278,7 @@ need_resched:
         # sysenter call handler stub
 ENTRY(sysenter_entry)
         CFI_STARTPROC simple
+        CFI_SIGNAL_FRAME
         CFI_DEF_CFA esp, 0
         CFI_REGISTER esp, ebp
         movl TSS_sysenter_esp0(%esp),%esp
diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile
index 2b8d07c70106..1c0f18d4f887 100644
--- a/arch/x86_64/Makefile
+++ b/arch/x86_64/Makefile
@@ -58,6 +58,10 @@ cflags-y += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,)
 cflags-y += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,)
 AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_endproc,-DCONFIG_AS_CFI=1,)
 
+# is .cfi_signal_frame supported too?
+cflags-y += $(call as-instr,.cfi_startproc\n.cfi_signal_frame\n.cfi_endproc,-DCONFIG_AS_CFI_SIGNAL_FRAME=1,)
+AFLAGS += $(call as-instr,.cfi_startproc\n.cfi_signal_frame\n.cfi_endproc,-DCONFIG_AS_CFI_SIGNAL_FRAME=1,)
+
 cflags-$(CONFIG_CC_STACKPROTECTOR) += $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-x86_64-has-stack-protector.sh $(CC) -fstack-protector )
 cflags-$(CONFIG_CC_STACKPROTECTOR_ALL) += $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-x86_64-has-stack-protector.sh $(CC) -fstack-protector-all )
 
diff --git a/arch/x86_64/ia32/ia32entry.S b/arch/x86_64/ia32/ia32entry.S
index 32fd32bea07c..b4aa875e175b 100644
--- a/arch/x86_64/ia32/ia32entry.S
+++ b/arch/x86_64/ia32/ia32entry.S
@@ -71,6 +71,7 @@
  */     
 ENTRY(ia32_sysenter_target)
         CFI_STARTPROC32 simple
+        CFI_SIGNAL_FRAME
         CFI_DEF_CFA     rsp,0
         CFI_REGISTER    rsp,rbp
         swapgs
@@ -186,6 +187,7 @@ ENDPROC(ia32_sysenter_target)
  */     
 ENTRY(ia32_cstar_target)
         CFI_STARTPROC32 simple
+        CFI_SIGNAL_FRAME
         CFI_DEF_CFA     rsp,PDA_STACKOFFSET
         CFI_REGISTER    rip,rcx
         /*CFI_REGISTER  rflags,r11*/
@@ -293,6 +295,7 @@ ia32_badarg:
 
 ENTRY(ia32_syscall)
         CFI_STARTPROC   simple
+        CFI_SIGNAL_FRAME
         CFI_DEF_CFA     rsp,SS+8-RIP
         /*CFI_REL_OFFSET        ss,SS-RIP*/
         CFI_REL_OFFSET  rsp,RSP-RIP
@@ -370,6 +373,7 @@ ENTRY(ia32_ptregs_common)
         popq %r11
         CFI_ENDPROC
         CFI_STARTPROC32 simple
+        CFI_SIGNAL_FRAME
         CFI_DEF_CFA     rsp,SS+8-ARGOFFSET
         CFI_REL_OFFSET  rax,RAX-ARGOFFSET
         CFI_REL_OFFSET  rcx,RCX-ARGOFFSET
diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S
index ea32688386fd..4cbc65290ae7 100644
--- a/arch/x86_64/kernel/entry.S
+++ b/arch/x86_64/kernel/entry.S
@@ -123,6 +123,7 @@
         .macro  CFI_DEFAULT_STACK start=1
         .if \start
         CFI_STARTPROC   simple
+        CFI_SIGNAL_FRAME
         CFI_DEF_CFA     rsp,SS+8
         .else
         CFI_DEF_CFA_OFFSET SS+8
@@ -207,6 +208,7 @@ END(ret_from_fork)
 
 ENTRY(system_call)
         CFI_STARTPROC   simple
+        CFI_SIGNAL_FRAME
         CFI_DEF_CFA     rsp,PDA_STACKOFFSET
         CFI_REGISTER    rip,rcx
         /*CFI_REGISTER  rflags,r11*/
@@ -324,6 +326,7 @@ END(system_call)
  */     
 ENTRY(int_ret_from_sys_call)
         CFI_STARTPROC   simple
+        CFI_SIGNAL_FRAME
         CFI_DEF_CFA     rsp,SS+8-ARGOFFSET
         /*CFI_REL_OFFSET        ss,SS-ARGOFFSET*/
         CFI_REL_OFFSET  rsp,RSP-ARGOFFSET
@@ -484,6 +487,7 @@ END(stub_rt_sigreturn)
  */
         .macro _frame ref
         CFI_STARTPROC simple
+        CFI_SIGNAL_FRAME
         CFI_DEF_CFA rsp,SS+8-\ref
         /*CFI_REL_OFFSET ss,SS-\ref*/
         CFI_REL_OFFSET rsp,RSP-\ref