From e3aae86975bf2488e4dcf8affe1b2b255027f529 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Mon, 31 Aug 2009 11:53:23 -0700
Subject: [PATCH] --- yaml --- r: 158691 b: refs/heads/master c:
 fe9b4e4e40ffdabbd385cdf171cb861c2fd517c0 h: refs/heads/master i:   158689:
 8a94f41f47476077f708e37d428f24d7486526fa   158687:
 fa91f25c235731afcc7d236d3bce2cd2a822f60e v: v3

---
 [refs]                              |  2 +-
 trunk/arch/x86/include/asm/dwarf2.h | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9cb84793bbb1..1c4861c39da8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b0f43ddfa358dc71ad2a2d57bce5906c1c5dc1a
+refs/heads/master: fe9b4e4e40ffdabbd385cdf171cb861c2fd517c0
diff --git a/trunk/arch/x86/include/asm/dwarf2.h b/trunk/arch/x86/include/asm/dwarf2.h
index 3afc5e87cfdd..ae6253ab9029 100644
--- a/trunk/arch/x86/include/asm/dwarf2.h
+++ b/trunk/arch/x86/include/asm/dwarf2.h
@@ -87,9 +87,25 @@
 	CFI_RESTORE \reg
 	.endm
 #else /*!CONFIG_X86_64*/
+	.macro pushl_cfi reg
+	pushl \reg
+	CFI_ADJUST_CFA_OFFSET 4
+	.endm
 
-	/* 32bit defenitions are missed yet */
+	.macro popl_cfi reg
+	popl \reg
+	CFI_ADJUST_CFA_OFFSET -4
+	.endm
 
+	.macro movl_cfi reg offset=0
+	movl %\reg, \offset(%esp)
+	CFI_REL_OFFSET \reg, \offset
+	.endm
+
+	.macro movl_cfi_restore offset reg
+	movl \offset(%esp), %\reg
+	CFI_RESTORE \reg
+	.endm
 #endif /*!CONFIG_X86_64*/
 #endif /*__ASSEMBLY__*/