--- dyld/dyld-1340/mach_o/LoggingStub.cpp
+++ dyld/dyld-1162/mach_o/LoggingStub.cpp
@@ -26,8 +26,7 @@
 namespace mach_o
 {
 
-static WarningHandler sHandler = nullptr;
-
+WarningHandler sHandler = nullptr;
 void setWarningHandler(WarningHandler handler)
 {
     sHandler = handler;
@@ -43,7 +42,7 @@
     if ( sHandler ) {
         va_list list;
         va_start(list, format);
-        sHandler(context, format, va_list_wrap(list));
+        sHandler(context, format, list);
         va_end(list);
     }
 }