We've decided to apply the following patch to ARM/embedded-6-branch. Best regards,
Thomas ---------- Forwarded Message ---------- Subject: Re: [PATCH, ARM 3/7, ping1] Fix indentation of FL_FOR_ARCH* definition after adding support for ARMv8-M Date: Wednesday 18 May 2016, 14:47:16 From: Kyrill Tkachov <kyrylo.tkac...@foss.arm.com> To: Thomas Preudhomme <thomas.preudho...@foss.arm.com> CC: ramana.radhakrish...@arm.com, richard.earns...@arm.com, gcc- patc...@gcc.gnu.org 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.preudho...@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 > -----------------------------------------
