Index: generic/nsf.c
===================================================================
diff -u -rc879193911af9a8a61460b238907fdbf255961e8 -r97767e2a92d0614941a60ee77735be86e39220dd
--- generic/nsf.c	(.../nsf.c)	(revision c879193911af9a8a61460b238907fdbf255961e8)
+++ generic/nsf.c	(.../nsf.c)	(revision 97767e2a92d0614941a60ee77735be86e39220dd)
@@ -1543,7 +1543,9 @@
   nonnull_assert(valueObj != NULL);
 
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#ifndef __clang__
+# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
   Nsf_PushFrameObj(interp, (NsfObject *)object, framePtr);
 #pragma GCC diagnostic pop
 
@@ -1567,7 +1569,9 @@
   nonnull_assert(name1 != NULL);
 
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#ifndef __clang__
+# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
   Nsf_PushFrameObj(interp, (NsfObject *)object, framePtr);
 #pragma GCC diagnostic pop
 
@@ -1595,7 +1599,9 @@
   o = (NsfObject *) object;
 
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#ifndef __clang__
+# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
   Nsf_PushFrameObj(interp, o, framePtr);
 #pragma GCC diagnostic pop
 
@@ -7583,7 +7589,9 @@
   nonnull_assert(object != NULL);
 
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#ifndef __clang__
+# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
   Nsf_PushFrameObj(interp, object, framePtr);
 #pragma GCC diagnostic pop
 
@@ -8712,7 +8720,9 @@
       CallFrame frame, *framePtr = &frame;
 
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#ifndef __clang__
+# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
       Nsf_PushFrameObj(interp, (NsfObject *)object, framePtr);
 #pragma GCC diagnostic pop
       /*
@@ -10947,7 +10957,9 @@
   } else {
 
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#ifndef __clang__
+# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
     Nsf_PushFrameObj(interp, object, framePtr);
 #pragma GCC diagnostic pop
   }
@@ -12269,7 +12281,9 @@
   nonnull_assert(name1 != NULL);
 
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#ifndef __clang__
+# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
   Nsf_PushFrameObj(interp, (NsfObject *)object, framePtr);
 #pragma GCC diagnostic pop
 
@@ -19608,7 +19622,9 @@
 
   if (object != NULL && (processFlags & NSF_ARGPARSE_METHOD_PUSH) != 0u ) {
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#ifndef __clang__
+# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
     Nsf_PushFrameObj(interp, object, framePtr);
 #pragma GCC diagnostic pop
   }
@@ -22858,7 +22874,9 @@
   }
 
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#ifndef __clang__
+# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
   Nsf_PushFrameObj(interp, object, framePtr);
 #pragma GCC diagnostic pop
 
@@ -23003,7 +23021,9 @@
   nonnull_assert(nameObj != NULL);
 
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#ifndef __clang__
+# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
   Nsf_PushFrameObj(interp, object, framePtr);
 #pragma GCC diagnostic pop
 
@@ -23091,7 +23111,9 @@
   nonnull_assert(arrayNameObj != NULL);
 
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#ifndef __clang__
+# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
   Nsf_PushFrameObj(interp, object, framePtr);
 #pragma GCC diagnostic pop
 
@@ -23153,7 +23175,9 @@
   }
 
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#ifndef __clang__
+# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
   Nsf_PushFrameObj(interp, object, framePtr);
 #pragma GCC diagnostic pop
 
@@ -23675,7 +23699,9 @@
   if (tcd->frame == FrameObjectIdx) {
 
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#ifndef __clang__
+# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
     Nsf_PushFrameObj(interp, object, framePtr);
 #pragma GCC diagnostic pop
 
@@ -24023,7 +24049,9 @@
   tcd->object = NULL;
 
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#ifndef __clang__
+# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
   Nsf_PushFrameObj(interp, object, framePtr);
 #pragma GCC diagnostic pop
 
@@ -28496,7 +28524,9 @@
   if (unlikely(withFrame == FrameObjectIdx)) {
 
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#ifndef __clang__
+# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
     Nsf_PushFrameObj(interp, object, framePtr);
 #pragma GCC diagnostic pop
     flags = NSF_CSC_IMMEDIATE;
@@ -32112,7 +32142,9 @@
    * accessible as locals.
    */
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#ifndef __clang__
+# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
   Nsf_PushFrameObj(interp, object, framePtr);
 #pragma GCC diagnostic pop
 
@@ -32473,7 +32505,9 @@
    * the object accessible as locals.
    */
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#ifndef __clang__
+# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
   Nsf_PushFrameObj(interp, object, framePtr);
 #pragma GCC diagnostic pop
 
@@ -32986,7 +33020,7 @@
        * between, then evaluate the result.  Tcl_EvalObjEx will delete
        * the object when it decrements its refCount after eval'ing it.
        */
-      Tcl_Obj *objPtr = Tcl_ConcatObj((size_t)objc, objv);
+      Tcl_Obj *objPtr = Tcl_ConcatObj((TCL_SIZE_T)objc, objv);
 
       result = Tcl_EvalObjEx(interp, objPtr, TCL_EVAL_DIRECT);
     }