Changeset 3245 in kBuild

Timestamp:

Dec 25, 2018 9:01:36 PM (6 years ago)

Author:

bird

Message:

kmkbuiltin.c/h: GCC warnings.

Location:

trunk/src/kmk

Files:

• kmkbuiltin.c (modified) (5 diffs)
• kmkbuiltin.h (modified) (1 diff)

trunk/src/kmk/kmkbuiltin.c

@@ -246 +246 @@
 {
 #define BUILTIN_ENTRY(a_fn, a_sz, a_uFnSignature, fMtSafe, fNeedEnv) \
-    {  { { sizeof(a_sz) - 1, a_sz, } }, \
-       (uintptr_t)a_fn,                                 a_uFnSignature,   fMtSafe, fNeedEnv }
+    {  { { sizeof(a_sz) - 1, a_sz, } }, { (uintptr_t)a_fn }, a_uFnSignature,   fMtSafe, fNeedEnv }
 
     /* More frequently used commands: */
@@ -322 +321 @@
             case 4: cchAndStart |= (size_t)pszCmd[3] << (K_ARCH_BITS - 32); /* fall thru */
 # endif
+            /* fall thru - gcc 8.2.0 is confused by # endif */
             case 3: cchAndStart |= (size_t)pszCmd[2] << (K_ARCH_BITS - 24); /* fall thru */
             case 2: cchAndStart |= (size_t)pszCmd[1] << (K_ARCH_BITS - 16); /* fall thru */
@@ -330 +330 @@
         switch (cchAndStart)
         {
-            default:                                   /* fall thru */
+            default:                                        /* fall thru */
 # if K_ARCH_BITS >= 64
             case 7: cchAndStart |= (size_t)pszCmd[6] << 56; /* fall thru */
@@ -337 +337 @@
             case 4: cchAndStart |= (size_t)pszCmd[3] << 32; /* fall thru */
 # endif
+            /* fall thru - gcc 8.2.0 is confused by # endif */
             case 3: cchAndStart |= (size_t)pszCmd[2] << 24; /* fall thru */
             case 2: cchAndStart |= (size_t)pszCmd[1] << 16; /* fall thru */
@@ -483 +484 @@
             format_elapsed_nano(szTotal, sizeof(szTotal), g_aBuiltInStats[i].cNs);
             format_elapsed_nano(szAvg, sizeof(szAvg), g_aBuiltInStats[i].cNs / g_aBuiltInStats[i].cTimes);
-            fprintf(pOutput, "%s kmk_builtin_%-9s: %4lu times, %9s total, %9s/call\n",
+            fprintf(pOutput, "%s kmk_builtin_%-9s: %4u times, %9s total, %9s/call\n",
                     pszPrefix, g_aBuiltIns[i].uName.s.sz, g_aBuiltInStats[i].cTimes, szTotal, szAvg);
         }
         else if (g_aBuiltInStats[i].cAsyncTimes > 0)
-            fprintf(pOutput, "%s kmk_builtin_%-9s: %4lu times in worker thread\n",
+            fprintf(pOutput, "%s kmk_builtin_%-9s: %4u times in worker thread\n",
                     pszPrefix, g_aBuiltIns[i].uName.s.sz, g_aBuiltInStats[i].cAsyncTimes);
 }

trunk/src/kmk/kmkbuiltin.h

@@ -109 +109 @@
         struct
         {
-            char    cch;
-            char    sz[15];
+            unsigned char   cch;
+            char            sz[15];
         } s;
-        size_t      cchAndStart;
+        size_t              cchAndStart;
     } uName;
     union