Re: HEAD and gcc4 build fixes for MIPS

[Andreas Jaeger <aj at suse dot de>]

> [...]

> Index: glibc/sysdeps/generic/ldsodefs.h
> ===================================================================
> --- glibc.orig/sysdeps/generic/ldsodefs.h	2005-03-09 11:39:14.000000000 -0500
> +++ glibc/sysdeps/generic/ldsodefs.h	2005-03-09 13:30:30.472037359 -0500
> @@ -195,6 +195,10 @@ struct La_s390_64_regs;
>  struct La_s390_64_retval;
>  struct La_ia64_regs;
>  struct La_ia64_retval;
> +struct La_mips_32_regs;
> +struct La_mips_32_retval;
> +struct La_mips_64_regs;
> +struct La_mips_64_retval;
>  
>  struct audit_ifaces
>  {
> @@ -251,6 +255,18 @@ struct audit_ifaces
>  				     uintptr_t *, struct La_ia64_regs *,
>  				     unsigned int *, const char *name,
>  				     long int *framesizep);
> +    uintptr_t (*mips_o32_gnu_pltenter) (Elf32_Sym *, unsigned int, uintptr_t *,

Why are you not using Elf32_Addr/Elf64_Addr in these functions as
return value?  This would be in sync with the other platforms.

> +					uintptr_t *, const struct La_mips_32_regs *,
> +					unsigned int *, const char *name,
> +					long int *framesizep);
> +    uintptr_t (*mips_n32_gnu_pltenter) (Elf32_Sym *, unsigned int, uintptr_t *,
> +					uintptr_t *, const struct La_mips_64_regs *,
> +					unsigned int *, const char *name,
> +					long int *framesizep);
> +    uintptr_t (*mips_n64_gnu_pltenter) (Elf64_Sym *, unsigned int, uintptr_t *,
> +					uintptr_t *, const struct La_mips_64_regs *,
> +					unsigned int *, const char *name,
> +					long int *framesizep);
>    };

I'm using  Elf32/64_Addr here and will reformat so that it fits into
78 columns.

> Index: glibc/sysdeps/mips/bits/link.h
> ===================================================================
> [...]
> +extern Elf32_Addr la_mips_o32_gnu_pltenter (Elf32_Sym *__sym, unsigned int __ndx,

And here you use Elf32_Addr.

I've committed the patch with the changes to ldsodefs.h,

Thanks,
Andreas
-- 
 Andreas Jaeger, aj@suse.de, http://www.suse.de/~aj
  SUSE Linux Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
   GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126

Attachment: pgp00000.pgp
Description: PGP signature