From 7d6b5d99a61f3ec770c759f39ee4795cc90678d7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Sat, 30 Sep 2017 10:29:50 +0000
Subject: [PATCH] [ASM]: CORE-13850 #comment Fix MASM compilation errors with
 the CFI annotation macros substitutes (broken by r75989).

svn path=/trunk/; revision=75996
---
 reactos/sdk/include/asm/asm.inc | 36 +++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/reactos/sdk/include/asm/asm.inc b/reactos/sdk/include/asm/asm.inc
index ac515f55749..fdedfdb1874 100644
--- a/reactos/sdk/include/asm/asm.inc
+++ b/reactos/sdk/include/asm/asm.inc
@@ -201,16 +201,26 @@ ENDM
 #define NUL 0
 
 /* For compatibility with GAS */
-#define CFI_STARTPROC
-#define CFI_ENDPROC
-#define CFI_ADJUST_CFA_OFFSET
-#define CFI_OFFSET
-#define CFI_REGISTER
-#define CFI_DEF_CFA_REGISTER
-#define CFI_DEF_CFA
-#define CFI_REL_OFFSET
-#define CFI_SAME_VALUE
-#define CFI_DEF_CFA_OFFSET
+CFI_STARTPROC MACRO start
+ENDM
+CFI_ENDPROC MACRO
+ENDM
+CFI_DEF_CFA MACRO reg:REQ, offset:REQ
+ENDM
+CFI_DEF_CFA_OFFSET MACRO offset:REQ
+ENDM
+CFI_DEF_CFA_REGISTER MACRO reg:REQ
+ENDM
+CFI_ADJUST_CFA_OFFSET MACRO offset:REQ
+ENDM
+CFI_OFFSET MACRO reg:REQ, offset:REQ
+ENDM
+CFI_REGISTER MACRO reg1:REQ, reg2:REQ
+ENDM
+CFI_REL_OFFSET MACRO reg:REQ, offset:REQ
+ENDM
+CFI_SAME_VALUE MACRO reg:REQ
+ENDM
 
 #else /***********************************************************************/
 
@@ -387,14 +397,14 @@ code = 1
 /* CFI annotations */
 #define CFI_STARTPROC .cfi_startproc
 #define CFI_ENDPROC .cfi_endproc
+#define CFI_DEF_CFA .cfi_def_cfa
+#define CFI_DEF_CFA_OFFSET .cfi_def_cfa_offset
+#define CFI_DEF_CFA_REGISTER .cfi_def_cfa_register
 #define CFI_ADJUST_CFA_OFFSET .cfi_adjust_cfa_offset
 #define CFI_OFFSET .cfi_offset
 #define CFI_REGISTER .cfi_register
-#define CFI_DEF_CFA_REGISTER .cfi_def_cfa_register
-#define CFI_DEF_CFA .cfi_def_cfa
 #define CFI_REL_OFFSET .cfi_rel_offset
 #define CFI_SAME_VALUE .cfi_same_value
-#define CFI_DEF_CFA_OFFSET .cfi_def_cfa_offset
 
 #endif
 
-- 
2.17.1