lkml.org 
[lkml]   [2008]   [Jul]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: Latest git compile error: arch/x86/lib/csum-copy_64.S:48: Error: Macro `ignore' was already defined
From
Date
Hi.

On Mon, 2008-07-14 at 21:36 -0300, Kevin Winchester wrote:
> Hi Ingo, Thomas,
>
> I get the following when trying to compile the latest source from
> Linus'
> tree:
>
> 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. Something like (whitespace damaged I know,
> it's just for example):
>
> diff --git a/include/asm-x86/dwarf2.h b/include/asm-x86/dwarf2.h
> index 0bfe250..738bb9f 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 cfi_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 cfi_ignore
> +#define CFI_ENDPROC cfi_ignore
> +#define CFI_DEF_CFA cfi_ignore
> +#define CFI_DEF_CFA_REGISTER cfi_ignore
> +#define CFI_DEF_CFA_OFFSET cfi_ignore
> +#define CFI_ADJUST_CFA_OFFSET cfi_ignore
> +#define CFI_OFFSET cfi_ignore
> +#define CFI_REL_OFFSET cfi_ignore
> +#define CFI_REGISTER cfi_ignore
> +#define CFI_RESTORE cfi_ignore
> +#define CFI_REMEMBER_STATE cfi_ignore
> +#define CFI_RESTORE_STATE cfi_ignore
> +#define CFI_UNDEFINED cfi_ignore
> +#define CFI_SIGNAL_FRAME cfi_ignore
>
> #endif

Compiles okay here and boots okay under VMware.

Tested-by: Nigel Cunningham <nigel@tuxonice.net>

Regards,

Nigel



\
 
 \ /
  Last update: 2008-07-15 04:39    [W:0.220 / U:0.004 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site