From: Takashi Iwai <tiwai@suse•de>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Glauber Costa <gcosta@redhat•com>, Ingo Molnar <mingo@elte•hu>,
linux-next@vger•kernel.org, LKML <linux-kernel@vger•kernel.org>
Subject: Re: linux-next: Tree for July 14
Date: Mon, 14 Jul 2008 16:25:08 +0000 (UTC)
Date: Wed, 16 Jul 2008 02:23:59 +0200 [thread overview]
Message-ID: <s5hiqv6d6cg.wl%tiwai@suse.de> (raw)
In-Reply-To: <20080714201249.947400d0.sfr@canb.auug.org.au>
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
next prev parent reply other threads:[~2008-07-14 16:24 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-14 10:12 linux-next: Tree for July 14 Stephen Rothwell
2008-07-14 11:43 ` Gabriel C
2008-07-14 13:47 ` Stephen Rothwell
2008-07-14 14:18 ` Gabriel C
2008-07-14 16:20 ` Takashi Iwai
2008-07-15 5:50 ` Benjamin Herrenschmidt
2008-07-14 16:20 ` Takashi Iwai
2008-07-14 16:25 ` Takashi Iwai [this message]
2008-07-14 16:25 ` Takashi Iwai
2008-07-14 17:12 ` Andrew Morton
2008-07-14 23:35 ` Rafael J. Wysocki
-- strict thread matches above, loose matches on Subject: below --
2008-07-14 15:06 mkrufky
2009-07-14 7:06 Stephen Rothwell
2010-07-14 4:23 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=s5hiqv6d6cg.wl%tiwai@suse.de \
--to=tiwai@suse$(echo .)de \
--cc=gcosta@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox