StdLib: GCC 6 build fixes

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 <leif.lindholm@linaro.org>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

diff --git a/StdLib/LibC/Math/k_rem_pio2.c b/StdLib/LibC/Math/k_rem_pio2.c
index af2857778da0235f45d5269a0d9c3c93d8c76732..bceeb73cc5bb4b223cdbf84bb779e754bd797392 100644 (file)
--- 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
 \r
     /* compute q[0],q[1],...q[jk] */\r
   for (i=0;i<=jk;i++) {\r
-      for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j]; q[i] = fw;\r
+      for(j=0,fw=0.0;j<=jx;j++) fw += x[j]*f[jx+i-j];\r
+      q[i] = fw;\r
   }\r
 \r
   jz = jk;\r

diff --git a/StdLib/LibC/Math/w_exp.c b/StdLib/LibC/Math/w_exp.c
index 29a2bb2906505754cf1a25c9a5192ad269263d1b..f2a0e396997322a4d78caaf96e84a98cb387aa2e 100644 (file)
--- 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"\r
 #include "math_private.h"\r
 \r
+#ifndef _IEEE_LIBM\r
 static const double\r
 o_threshold=  7.09782712893383973096e+02,  /* 0x40862E42, 0xFEFA39EF */\r
 u_threshold= -7.45133219101941108420e+02;  /* 0xc0874910, 0xD52D3051 */\r
+#endif\r
 \r
 double\r
 exp(double x)   /* wrapper exp */\r

diff --git a/StdLib/LibC/Time/Time.c b/StdLib/LibC/Time/Time.c
index 0296a5dc93910871cd3d10e2382fbed2168016e7..6d83986fcb9e3e13ded1203a57cd093e53d2ef3f 100644 (file)
--- a/StdLib/LibC/Time/Time.c
+++ b/StdLib/LibC/Time/Time.c
@@ -464,11 +464,11 @@ time1(
   for (i = 0; i < sp->typecnt; ++i)\r
     seen[i] = FALSE;\r
   nseen = 0;\r
-  for (i = sp->timecnt - 1; i >= 0; --i)\r
-    if (!seen[sp->types[i]]) {\r
-    seen[sp->types[i]] = TRUE;\r
-    types[nseen++] = sp->types[i];\r
-    }\r
+    for (i = sp->timecnt - 1; i >= 0; --i)\r
+      if (!seen[sp->types[i]]) {\r
+        seen[sp->types[i]] = TRUE;\r
+        types[nseen++] = sp->types[i];\r
+      }\r
     for (sameind = 0; sameind < nseen; ++sameind) {\r
       samei = types[sameind];\r
       if (sp->ttis[samei].tt_isdst != tmp->tm_isdst)\r

diff --git a/StdLib/LibC/gdtoa/dtoa.c b/StdLib/LibC/gdtoa/dtoa.c
index 42098426fd4f4a07d15cc33310af411be58c9745..cd3b1c85d41e15f6053520ca735548a45299e267 100644 (file)
--- a/StdLib/LibC/gdtoa/dtoa.c
+++ b/StdLib/LibC/gdtoa/dtoa.c
@@ -526,15 +526,15 @@ dtoa
         Bfree(b);\r
         b = b1;\r
         }\r
-      if (( j = b5 - m5 )!=0)\r
-        b = pow5mult(b, j);\r
+        if (( j = b5 - m5 )!=0)\r
+          b = pow5mult(b, j);\r
         if (b == NULL)\r
           return NULL;\r
       }\r
     else\r
       b = pow5mult(b, b5);\r
-      if (b == NULL)\r
-        return NULL;\r
+    if (b == NULL)\r
+      return NULL;\r
     }\r
   S = i2b(1);\r
   if (S == NULL)\r