[PATCH v2] m68k: Fix libgloss compilation with gcc >= 4.5.0

[Corinna Vinschen]

On Jul 19 08:57, Rafael Campos wrote:
> Fix compilation of libgloss with gcc >= 4.50.
> After adding new devices in gcc 4.5.0 for the family mc51qe, they
> changed the family "__mcf_family_51qe" by "__mcf_family_51".
> Add another condition to properly compile.

Ok, so "__mcf_family_51qe" was the old definition, "__mcf_family_51"
is the new one?  If so...

> 
> Regards
> -- 
> Rafael Campos Las Heras

> Index: libgloss/m68k/cf-crt1.c
> ===================================================================
> RCS file: /cvs/src/src/libgloss/m68k/cf-crt1.c,v
> retrieving revision 1.4
> diff -p -u -8 -r1.4 cf-crt1.c
> --- libgloss/m68k/cf-crt1.c	16 Jun 2008 18:42:40 -0000	1.4
> +++ libgloss/m68k/cf-crt1.c	19 Jul 2010 11:53:55 -0000
> @@ -63,17 +63,17 @@ void __start1 (void *heap_limit)
>  
>  /* A default hardware init hook.  */
>  
>  void __attribute__ ((weak)) hardware_init_hook (void)
>  {
>    /* Set the VBR. */
>    __asm__ __volatile__ ("movec.l %0,%/vbr" :: "r" (__interrupt_vector));
>  
> -#if !defined(__mcf_family_5213) && !defined(__mcf_family_51qe)
> +#if !defined(__mcf_family_5213) && !defined(mcf_51qe) && !defined(__mcf_family_51)

"mcf_51qe" looks wrong to me.  You meant "__mcf_family_51qe", right?


Corinna

-- 
Corinna Vinschen
Cygwin Project Co-Leader
Red Hat