? sys/compat/common/.vfs_syscalls_12.c.swp
Index: external/bsd/llvm/dist/clang/lib/Basic/Targets.cpp
===================================================================
RCS file: /cvsroot/src/external/bsd/llvm/dist/clang/lib/Basic/Targets.cpp,v
retrieving revision 1.1.1.14
diff -u -p -u -r1.1.1.14 Targets.cpp
--- external/bsd/llvm/dist/clang/lib/Basic/Targets.cpp	11 Jan 2017 10:34:54 -0000	1.1.1.14
+++ external/bsd/llvm/dist/clang/lib/Basic/Targets.cpp	17 Jan 2017 11:08:55 -0000
@@ -512,7 +512,7 @@ protected:
     Builder.defineMacro("__unix__");
     Builder.defineMacro("__ELF__");
     if (Opts.POSIXThreads)
-      Builder.defineMacro("_POSIX_THREADS");
+      Builder.defineMacro("_REENTRANT");
 
     switch (Triple.getArch()) {
     default:
Index: sys/sys/time.h
===================================================================
RCS file: /cvsroot/src/sys/sys/time.h,v
retrieving revision 1.77
diff -u -p -u -r1.77 time.h
--- sys/sys/time.h	6 Jan 2017 03:33:19 -0000	1.77
+++ sys/sys/time.h	17 Jan 2017 11:09:04 -0000
@@ -177,7 +177,7 @@ bintime2timespec(const struct bintime *b
 
 	ts->tv_sec = bt->sec;
 	ts->tv_nsec =
-	    (long)(((uint64_t)1000000000 * (uint32_t)(bt->frac >> 32)) >> 32);
+	    (long)((1000000000LL * (uint32_t)(bt->frac >> 32)) >> 32);
 }
 
 static __inline void
@@ -194,7 +194,7 @@ bintime2timeval(const struct bintime *bt
 
 	tv->tv_sec = bt->sec;
 	tv->tv_usec =
-	    (suseconds_t)(((uint64_t)1000000 * (uint32_t)(bt->frac >> 32)) >> 32);
+	    (suseconds_t)((1000000LL * (uint32_t)(bt->frac >> 32)) >> 32);
 }
 
 static __inline void