diff mbox

[ARM,3/7,ping1] Fix indentation of FL_FOR_ARCH* definition after adding support for ARMv8-M

Message ID 1941712.tNa0ky9lyH@e108577-lin
State New
Headers show

Commit Message

Thomas Preudhomme May 17, 2016, 10:10 a.m. UTC 
Ping?

*** gcc/ChangeLog ***

2015-11-06  Thomas Preud'homme  <thomas.preudhomme@arm.com>

        * config/arm/arm-protos.h: Reindent FL_FOR_* macro definitions.




Best regards,

Thomas

On Thursday 17 December 2015 15:50:31 Thomas Preud'homme wrote:
> Hi,
> 
> This patch is part of a patch series to add support for ARMv8-M[1] to GCC.
> This specific patch fixes the indentation of FL_FOR_ARCH* macros definition
> following the patch to add support for ARMv8-M. Since this is an obvious
> change, I'm not expecting a review and will commit it as soon as the other
> patches in the series are accepted.
> 
> [1] For a quick overview of ARMv8-M please refer to the initial cover
> letter.
> 
> ChangeLog entry is as follows:
> 
> 
> *** gcc/ChangeLog ***
> 
> 2015-11-06  Thomas Preud'homme  <thomas.preudhomme@arm.com>
> 
>         * config/arm/arm-protos.h: Reindent FL_FOR_* macro definitions.
> 
> 
> diff --git a/gcc/config/arm/arm-protos.h b/gcc/config/arm/arm-protos.h
> index 1371ee7..bf0d1b4 100644
> --- a/gcc/config/arm/arm-protos.h
> +++ b/gcc/config/arm/arm-protos.h
> @@ -391,32 +391,33 @@ extern bool arm_is_constant_pool_ref (rtx);
>  #define FL_TUNE		(FL_WBUF | FL_VFPV2 | FL_STRONG | FL_LDSCHED \
> 
>  			 | FL_CO_PROC)
> 
> -#define FL_FOR_ARCH2	FL_NOTM
> -#define FL_FOR_ARCH3	(FL_FOR_ARCH2 | FL_MODE32)
> -#define FL_FOR_ARCH3M	(FL_FOR_ARCH3 | FL_ARCH3M)
> -#define FL_FOR_ARCH4	(FL_FOR_ARCH3M | FL_ARCH4)
> -#define FL_FOR_ARCH4T	(FL_FOR_ARCH4 | FL_THUMB)
> -#define FL_FOR_ARCH5	(FL_FOR_ARCH4 | FL_ARCH5)
> -#define FL_FOR_ARCH5T	(FL_FOR_ARCH5 | FL_THUMB)
> -#define FL_FOR_ARCH5E	(FL_FOR_ARCH5 | FL_ARCH5E)
> -#define FL_FOR_ARCH5TE	(FL_FOR_ARCH5E | FL_THUMB)
> -#define FL_FOR_ARCH5TEJ	FL_FOR_ARCH5TE
> -#define FL_FOR_ARCH6	(FL_FOR_ARCH5TE | FL_ARCH6)
> -#define FL_FOR_ARCH6J	FL_FOR_ARCH6
> -#define FL_FOR_ARCH6K	(FL_FOR_ARCH6 | FL_ARCH6K)
> -#define FL_FOR_ARCH6Z	FL_FOR_ARCH6
> -#define FL_FOR_ARCH6KZ	(FL_FOR_ARCH6K | FL_ARCH6KZ)
> -#define FL_FOR_ARCH6T2	(FL_FOR_ARCH6 | FL_THUMB2)
> -#define FL_FOR_ARCH6M	(FL_FOR_ARCH6 & ~FL_NOTM)
> -#define FL_FOR_ARCH7	((FL_FOR_ARCH6T2 & ~FL_NOTM) | FL_ARCH7)
> -#define FL_FOR_ARCH7A	(FL_FOR_ARCH7 | FL_NOTM | FL_ARCH6K)
> -#define FL_FOR_ARCH7VE	(FL_FOR_ARCH7A | FL_THUMB_DIV | FL_ARM_DIV)
> -#define FL_FOR_ARCH7R	(FL_FOR_ARCH7A | FL_THUMB_DIV)
> -#define FL_FOR_ARCH7M	(FL_FOR_ARCH7 | FL_THUMB_DIV)
> -#define FL_FOR_ARCH7EM  (FL_FOR_ARCH7M | FL_ARCH7EM)
> -#define FL_FOR_ARCH8A	(FL_FOR_ARCH7VE | FL_ARCH8)
> -#define FL_FOR_ARCH8M_BASE     (FL_FOR_ARCH6M | FL_ARCH8 | FL_THUMB_DIV)
> -#define FL_FOR_ARCH8M_MAIN     (FL_FOR_ARCH7M | FL_ARCH8)
> +#define FL_FOR_ARCH2		FL_NOTM
> +#define FL_FOR_ARCH3		(FL_FOR_ARCH2 | FL_MODE32)
> +#define FL_FOR_ARCH3M		(FL_FOR_ARCH3 | FL_ARCH3M)
> +#define FL_FOR_ARCH4		(FL_FOR_ARCH3M | FL_ARCH4)
> +#define FL_FOR_ARCH4T		(FL_FOR_ARCH4 | FL_THUMB)
> +#define FL_FOR_ARCH5		(FL_FOR_ARCH4 | FL_ARCH5)
> +#define FL_FOR_ARCH5T		(FL_FOR_ARCH5 | FL_THUMB)
> +#define FL_FOR_ARCH5E		(FL_FOR_ARCH5 | FL_ARCH5E)
> +#define FL_FOR_ARCH5TE		(FL_FOR_ARCH5E | FL_THUMB)
> +#define FL_FOR_ARCH5TEJ		FL_FOR_ARCH5TE
> +#define FL_FOR_ARCH6		(FL_FOR_ARCH5TE | FL_ARCH6)
> +#define FL_FOR_ARCH6J		FL_FOR_ARCH6
> +#define FL_FOR_ARCH6K		(FL_FOR_ARCH6 | FL_ARCH6K)
> +#define FL_FOR_ARCH6Z		FL_FOR_ARCH6
> +#define FL_FOR_ARCH6ZK		FL_FOR_ARCH6K
> +#define FL_FOR_ARCH6KZ		(FL_FOR_ARCH6K | FL_ARCH6KZ)
> +#define FL_FOR_ARCH6T2		(FL_FOR_ARCH6 | FL_THUMB2)
> +#define FL_FOR_ARCH6M		(FL_FOR_ARCH6 & ~FL_NOTM)
> +#define FL_FOR_ARCH7		((FL_FOR_ARCH6T2 & ~FL_NOTM) | FL_ARCH7)
> +#define FL_FOR_ARCH7A		(FL_FOR_ARCH7 | FL_NOTM | FL_ARCH6K)
> +#define FL_FOR_ARCH7VE		(FL_FOR_ARCH7A | FL_THUMB_DIV | FL_ARM_DIV)
> +#define FL_FOR_ARCH7R		(FL_FOR_ARCH7A | FL_THUMB_DIV)
> +#define FL_FOR_ARCH7M		(FL_FOR_ARCH7 | FL_THUMB_DIV)
> +#define FL_FOR_ARCH7EM		(FL_FOR_ARCH7M | FL_ARCH7EM)
> +#define FL_FOR_ARCH8A		(FL_FOR_ARCH7VE | FL_ARCH8)
> +#define FL_FOR_ARCH8M_BASE	(FL_FOR_ARCH6M | FL_ARCH8 | FL_THUMB_DIV)
> +#define FL_FOR_ARCH8M_MAIN	(FL_FOR_ARCH7M | FL_ARCH8)
> 
>  /* There are too many feature bits to fit in a single word so the set of
> cpu and fpu capabilities is a structure.  A feature set is created and
> manipulated
> 
> 
> Is this ok for stage3?
> 
> Best regards,
> 
> Thomas

Comments

Kyrill Tkachov May 18, 2016, 10:30 a.m. UTC | #1 
Hi Thomas,

On 17/05/16 11:10, Thomas Preudhomme wrote:
> Ping?
>
> *** gcc/ChangeLog ***
>
> 2015-11-06  Thomas Preud'homme  <thomas.preudhomme@arm.com>
>
>          * config/arm/arm-protos.h: Reindent FL_FOR_* macro definitions.
>
>
> diff --git a/gcc/config/arm/arm-protos.h b/gcc/config/arm/arm-protos.h
> index
> 63235cb63acf3e676fac5b61e1195081efd64075..f437d0d8baa5534f9519dd28cd2c4ac52d48685c
> 100644
> --- a/gcc/config/arm/arm-protos.h
> +++ b/gcc/config/arm/arm-protos.h
> @@ -395,30 +395,31 @@ extern bool arm_is_constant_pool_ref (rtx);
>   #define FL_TUNE		(FL_WBUF | FL_VFPV2 | FL_STRONG | FL_LDSCHED \
>   			 | FL_CO_PROC)
>   
> -#define FL_FOR_ARCH2	FL_NOTM
> -#define FL_FOR_ARCH3	(FL_FOR_ARCH2 | FL_MODE32)
> -#define FL_FOR_ARCH3M	(FL_FOR_ARCH3 | FL_ARCH3M)
> -#define FL_FOR_ARCH4	(FL_FOR_ARCH3M | FL_ARCH4)
> -#define FL_FOR_ARCH4T	(FL_FOR_ARCH4 | FL_THUMB)
> -#define FL_FOR_ARCH5	(FL_FOR_ARCH4 | FL_ARCH5)
> -#define FL_FOR_ARCH5T	(FL_FOR_ARCH5 | FL_THUMB)
> -#define FL_FOR_ARCH5E	(FL_FOR_ARCH5 | FL_ARCH5E)
> -#define FL_FOR_ARCH5TE	(FL_FOR_ARCH5E | FL_THUMB)
> -#define FL_FOR_ARCH5TEJ	FL_FOR_ARCH5TE
> -#define FL_FOR_ARCH6	(FL_FOR_ARCH5TE | FL_ARCH6)
> -#define FL_FOR_ARCH6J	FL_FOR_ARCH6
> -#define FL_FOR_ARCH6K	(FL_FOR_ARCH6 | FL_ARCH6K)
> -#define FL_FOR_ARCH6Z	FL_FOR_ARCH6
> -#define FL_FOR_ARCH6KZ	(FL_FOR_ARCH6K | FL_ARCH6KZ)
> -#define FL_FOR_ARCH6T2	(FL_FOR_ARCH6 | FL_THUMB2)
> -#define FL_FOR_ARCH6M	(FL_FOR_ARCH6 & ~FL_NOTM)
> -#define FL_FOR_ARCH7	((FL_FOR_ARCH6T2 & ~FL_NOTM) | FL_ARCH7)
> -#define FL_FOR_ARCH7A	(FL_FOR_ARCH7 | FL_NOTM | FL_ARCH6K)
> -#define FL_FOR_ARCH7VE	(FL_FOR_ARCH7A | FL_THUMB_DIV | FL_ARM_DIV)
> -#define FL_FOR_ARCH7R	(FL_FOR_ARCH7A | FL_THUMB_DIV)
> -#define FL_FOR_ARCH7M	(FL_FOR_ARCH7 | FL_THUMB_DIV)
> -#define FL_FOR_ARCH7EM  (FL_FOR_ARCH7M | FL_ARCH7EM)
> -#define FL_FOR_ARCH8A	(FL_FOR_ARCH7VE | FL_ARCH8)
> +#define FL_FOR_ARCH2		FL_NOTM
> +#define FL_FOR_ARCH3		(FL_FOR_ARCH2 | FL_MODE32)
> +#define FL_FOR_ARCH3M		(FL_FOR_ARCH3 | FL_ARCH3M)
> +#define FL_FOR_ARCH4		(FL_FOR_ARCH3M | FL_ARCH4)
> +#define FL_FOR_ARCH4T		(FL_FOR_ARCH4 | FL_THUMB)
> +#define FL_FOR_ARCH5		(FL_FOR_ARCH4 | FL_ARCH5)
> +#define FL_FOR_ARCH5T		(FL_FOR_ARCH5 | FL_THUMB)
> +#define FL_FOR_ARCH5E		(FL_FOR_ARCH5 | FL_ARCH5E)
> +#define FL_FOR_ARCH5TE		(FL_FOR_ARCH5E | FL_THUMB)
> +#define FL_FOR_ARCH5TEJ		FL_FOR_ARCH5TE

This one looks misindented.
Ok with that fixed once the prerequisites are approved.

Kyrill

> +#define FL_FOR_ARCH6		(FL_FOR_ARCH5TE | FL_ARCH6)
> +#define FL_FOR_ARCH6J		FL_FOR_ARCH6
> +#define FL_FOR_ARCH6K		(FL_FOR_ARCH6 | FL_ARCH6K)
> +#define FL_FOR_ARCH6Z		FL_FOR_ARCH6
> +#define FL_FOR_ARCH6ZK		FL_FOR_ARCH6K
> +#define FL_FOR_ARCH6KZ		(FL_FOR_ARCH6K | FL_ARCH6KZ)
> +#define FL_FOR_ARCH6T2		(FL_FOR_ARCH6 | FL_THUMB2)
> +#define FL_FOR_ARCH6M		(FL_FOR_ARCH6 & ~FL_NOTM)
> +#define FL_FOR_ARCH7		((FL_FOR_ARCH6T2 & ~FL_NOTM) | FL_ARCH7)
> +#define FL_FOR_ARCH7A		(FL_FOR_ARCH7 | FL_NOTM | FL_ARCH6K)
> +#define FL_FOR_ARCH7VE		(FL_FOR_ARCH7A | FL_THUMB_DIV | FL_ARM_DIV)
> +#define FL_FOR_ARCH7R		(FL_FOR_ARCH7A | FL_THUMB_DIV)
> +#define FL_FOR_ARCH7M		(FL_FOR_ARCH7 | FL_THUMB_DIV)
> +#define FL_FOR_ARCH7EM		(FL_FOR_ARCH7M | FL_ARCH7EM)
> +#define FL_FOR_ARCH8A		(FL_FOR_ARCH7VE | FL_ARCH8)
>   #define FL2_FOR_ARCH8_1A	FL2_ARCH8_1
>   #define FL_FOR_ARCH8M_BASE	(FL_FOR_ARCH6M | FL_ARCH8 | FL_THUMB_DIV)
>   #define FL_FOR_ARCH8M_MAIN	(FL_FOR_ARCH7M | FL_ARCH8)
>
>
> Best regards,
>
> Thomas
>
> On Thursday 17 December 2015 15:50:31 Thomas Preud'homme wrote:
>> Hi,
>>
>> This patch is part of a patch series to add support for ARMv8-M[1] to GCC.
>> This specific patch fixes the indentation of FL_FOR_ARCH* macros definition
>> following the patch to add support for ARMv8-M. Since this is an obvious
>> change, I'm not expecting a review and will commit it as soon as the other
>> patches in the series are accepted.
>>
>> [1] For a quick overview of ARMv8-M please refer to the initial cover
>> letter.
>>
>> ChangeLog entry is as follows:
>>
>>
>> *** gcc/ChangeLog ***
>>
>> 2015-11-06  Thomas Preud'homme  <thomas.preudhomme@arm.com>
>>
>>          * config/arm/arm-protos.h: Reindent FL_FOR_* macro definitions.
>>
>>
>> diff --git a/gcc/config/arm/arm-protos.h b/gcc/config/arm/arm-protos.h
>> index 1371ee7..bf0d1b4 100644
>> --- a/gcc/config/arm/arm-protos.h
>> +++ b/gcc/config/arm/arm-protos.h
>> @@ -391,32 +391,33 @@ extern bool arm_is_constant_pool_ref (rtx);
>>   #define FL_TUNE		(FL_WBUF | FL_VFPV2 | FL_STRONG | FL_LDSCHED \
>>
>>   			 | FL_CO_PROC)
>>
>> -#define FL_FOR_ARCH2	FL_NOTM
>> -#define FL_FOR_ARCH3	(FL_FOR_ARCH2 | FL_MODE32)
>> -#define FL_FOR_ARCH3M	(FL_FOR_ARCH3 | FL_ARCH3M)
>> -#define FL_FOR_ARCH4	(FL_FOR_ARCH3M | FL_ARCH4)
>> -#define FL_FOR_ARCH4T	(FL_FOR_ARCH4 | FL_THUMB)
>> -#define FL_FOR_ARCH5	(FL_FOR_ARCH4 | FL_ARCH5)
>> -#define FL_FOR_ARCH5T	(FL_FOR_ARCH5 | FL_THUMB)
>> -#define FL_FOR_ARCH5E	(FL_FOR_ARCH5 | FL_ARCH5E)
>> -#define FL_FOR_ARCH5TE	(FL_FOR_ARCH5E | FL_THUMB)
>> -#define FL_FOR_ARCH5TEJ	FL_FOR_ARCH5TE
>> -#define FL_FOR_ARCH6	(FL_FOR_ARCH5TE | FL_ARCH6)
>> -#define FL_FOR_ARCH6J	FL_FOR_ARCH6
>> -#define FL_FOR_ARCH6K	(FL_FOR_ARCH6 | FL_ARCH6K)
>> -#define FL_FOR_ARCH6Z	FL_FOR_ARCH6
>> -#define FL_FOR_ARCH6KZ	(FL_FOR_ARCH6K | FL_ARCH6KZ)
>> -#define FL_FOR_ARCH6T2	(FL_FOR_ARCH6 | FL_THUMB2)
>> -#define FL_FOR_ARCH6M	(FL_FOR_ARCH6 & ~FL_NOTM)
>> -#define FL_FOR_ARCH7	((FL_FOR_ARCH6T2 & ~FL_NOTM) | FL_ARCH7)
>> -#define FL_FOR_ARCH7A	(FL_FOR_ARCH7 | FL_NOTM | FL_ARCH6K)
>> -#define FL_FOR_ARCH7VE	(FL_FOR_ARCH7A | FL_THUMB_DIV | FL_ARM_DIV)
>> -#define FL_FOR_ARCH7R	(FL_FOR_ARCH7A | FL_THUMB_DIV)
>> -#define FL_FOR_ARCH7M	(FL_FOR_ARCH7 | FL_THUMB_DIV)
>> -#define FL_FOR_ARCH7EM  (FL_FOR_ARCH7M | FL_ARCH7EM)
>> -#define FL_FOR_ARCH8A	(FL_FOR_ARCH7VE | FL_ARCH8)
>> -#define FL_FOR_ARCH8M_BASE     (FL_FOR_ARCH6M | FL_ARCH8 | FL_THUMB_DIV)
>> -#define FL_FOR_ARCH8M_MAIN     (FL_FOR_ARCH7M | FL_ARCH8)
>> +#define FL_FOR_ARCH2		FL_NOTM
>> +#define FL_FOR_ARCH3		(FL_FOR_ARCH2 | FL_MODE32)
>> +#define FL_FOR_ARCH3M		(FL_FOR_ARCH3 | FL_ARCH3M)
>> +#define FL_FOR_ARCH4		(FL_FOR_ARCH3M | FL_ARCH4)
>> +#define FL_FOR_ARCH4T		(FL_FOR_ARCH4 | FL_THUMB)
>> +#define FL_FOR_ARCH5		(FL_FOR_ARCH4 | FL_ARCH5)
>> +#define FL_FOR_ARCH5T		(FL_FOR_ARCH5 | FL_THUMB)
>> +#define FL_FOR_ARCH5E		(FL_FOR_ARCH5 | FL_ARCH5E)
>> +#define FL_FOR_ARCH5TE		(FL_FOR_ARCH5E | FL_THUMB)
>> +#define FL_FOR_ARCH5TEJ		FL_FOR_ARCH5TE
>> +#define FL_FOR_ARCH6		(FL_FOR_ARCH5TE | FL_ARCH6)
>> +#define FL_FOR_ARCH6J		FL_FOR_ARCH6
>> +#define FL_FOR_ARCH6K		(FL_FOR_ARCH6 | FL_ARCH6K)
>> +#define FL_FOR_ARCH6Z		FL_FOR_ARCH6
>> +#define FL_FOR_ARCH6ZK		FL_FOR_ARCH6K
>> +#define FL_FOR_ARCH6KZ		(FL_FOR_ARCH6K | FL_ARCH6KZ)
>> +#define FL_FOR_ARCH6T2		(FL_FOR_ARCH6 | FL_THUMB2)
>> +#define FL_FOR_ARCH6M		(FL_FOR_ARCH6 & ~FL_NOTM)
>> +#define FL_FOR_ARCH7		((FL_FOR_ARCH6T2 & ~FL_NOTM) | FL_ARCH7)
>> +#define FL_FOR_ARCH7A		(FL_FOR_ARCH7 | FL_NOTM | FL_ARCH6K)
>> +#define FL_FOR_ARCH7VE		(FL_FOR_ARCH7A | FL_THUMB_DIV | FL_ARM_DIV)
>> +#define FL_FOR_ARCH7R		(FL_FOR_ARCH7A | FL_THUMB_DIV)
>> +#define FL_FOR_ARCH7M		(FL_FOR_ARCH7 | FL_THUMB_DIV)
>> +#define FL_FOR_ARCH7EM		(FL_FOR_ARCH7M | FL_ARCH7EM)
>> +#define FL_FOR_ARCH8A		(FL_FOR_ARCH7VE | FL_ARCH8)
>> +#define FL_FOR_ARCH8M_BASE	(FL_FOR_ARCH6M | FL_ARCH8 | FL_THUMB_DIV)
>> +#define FL_FOR_ARCH8M_MAIN	(FL_FOR_ARCH7M | FL_ARCH8)
>>
>>   /* There are too many feature bits to fit in a single word so the set of
>> cpu and fpu capabilities is a structure.  A feature set is created and
>> manipulated
>>
>>
>> Is this ok for stage3?
>>
>> Best regards,
>>
>> Thomas
Thomas Preudhomme May 18, 2016, 1:45 p.m. UTC | #2 
On Wednesday 18 May 2016 11:30:43 Kyrill Tkachov wrote:
> Hi Thomas,
> 
> On 17/05/16 11:10, Thomas Preudhomme wrote:
> > Ping?
> > 
> > *** gcc/ChangeLog ***
> > 
> > 2015-11-06  Thomas Preud'homme  <thomas.preudhomme@arm.com>
> > 
> >          * config/arm/arm-protos.h: Reindent FL_FOR_* macro definitions.
> > 
> > diff --git a/gcc/config/arm/arm-protos.h b/gcc/config/arm/arm-protos.h
> > index
> > 63235cb63acf3e676fac5b61e1195081efd64075..f437d0d8baa5534f9519dd28cd2c4ac5
> > 2d48685c 100644
> > --- a/gcc/config/arm/arm-protos.h
> > +++ b/gcc/config/arm/arm-protos.h
> > @@ -395,30 +395,31 @@ extern bool arm_is_constant_pool_ref (rtx);
> > 
> >   #define FL_TUNE		(FL_WBUF | FL_VFPV2 | FL_STRONG | FL_LDSCHED \
> >   
> >   			 | FL_CO_PROC)
> > 
> > -#define FL_FOR_ARCH2	FL_NOTM
> > -#define FL_FOR_ARCH3	(FL_FOR_ARCH2 | FL_MODE32)
> > -#define FL_FOR_ARCH3M	(FL_FOR_ARCH3 | FL_ARCH3M)
> > -#define FL_FOR_ARCH4	(FL_FOR_ARCH3M | FL_ARCH4)
> > -#define FL_FOR_ARCH4T	(FL_FOR_ARCH4 | FL_THUMB)
> > -#define FL_FOR_ARCH5	(FL_FOR_ARCH4 | FL_ARCH5)
> > -#define FL_FOR_ARCH5T	(FL_FOR_ARCH5 | FL_THUMB)
> > -#define FL_FOR_ARCH5E	(FL_FOR_ARCH5 | FL_ARCH5E)
> > -#define FL_FOR_ARCH5TE	(FL_FOR_ARCH5E | FL_THUMB)
> > -#define FL_FOR_ARCH5TEJ	FL_FOR_ARCH5TE
> > -#define FL_FOR_ARCH6	(FL_FOR_ARCH5TE | FL_ARCH6)
> > -#define FL_FOR_ARCH6J	FL_FOR_ARCH6
> > -#define FL_FOR_ARCH6K	(FL_FOR_ARCH6 | FL_ARCH6K)
> > -#define FL_FOR_ARCH6Z	FL_FOR_ARCH6
> > -#define FL_FOR_ARCH6KZ	(FL_FOR_ARCH6K | FL_ARCH6KZ)
> > -#define FL_FOR_ARCH6T2	(FL_FOR_ARCH6 | FL_THUMB2)
> > -#define FL_FOR_ARCH6M	(FL_FOR_ARCH6 & ~FL_NOTM)
> > -#define FL_FOR_ARCH7	((FL_FOR_ARCH6T2 & ~FL_NOTM) | FL_ARCH7)
> > -#define FL_FOR_ARCH7A	(FL_FOR_ARCH7 | FL_NOTM | FL_ARCH6K)
> > -#define FL_FOR_ARCH7VE	(FL_FOR_ARCH7A | FL_THUMB_DIV | FL_ARM_DIV)
> > -#define FL_FOR_ARCH7R	(FL_FOR_ARCH7A | FL_THUMB_DIV)
> > -#define FL_FOR_ARCH7M	(FL_FOR_ARCH7 | FL_THUMB_DIV)
> > -#define FL_FOR_ARCH7EM  (FL_FOR_ARCH7M | FL_ARCH7EM)
> > -#define FL_FOR_ARCH8A	(FL_FOR_ARCH7VE | FL_ARCH8)
> > +#define FL_FOR_ARCH2		FL_NOTM
> > +#define FL_FOR_ARCH3		(FL_FOR_ARCH2 | FL_MODE32)
> > +#define FL_FOR_ARCH3M		(FL_FOR_ARCH3 | FL_ARCH3M)
> > +#define FL_FOR_ARCH4		(FL_FOR_ARCH3M | FL_ARCH4)
> > +#define FL_FOR_ARCH4T		(FL_FOR_ARCH4 | FL_THUMB)
> > +#define FL_FOR_ARCH5		(FL_FOR_ARCH4 | FL_ARCH5)
> > +#define FL_FOR_ARCH5T		(FL_FOR_ARCH5 | FL_THUMB)
> > +#define FL_FOR_ARCH5E		(FL_FOR_ARCH5 | FL_ARCH5E)
> > +#define FL_FOR_ARCH5TE		(FL_FOR_ARCH5E | FL_THUMB)
> > +#define FL_FOR_ARCH5TEJ		FL_FOR_ARCH5TE
> 
> This one looks misindented.
> Ok with that fixed once the prerequisites are approved.

It is in the patch but not in the result. If you remove the + in the patch for 
the last two lines you'll see that they are perfectly aligned.

Best regards,

Thomas
Kyrill Tkachov May 18, 2016, 1:47 p.m. UTC | #3 
On 18/05/16 14:45, Thomas Preudhomme wrote:
> On Wednesday 18 May 2016 11:30:43 Kyrill Tkachov wrote:
>> Hi Thomas,
>>
>> On 17/05/16 11:10, Thomas Preudhomme wrote:
>>> Ping?
>>>
>>> *** gcc/ChangeLog ***
>>>
>>> 2015-11-06  Thomas Preud'homme  <thomas.preudhomme@arm.com>
>>>
>>>           * config/arm/arm-protos.h: Reindent FL_FOR_* macro definitions.
>>>
>>> diff --git a/gcc/config/arm/arm-protos.h b/gcc/config/arm/arm-protos.h
>>> index
>>> 63235cb63acf3e676fac5b61e1195081efd64075..f437d0d8baa5534f9519dd28cd2c4ac5
>>> 2d48685c 100644
>>> --- a/gcc/config/arm/arm-protos.h
>>> +++ b/gcc/config/arm/arm-protos.h
>>> @@ -395,30 +395,31 @@ extern bool arm_is_constant_pool_ref (rtx);
>>>
>>>    #define FL_TUNE		(FL_WBUF | FL_VFPV2 | FL_STRONG | FL_LDSCHED \
>>>    
>>>    			 | FL_CO_PROC)
>>>
>>> -#define FL_FOR_ARCH2	FL_NOTM
>>> -#define FL_FOR_ARCH3	(FL_FOR_ARCH2 | FL_MODE32)
>>> -#define FL_FOR_ARCH3M	(FL_FOR_ARCH3 | FL_ARCH3M)
>>> -#define FL_FOR_ARCH4	(FL_FOR_ARCH3M | FL_ARCH4)
>>> -#define FL_FOR_ARCH4T	(FL_FOR_ARCH4 | FL_THUMB)
>>> -#define FL_FOR_ARCH5	(FL_FOR_ARCH4 | FL_ARCH5)
>>> -#define FL_FOR_ARCH5T	(FL_FOR_ARCH5 | FL_THUMB)
>>> -#define FL_FOR_ARCH5E	(FL_FOR_ARCH5 | FL_ARCH5E)
>>> -#define FL_FOR_ARCH5TE	(FL_FOR_ARCH5E | FL_THUMB)
>>> -#define FL_FOR_ARCH5TEJ	FL_FOR_ARCH5TE
>>> -#define FL_FOR_ARCH6	(FL_FOR_ARCH5TE | FL_ARCH6)
>>> -#define FL_FOR_ARCH6J	FL_FOR_ARCH6
>>> -#define FL_FOR_ARCH6K	(FL_FOR_ARCH6 | FL_ARCH6K)
>>> -#define FL_FOR_ARCH6Z	FL_FOR_ARCH6
>>> -#define FL_FOR_ARCH6KZ	(FL_FOR_ARCH6K | FL_ARCH6KZ)
>>> -#define FL_FOR_ARCH6T2	(FL_FOR_ARCH6 | FL_THUMB2)
>>> -#define FL_FOR_ARCH6M	(FL_FOR_ARCH6 & ~FL_NOTM)
>>> -#define FL_FOR_ARCH7	((FL_FOR_ARCH6T2 & ~FL_NOTM) | FL_ARCH7)
>>> -#define FL_FOR_ARCH7A	(FL_FOR_ARCH7 | FL_NOTM | FL_ARCH6K)
>>> -#define FL_FOR_ARCH7VE	(FL_FOR_ARCH7A | FL_THUMB_DIV | FL_ARM_DIV)
>>> -#define FL_FOR_ARCH7R	(FL_FOR_ARCH7A | FL_THUMB_DIV)
>>> -#define FL_FOR_ARCH7M	(FL_FOR_ARCH7 | FL_THUMB_DIV)
>>> -#define FL_FOR_ARCH7EM  (FL_FOR_ARCH7M | FL_ARCH7EM)
>>> -#define FL_FOR_ARCH8A	(FL_FOR_ARCH7VE | FL_ARCH8)
>>> +#define FL_FOR_ARCH2		FL_NOTM
>>> +#define FL_FOR_ARCH3		(FL_FOR_ARCH2 | FL_MODE32)
>>> +#define FL_FOR_ARCH3M		(FL_FOR_ARCH3 | FL_ARCH3M)
>>> +#define FL_FOR_ARCH4		(FL_FOR_ARCH3M | FL_ARCH4)
>>> +#define FL_FOR_ARCH4T		(FL_FOR_ARCH4 | FL_THUMB)
>>> +#define FL_FOR_ARCH5		(FL_FOR_ARCH4 | FL_ARCH5)
>>> +#define FL_FOR_ARCH5T		(FL_FOR_ARCH5 | FL_THUMB)
>>> +#define FL_FOR_ARCH5E		(FL_FOR_ARCH5 | FL_ARCH5E)
>>> +#define FL_FOR_ARCH5TE		(FL_FOR_ARCH5E | FL_THUMB)
>>> +#define FL_FOR_ARCH5TEJ		FL_FOR_ARCH5TE
>> This one looks misindented.
>> Ok with that fixed once the prerequisites are approved.
> It is in the patch but not in the result. If you remove the + in the patch for
> the last two lines you'll see that they are perfectly aligned.

Ah ok, thanks.
The patch is ok then once the prerequisites are approved.

Kyrill

> Best regards,
>
> Thomas
>
diff mbox

Patch

diff --git a/gcc/config/arm/arm-protos.h b/gcc/config/arm/arm-protos.h
index 
63235cb63acf3e676fac5b61e1195081efd64075..f437d0d8baa5534f9519dd28cd2c4ac52d48685c 
100644
--- a/gcc/config/arm/arm-protos.h
+++ b/gcc/config/arm/arm-protos.h
@@ -395,30 +395,31 @@  extern bool arm_is_constant_pool_ref (rtx);
 #define FL_TUNE		(FL_WBUF | FL_VFPV2 | FL_STRONG | FL_LDSCHED \
 			 | FL_CO_PROC)
 
-#define FL_FOR_ARCH2	FL_NOTM
-#define FL_FOR_ARCH3	(FL_FOR_ARCH2 | FL_MODE32)
-#define FL_FOR_ARCH3M	(FL_FOR_ARCH3 | FL_ARCH3M)
-#define FL_FOR_ARCH4	(FL_FOR_ARCH3M | FL_ARCH4)
-#define FL_FOR_ARCH4T	(FL_FOR_ARCH4 | FL_THUMB)
-#define FL_FOR_ARCH5	(FL_FOR_ARCH4 | FL_ARCH5)
-#define FL_FOR_ARCH5T	(FL_FOR_ARCH5 | FL_THUMB)
-#define FL_FOR_ARCH5E	(FL_FOR_ARCH5 | FL_ARCH5E)
-#define FL_FOR_ARCH5TE	(FL_FOR_ARCH5E | FL_THUMB)
-#define FL_FOR_ARCH5TEJ	FL_FOR_ARCH5TE
-#define FL_FOR_ARCH6	(FL_FOR_ARCH5TE | FL_ARCH6)
-#define FL_FOR_ARCH6J	FL_FOR_ARCH6
-#define FL_FOR_ARCH6K	(FL_FOR_ARCH6 | FL_ARCH6K)
-#define FL_FOR_ARCH6Z	FL_FOR_ARCH6
-#define FL_FOR_ARCH6KZ	(FL_FOR_ARCH6K | FL_ARCH6KZ)
-#define FL_FOR_ARCH6T2	(FL_FOR_ARCH6 | FL_THUMB2)
-#define FL_FOR_ARCH6M	(FL_FOR_ARCH6 & ~FL_NOTM)
-#define FL_FOR_ARCH7	((FL_FOR_ARCH6T2 & ~FL_NOTM) | FL_ARCH7)
-#define FL_FOR_ARCH7A	(FL_FOR_ARCH7 | FL_NOTM | FL_ARCH6K)
-#define FL_FOR_ARCH7VE	(FL_FOR_ARCH7A | FL_THUMB_DIV | FL_ARM_DIV)
-#define FL_FOR_ARCH7R	(FL_FOR_ARCH7A | FL_THUMB_DIV)
-#define FL_FOR_ARCH7M	(FL_FOR_ARCH7 | FL_THUMB_DIV)
-#define FL_FOR_ARCH7EM  (FL_FOR_ARCH7M | FL_ARCH7EM)
-#define FL_FOR_ARCH8A	(FL_FOR_ARCH7VE | FL_ARCH8)
+#define FL_FOR_ARCH2		FL_NOTM
+#define FL_FOR_ARCH3		(FL_FOR_ARCH2 | FL_MODE32)
+#define FL_FOR_ARCH3M		(FL_FOR_ARCH3 | FL_ARCH3M)
+#define FL_FOR_ARCH4		(FL_FOR_ARCH3M | FL_ARCH4)
+#define FL_FOR_ARCH4T		(FL_FOR_ARCH4 | FL_THUMB)
+#define FL_FOR_ARCH5		(FL_FOR_ARCH4 | FL_ARCH5)
+#define FL_FOR_ARCH5T		(FL_FOR_ARCH5 | FL_THUMB)
+#define FL_FOR_ARCH5E		(FL_FOR_ARCH5 | FL_ARCH5E)
+#define FL_FOR_ARCH5TE		(FL_FOR_ARCH5E | FL_THUMB)
+#define FL_FOR_ARCH5TEJ		FL_FOR_ARCH5TE
+#define FL_FOR_ARCH6		(FL_FOR_ARCH5TE | FL_ARCH6)
+#define FL_FOR_ARCH6J		FL_FOR_ARCH6
+#define FL_FOR_ARCH6K		(FL_FOR_ARCH6 | FL_ARCH6K)
+#define FL_FOR_ARCH6Z		FL_FOR_ARCH6
+#define FL_FOR_ARCH6ZK		FL_FOR_ARCH6K
+#define FL_FOR_ARCH6KZ		(FL_FOR_ARCH6K | FL_ARCH6KZ)
+#define FL_FOR_ARCH6T2		(FL_FOR_ARCH6 | FL_THUMB2)
+#define FL_FOR_ARCH6M		(FL_FOR_ARCH6 & ~FL_NOTM)
+#define FL_FOR_ARCH7		((FL_FOR_ARCH6T2 & ~FL_NOTM) | FL_ARCH7)
+#define FL_FOR_ARCH7A		(FL_FOR_ARCH7 | FL_NOTM | FL_ARCH6K)
+#define FL_FOR_ARCH7VE		(FL_FOR_ARCH7A | FL_THUMB_DIV | FL_ARM_DIV)
+#define FL_FOR_ARCH7R		(FL_FOR_ARCH7A | FL_THUMB_DIV)
+#define FL_FOR_ARCH7M		(FL_FOR_ARCH7 | FL_THUMB_DIV)
+#define FL_FOR_ARCH7EM		(FL_FOR_ARCH7M | FL_ARCH7EM)
+#define FL_FOR_ARCH8A		(FL_FOR_ARCH7VE | FL_ARCH8)
 #define FL2_FOR_ARCH8_1A	FL2_ARCH8_1
 #define FL_FOR_ARCH8M_BASE	(FL_FOR_ARCH6M | FL_ARCH8 | FL_THUMB_DIV)
 #define FL_FOR_ARCH8M_MAIN	(FL_FOR_ARCH7M | FL_ARCH8)