diff options
| author | Kevin Winchester <kjwinchester@gmail.com> | 2008-07-14 20:36:13 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2008-07-15 09:30:29 -0400 |
| commit | 3f1c38723eb467d34d704d0ee6e7b796ba4981ee (patch) | |
| tree | 4e1f4f057dfe89ea1941f03c040f61846a621d0d | |
| parent | d3af01f18bf18e9b2a95711894fc239daeab5e2e (diff) | |
x86: Fix compile error with CONFIG_AS_CFI=n
AS arch/x86/lib/csum-copy_64.o
arch/x86/lib/csum-copy_64.S: Assembler messages:
arch/x86/lib/csum-copy_64.S:48: Error: Macro `ignore' was already defined
make[1]: *** [arch/x86/lib/csum-copy_64.o] Error 1
make: *** [arch/x86/lib] Error 2
It appears that csum-copy_64.S and dwarf2.h both define an ignore macro.
I would expect one of them can be renamed quite easily, unless they
are references elsewhere.
Caused-by-commit: 392a0fc96bd059b38564f5f8fb58327460cb5a9d
x86: merge dwarf2 headers
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | include/asm-x86/dwarf2.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/include/asm-x86/dwarf2.h b/include/asm-x86/dwarf2.h index 0bfe250894f7..738bb9fb3e53 100644 --- a/include/asm-x86/dwarf2.h +++ b/include/asm-x86/dwarf2.h | |||
| @@ -38,23 +38,23 @@ | |||
| 38 | 38 | ||
| 39 | /* Due to the structure of pre-exisiting code, don't use assembler line | 39 | /* Due to the structure of pre-exisiting code, don't use assembler line |
| 40 | comment character # to ignore the arguments. Instead, use a dummy macro. */ | 40 | comment character # to ignore the arguments. Instead, use a dummy macro. */ |
| 41 | .macro ignore a=0, b=0, c=0, d=0 | 41 | .macro cfi_ignore a=0, b=0, c=0, d=0 |
| 42 | .endm | 42 | .endm |
| 43 | 43 | ||
| 44 | #define CFI_STARTPROC ignore | 44 | #define CFI_STARTPROC cfi_ignore |
| 45 | #define CFI_ENDPROC ignore | 45 | #define CFI_ENDPROC cfi_ignore |
| 46 | #define CFI_DEF_CFA ignore | 46 | #define CFI_DEF_CFA cfi_ignore |
| 47 | #define CFI_DEF_CFA_REGISTER ignore | 47 | #define CFI_DEF_CFA_REGISTER cfi_ignore |
| 48 | #define CFI_DEF_CFA_OFFSET ignore | 48 | #define CFI_DEF_CFA_OFFSET cfi_ignore |
| 49 | #define CFI_ADJUST_CFA_OFFSET ignore | 49 | #define CFI_ADJUST_CFA_OFFSET cfi_ignore |
| 50 | #define CFI_OFFSET ignore | 50 | #define CFI_OFFSET cfi_ignore |
| 51 | #define CFI_REL_OFFSET ignore | 51 | #define CFI_REL_OFFSET cfi_ignore |
| 52 | #define CFI_REGISTER ignore | 52 | #define CFI_REGISTER cfi_ignore |
| 53 | #define CFI_RESTORE ignore | 53 | #define CFI_RESTORE cfi_ignore |
| 54 | #define CFI_REMEMBER_STATE ignore | 54 | #define CFI_REMEMBER_STATE cfi_ignore |
| 55 | #define CFI_RESTORE_STATE ignore | 55 | #define CFI_RESTORE_STATE cfi_ignore |
| 56 | #define CFI_UNDEFINED ignore | 56 | #define CFI_UNDEFINED cfi_ignore |
| 57 | #define CFI_SIGNAL_FRAME ignore | 57 | #define CFI_SIGNAL_FRAME cfi_ignore |
| 58 | 58 | ||
| 59 | #endif | 59 | #endif |
| 60 | 60 | ||