Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 12:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86: Rename "ignore" macro in <asm/dwarf2.h> to avoid collision

Browse Source 
Commit 70f1bba4 ("x86: use ignore macro instead of hash comment") breaks
the 64-bit x86 build on toolchains that have CONFIG_AS_CFI undefined with:

    arch/x86/lib/csum-copy_64.S:48: Error: Macro `ignore' was already defined

because <asm/dwarf2.h> now uses the ignore macro name itself.  Fix this
by changing to __cfi_ignore in dwarf2.h.

Signed-off-by: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Roland Dreier 2008-07-14 18:11:23 -07:00 committed by Linus Torvalds
parent ad1f8bf073
commit 4d3702b62e
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
include/asm-x86/dwarf2.h
View File

@ -38,23 +38,23 @@
/* Due to the structure of pre-exisiting code, don't use assembler line /* Due to the structure of pre-exisiting code, don't use assembler line
comment character # to ignore the arguments. Instead, use a dummy macro. */ comment character # to ignore the arguments. Instead, use a dummy macro. */
.macro ignore a=0, b=0, c=0, d=0 .macro __cfi_ignore a=0, b=0, c=0, d=0
.endm .endm
#define CFI_STARTPROC ignore #define CFI_STARTPROC __cfi_ignore
#define CFI_ENDPROC ignore #define CFI_ENDPROC __cfi_ignore
#define CFI_DEF_CFA ignore #define CFI_DEF_CFA __cfi_ignore
#define CFI_DEF_CFA_REGISTER ignore #define CFI_DEF_CFA_REGISTER __cfi_ignore
#define CFI_DEF_CFA_OFFSET ignore #define CFI_DEF_CFA_OFFSET __cfi_ignore
#define CFI_ADJUST_CFA_OFFSET ignore #define CFI_ADJUST_CFA_OFFSET __cfi_ignore
#define CFI_OFFSET ignore #define CFI_OFFSET __cfi_ignore
#define CFI_REL_OFFSET ignore #define CFI_REL_OFFSET __cfi_ignore
#define CFI_REGISTER ignore #define CFI_REGISTER __cfi_ignore
#define CFI_RESTORE ignore #define CFI_RESTORE __cfi_ignore
#define CFI_REMEMBER_STATE ignore #define CFI_REMEMBER_STATE __cfi_ignore
#define CFI_RESTORE_STATE ignore #define CFI_RESTORE_STATE __cfi_ignore
#define CFI_UNDEFINED ignore #define CFI_UNDEFINED __cfi_ignore
#define CFI_SIGNAL_FRAME ignore #define CFI_SIGNAL_FRAME __cfi_ignore
#endif #endif