From patchwork Tue May 17 10:10:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Preudhomme X-Patchwork-Id: 622992 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3r8Ckv40YYz9ssP for ; Tue, 17 May 2016 20:10:31 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=AoTJ6meM; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:content-type; q=dns; s= default; b=NqPpr8lPOUMv2lsUclgSBrH6NMtFarZK6/Uyw5ZhYx1cgX9q1M78Q 6LO8ugRho5/Aic3GB0ZMkiTubfYhByGs+r1yS4IFfhJMWE7QOx/1r9aL5CiVJ7fe cP4F2zDAeIVpyF1CI288LRVdXTBkMnr443aBN4eXkrG4HvDLeWzR54= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:content-type; s=default; bh=iojUu8RaJfhDnag3fdDHKjyvIW0=; b=AoTJ6meMfr4fKgBuEBsDnmv6RN9S j8G9ZyVQJSefki2yjHL+/hAlNJRBXP5vwR1BiHYhsyC/P+d85iZ1aVjXkwUj8zzj P8vl5lxfTPSZx+U2HlmXoVmJUAoAvDUHTphV3mVecDppPyTrUIn/w0uejpYSeVc/ /thKTsUi6MB7CbM= Received: (qmail 27244 invoked by alias); 17 May 2016 10:10:22 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 27229 invoked by uid 89); 17 May 2016 10:10:21 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=BAYES_00, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD, UPPERCASE_50_75 autolearn=no version=3.3.2 spammy=HContent-Transfer-Encoding:7Bit, letter, Best X-HELO: foss.arm.com Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 17 May 2016 10:10:11 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B191A29; Tue, 17 May 2016 03:10:26 -0700 (PDT) Received: from e108577-lin.localnet (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 845C03F21A; Tue, 17 May 2016 03:10:09 -0700 (PDT) From: Thomas Preudhomme To: kyrylo.tkachov@arm.com, ramana.radhakrishnan@arm.com, richard.earnshaw@arm.com Cc: gcc-patches@gcc.gnu.org Subject: Re: [PATCH, ARM 3/7, ping1] Fix indentation of FL_FOR_ARCH* definition after adding support for ARMv8-M Date: Tue, 17 May 2016 11:10:07 +0100 Message-ID: <1941712.tNa0ky9lyH@e108577-lin> User-Agent: KMail/4.13.3 (Linux/3.13.0-85-generic; KDE/4.13.3; x86_64; ; ) In-Reply-To: <003001d1389f$9bcaf4e0$d360dea0$@foss.arm.com> References: <003001d1389f$9bcaf4e0$d360dea0$@foss.arm.com> MIME-Version: 1.0 X-IsSubscribed: yes Ping? *** gcc/ChangeLog *** 2015-11-06 Thomas Preud'homme * 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 > > * 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 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)