From 882cfc17c36cd40c86f6e17e20de54d3688bfa51 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi.kivity@gmail.com>
Date: Thu, 27 Dec 2012 11:02:01 +0200
Subject: [PATCH] x64: extract cfi macros into a new file

---
 arch/x64/cfi.s   | 14 ++++++++++++++
 arch/x64/entry.s | 12 +-----------
 2 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 arch/x64/cfi.s

diff --git a/arch/x64/cfi.s b/arch/x64/cfi.s
new file mode 100644
index 000000000..a868c093f
--- /dev/null
+++ b/arch/x64/cfi.s
@@ -0,0 +1,14 @@
+# macros for cfi annotations
+
+.macro pushq_cfi reg
+	pushq \reg
+	.cfi_adjust_cfa_offset 8
+	.cfi_rel_offset \reg, 0
+.endm
+
+.macro popq_cfi reg
+	popq \reg
+	.cfi_adjust_cfa_offset -8
+	.cfi_restore \reg
+.endm
+
diff --git a/arch/x64/entry.s b/arch/x64/entry.s
index cfa426257..58966cadc 100644
--- a/arch/x64/entry.s
+++ b/arch/x64/entry.s
@@ -1,15 +1,5 @@
 
-.macro pushq_cfi reg
-	pushq \reg
-	.cfi_adjust_cfa_offset 8
-	.cfi_rel_offset \reg, 0
-.endm
-
-.macro popq_cfi reg
-	popq \reg
-	.cfi_adjust_cfa_offset -8
-	.cfi_restore \reg
-.endm
+.include "arch/x64/cfi.s"
 
 .macro exception_entry name, handler, has_error_code
 	.global \name
-- 
GitLab