Index: sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
===================================================================
--- sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
+++ sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h
@@ -59,17 +59,15 @@
 /*
  * Handle the kernel printf routines that can take '%b' too
  */
-#if __GNUC_VERSION < 30402
-/*
- * XX64 at least this doesn't work correctly yet with 3.4.1 anyway!
- */
-#define	__sun_attr___KPRINTFLIKE__	__sun_attr___PRINTFLIKE__
-#define	__sun_attr___KVPRINTFLIKE__	__sun_attr___VPRINTFLIKE__
-#else
+#if defined(__FreeBSD_cc_version) && __FreeBSD_cc_version >= 300001 && \
+    defined(__GNUC__) && !defined(__INTEL_COMPILER)
 #define	__sun_attr___KPRINTFLIKE__(__n)	\
-		__attribute__((__format__(cmn_err, __n, (__n)+1)))
+		__attribute__((__format__(__printf0__, __n, (__n)+1)))
 #define	__sun_attr___KVPRINTFLIKE__(__n) \
-		__attribute__((__format__(cmn_err, __n, 0)))
+		__attribute__((__format__(__printf0__, __n, 0)))
+#else
+#define	__sun_attr___KPRINTFLIKE__	__sun_attr___PRINTFLIKE__
+#define	__sun_attr___KVPRINTFLIKE__	__sun_attr___VPRINTFLIKE__
 #endif
 
 /*
Index: sys/contrib/openzfs/lib/libzutil/os/freebsd/zutil_compat.c
===================================================================
--- sys/contrib/openzfs/lib/libzutil/os/freebsd/zutil_compat.c
+++ sys/contrib/openzfs/lib/libzutil/os/freebsd/zutil_compat.c
@@ -55,7 +55,7 @@
 	switch (cflag) {
 	case ZFS_CMD_COMPAT_NONE:
 		ncmd = _IOWR('Z', request, zfs_iocparm_t);
-		zp.zfs_cmd = (uint64_t)zc;
+		zp.zfs_cmd = (uint64_t)(uintptr_t)zc;
 		zp.zfs_cmd_size = sizeof (zfs_cmd_t);
 		zp.zfs_ioctl_version = ZFS_IOCVER_OZFS;
 		break;
@@ -64,7 +64,7 @@
 		ncmd = _IOWR('Z', newrequest, zfs_iocparm_t);
 		zc_c = malloc(sizeof (zfs_cmd_legacy_t));
 		zfs_cmd_ozfs_to_legacy(zc, zc_c);
-		zp.zfs_cmd = (uint64_t)zc_c;
+		zp.zfs_cmd = (uint64_t)(uintptr_t)zc_c;
 		zp.zfs_cmd_size = sizeof (zfs_cmd_legacy_t);
 		zp.zfs_ioctl_version = ZFS_IOCVER_LEGACY;
 		break;
Index: sys/contrib/openzfs/module/zfs/spa.c
===================================================================
--- sys/contrib/openzfs/module/zfs/spa.c
+++ sys/contrib/openzfs/module/zfs/spa.c
@@ -1385,7 +1385,7 @@
 	 * it.
 	 */
 	if (spa->spa_did != 0) {
-		thread_join(spa->spa_did);
+		thread_join((uintptr_t)spa->spa_did);
 		spa->spa_did = 0;
 	}
 }