[ASM]: CORE-13850 #comment Fix MASM compilation errors with the CFI annotation macros substitutes (broken by r75989).

svn path=/trunk/; revision=75996
This commit is contained in:
Hermès Bélusca-Maïto 2017-09-30 10:29:50 +00:00
parent 9f36a72013
commit 7d6b5d99a6

View file

@ -201,16 +201,26 @@ ENDM
#define NUL 0 #define NUL 0
/* For compatibility with GAS */ /* For compatibility with GAS */
#define CFI_STARTPROC CFI_STARTPROC MACRO start
#define CFI_ENDPROC ENDM
#define CFI_ADJUST_CFA_OFFSET CFI_ENDPROC MACRO
#define CFI_OFFSET ENDM
#define CFI_REGISTER CFI_DEF_CFA MACRO reg:REQ, offset:REQ
#define CFI_DEF_CFA_REGISTER ENDM
#define CFI_DEF_CFA CFI_DEF_CFA_OFFSET MACRO offset:REQ
#define CFI_REL_OFFSET ENDM
#define CFI_SAME_VALUE CFI_DEF_CFA_REGISTER MACRO reg:REQ
#define CFI_DEF_CFA_OFFSET 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 /***********************************************************************/ #else /***********************************************************************/
@ -387,14 +397,14 @@ code = 1
/* CFI annotations */ /* CFI annotations */
#define CFI_STARTPROC .cfi_startproc #define CFI_STARTPROC .cfi_startproc
#define CFI_ENDPROC .cfi_endproc #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_ADJUST_CFA_OFFSET .cfi_adjust_cfa_offset
#define CFI_OFFSET .cfi_offset #define CFI_OFFSET .cfi_offset
#define CFI_REGISTER .cfi_register #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_REL_OFFSET .cfi_rel_offset
#define CFI_SAME_VALUE .cfi_same_value #define CFI_SAME_VALUE .cfi_same_value
#define CFI_DEF_CFA_OFFSET .cfi_def_cfa_offset
#endif #endif