Author: hbelusca
Date: Sat Sep 30 10:29:50 2017
New Revision: 75996
URL:
http://svn.reactos.org/svn/reactos?rev=75996&view=rev
Log:
[ASM]: CORE-13850 #comment Fix MASM compilation errors with the CFI annotation macros
substitutes (broken by r75989).
Modified:
trunk/reactos/sdk/include/asm/asm.inc
Modified: trunk/reactos/sdk/include/asm/asm.inc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/asm/asm.inc?re…
==============================================================================
--- trunk/reactos/sdk/include/asm/asm.inc [iso-8859-1] (original)
+++ trunk/reactos/sdk/include/asm/asm.inc [iso-8859-1] Sat Sep 30 10:29:50 2017
@@ -201,16 +201,26 @@
#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 @@
/* 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