From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-x22d.google.com (mail-wr0-x22d.google.com [IPv6:2a00:1450:400c:c0c::22d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id BD9BD21A0480F for ; Fri, 28 Apr 2017 09:07:59 -0700 (PDT) Received: by mail-wr0-x22d.google.com with SMTP id w50so36352959wrc.0 for ; Fri, 28 Apr 2017 09:07:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=Ip2BbY00VfVJV2DqmBkXa/n1pI11k30gOApSnqkSx98=; b=h16Qne0Bcx/aPhdRCsgzKHWSP9Tw8ehkrIBzwR5yfuL2ihsi4k5OcbID10pYkGSNFq pyD2VBWrVvnDmIXqcRURFMbzCf6i02mDTeroBQYnc20up3AVlZiBfqmdEEqECQC8L+oL gtw2pX5e5FZMP4x/Nj7govulun0PIRqXt0eOs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=Ip2BbY00VfVJV2DqmBkXa/n1pI11k30gOApSnqkSx98=; b=p2JRCH6ex0J74jn26YMWrU2Alw54eyRGYupk3jJEPa9h0KrWVkX7+pp/B7Kp+Rj+0y KWEsGjvB9q2zc7AdTF+/X7uxSNfjOm+pXm3R5ahHWDegnRTbWXh3p2RrBvLESvVRlMdk tLOqjSsdJTEkbuFAcjq0KFX9rkCFwXY9hA2F1d2rDN9nmNmrJOLsM0mYLvnK3R2454q4 lbzR3ga4mE1gx+gpZYzdnQQTZy1klJuiY6UAZnzJ/Hy1E+0tJSp973O6aohYZND38aGc cnw/yqvj2xUsiljEh7fPZvyqcyfcqR1NlO1Lmsmq4mWOPf4t1IbtWONXgdDUZslr2+fF L1rQ== X-Gm-Message-State: AN3rC/4sFg5alT2xpcO0H7Dc9QujkiFMuwqgshmZVgBWvgZjpr0GPo47 s5xR+pEynTlQg6Kr X-Received: by 10.223.135.84 with SMTP id 20mr7417572wrz.199.1493395678022; Fri, 28 Apr 2017 09:07:58 -0700 (PDT) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id i199sm6183820wmf.33.2017.04.28.09.07.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Apr 2017 09:07:57 -0700 (PDT) Date: Fri, 28 Apr 2017 17:07:55 +0100 From: Leif Lindholm To: "Carsey, Jaben" Cc: "edk2-devel@lists.01.org" , Daryl McDaniel Message-ID: <20170428160755.GN1657@bivouac.eciton.net> References: <20170426214916.20784-1-leif.lindholm@linaro.org> MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Subject: Re: [PATCH] StdLib: GCC 6 build fixes X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Apr 2017 16:08:00 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, Apr 27, 2017 at 02:25:44PM +0000, Carsey, Jaben wrote: > Reviewed-by: Jaben Carsey Thanks! Pushed as 65ed9d7. / Leif > > -----Original Message----- > > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of > > Leif Lindholm > > Sent: Wednesday, April 26, 2017 2:49 PM > > To: edk2-devel@lists.01.org > > Cc: Carsey, Jaben ; Daryl McDaniel > lists@mc2research.org> > > Subject: [edk2] [PATCH] StdLib: GCC 6 build fixes > > Importance: High > > > > Resolve mainly 'misleading indentation', but also one 'defined but not used' > > warning when building with GCC 6 (using GCC5 profile). > > > > Contributed-under: TianoCore Contribution Agreement 1.0 > > Signed-off-by: Leif Lindholm > > --- > > > > Encountered when attmpting to build AppPkg/Applications/Lua. > > > > StdLib/LibC/Math/k_rem_pio2.c | 3 ++- > > StdLib/LibC/Math/w_exp.c | 2 ++ > > StdLib/LibC/Time/Time.c | 10 +++++----- > > StdLib/LibC/gdtoa/dtoa.c | 8 ++++---- > > 4 files changed, 13 insertions(+), 10 deletions(-) > > > > diff --git a/StdLib/LibC/Math/k_rem_pio2.c > > b/StdLib/LibC/Math/k_rem_pio2.c > > index af2857778d..bceeb73cc5 100644 > > --- a/StdLib/LibC/Math/k_rem_pio2.c > > +++ b/StdLib/LibC/Math/k_rem_pio2.c > > @@ -174,7 +174,8 @@ __kernel_rem_pio2(double *x, double *y, int e0, int > > nx, int prec, const int32_t > > > > /* compute q[0],q[1],...q[jk] */ > > for (i=0;i<=jk;i++) { > > - for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j]; q[i] = fw; > > + for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j]; > > + q[i] = fw; > > } > > > > jz = jk; > > diff --git a/StdLib/LibC/Math/w_exp.c b/StdLib/LibC/Math/w_exp.c > > index 29a2bb2906..f2a0e39699 100644 > > --- a/StdLib/LibC/Math/w_exp.c > > +++ b/StdLib/LibC/Math/w_exp.c > > @@ -22,9 +22,11 @@ __RCSID("$NetBSD: w_exp.c,v 1.9 2002/05/26 22:02:00 > > wiz Exp $"); > > #include "math.h" > > #include "math_private.h" > > > > +#ifndef _IEEE_LIBM > > static const double > > o_threshold= 7.09782712893383973096e+02, /* 0x40862E42, 0xFEFA39EF */ > > u_threshold= -7.45133219101941108420e+02; /* 0xc0874910, 0xD52D3051 */ > > +#endif > > > > double > > exp(double x) /* wrapper exp */ > > diff --git a/StdLib/LibC/Time/Time.c b/StdLib/LibC/Time/Time.c > > index 0296a5dc93..6d83986fcb 100644 > > --- a/StdLib/LibC/Time/Time.c > > +++ b/StdLib/LibC/Time/Time.c > > @@ -464,11 +464,11 @@ time1( > > for (i = 0; i < sp->typecnt; ++i) > > seen[i] = FALSE; > > nseen = 0; > > - for (i = sp->timecnt - 1; i >= 0; --i) > > - if (!seen[sp->types[i]]) { > > - seen[sp->types[i]] = TRUE; > > - types[nseen++] = sp->types[i]; > > - } > > + for (i = sp->timecnt - 1; i >= 0; --i) > > + if (!seen[sp->types[i]]) { > > + seen[sp->types[i]] = TRUE; > > + types[nseen++] = sp->types[i]; > > + } > > for (sameind = 0; sameind < nseen; ++sameind) { > > samei = types[sameind]; > > if (sp->ttis[samei].tt_isdst != tmp->tm_isdst) > > diff --git a/StdLib/LibC/gdtoa/dtoa.c b/StdLib/LibC/gdtoa/dtoa.c > > index 42098426fd..cd3b1c85d4 100644 > > --- a/StdLib/LibC/gdtoa/dtoa.c > > +++ b/StdLib/LibC/gdtoa/dtoa.c > > @@ -526,15 +526,15 @@ dtoa > > Bfree(b); > > b = b1; > > } > > - if (( j = b5 - m5 )!=0) > > - b = pow5mult(b, j); > > + if (( j = b5 - m5 )!=0) > > + b = pow5mult(b, j); > > if (b == NULL) > > return NULL; > > } > > else > > b = pow5mult(b, b5); > > - if (b == NULL) > > - return NULL; > > + if (b == NULL) > > + return NULL; > > } > > S = i2b(1); > > if (S == NULL) > > -- > > 2.11.0 > > > > _______________________________________________ > > edk2-devel mailing list > > edk2-devel@lists.01.org > > https://lists.01.org/mailman/listinfo/edk2-devel