Re: linux-next: Tree for July 14

Takashi Iwai
2008-07-14T16:24:25Z

Hi,

another build failure of next-20080714, this time on x86-64:

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

Indeed, it's defined in asm/dwarf2.h, too.
The patch below fixed the build.

Takashi
---
diff --git a/include/asm-x86/dwarf2.h b/include/asm-x86/dwarf2.h
index 0bfe250..e65e65a 100644
--- a/include/asm-x86/dwarf2.h
+++ b/include/asm-x86/dwarf2.h
@@ -38,23 +38,23 @@

/* Due to the structure of pre-exisiting code, don't use assembler line
comment character # to ignore the arguments. Instead, use a dummy macro. */
-.macro ignore a=0, b=0, c=0, d=0
+.macro dw_ignore a=0, b=0, c=0, d=0
.endm

-#define CFI_STARTPROC ignore
-#define CFI_ENDPROC ignore
-#define CFI_DEF_CFA ignore
-#define CFI_DEF_CFA_REGISTER ignore
-#define CFI_DEF_CFA_OFFSET ignore
-#define CFI_ADJUST_CFA_OFFSET ignore
-#define CFI_OFFSET ignore
-#define CFI_REL_OFFSET ignore
-#define CFI_REGISTER ignore
-#define CFI_RESTORE ignore
-#define CFI_REMEMBER_STATE ignore
-#define CFI_RESTORE_STATE ignore
-#define CFI_UNDEFINED ignore
-#define CFI_SIGNAL_FRAME ignore
+#define CFI_STARTPROC dw_ignore
+#define CFI_ENDPROC dw_ignore
+#define CFI_DEF_CFA dw_ignore
+#define CFI_DEF_CFA_REGISTER dw_ignore
+#define CFI_DEF_CFA_OFFSET dw_ignore
+#define CFI_ADJUST_CFA_OFFSET dw_ignore
+#define CFI_OFFSET dw_ignore
+#define CFI_REL_OFFSET dw_ignore
+#define CFI_REGISTER dw_ignore
+#define CFI_RESTORE dw_ignore
+#define CFI_REMEMBER_STATE dw_ignore
+#define CFI_RESTORE_STATE dw_ignore
+#define CFI_UNDEFINED dw_ignore
+#define CFI_SIGNAL_FRAME dw_ignore

#endif