Re: [PATCH v4 3/7] mips: rename macros and files from '64' to 'n64'

[Firoz Khan]

Hi Paul,

On Tue, 11 Dec 2018 at 01:21, Paul Burton <paul.burton@xxxxxxxx> wrote:
>
> Hi Firoz,
>
> On Thu, Dec 06, 2018 at 10:48:24AM +0530, Firoz Khan wrote:
> > diff --git a/arch/mips/include/uapi/asm/sgidefs.h b/arch/mips/include/uapi/asm/sgidefs.h
> > index 26143e3..0364eec 100644
> > --- a/arch/mips/include/uapi/asm/sgidefs.h
> > +++ b/arch/mips/include/uapi/asm/sgidefs.h
> > @@ -40,6 +40,6 @@
> >   */
> >  #define _MIPS_SIM_ABI32              1
> >  #define _MIPS_SIM_NABI32     2
> > -#define _MIPS_SIM_ABI64              3
> > +#define _MIPS_SIM_ABIN64     3
>
> Whilst I agree with changing our own definitions & filenames to use n64,
> this macro actually reflects naming used by the toolchain. ie:
>
>     $ mips-linux-gcc -mips64 -mabi=64 -dM -E - </dev/null | grep ABI64
>     #define _ABI64 3
>     #define _MIPS_SIM _ABI64
>
> Our macro here is used to compare against _MIPS_SIM provided by the
> toolchain, so for consistency I think we should keep the same name for
> the macro that the toolchain uses.

Will this below change will help?

 #define _MIPS_SIM_ABI32              1
 #define _MIPS_SIM_NABI32            2
 #define _MIPS_SIM_ABI64              3
+#define _MIPS_SIM_ABIN64           _MIPS_SIM_ABI64

Thanks
Firoz

>
> And I realise that undoing that but keeping n64 in our own filenames &
> macros is another type of inconsistency, but something imperfect is
> unavoidable at this point given that the engineers way back when decided
> to use "ABI64" for n64.
>
> Thanks,
>     Paul