Index: kernel/generic/include/debug.h
===================================================================
--- kernel/generic/include/debug.h	(revision a5057cc15989f1ce073bf956a728a028215354da)
+++ kernel/generic/include/debug.h	(revision 2b903cab51c99276896aa768df33ca0a8b114952)
@@ -77,8 +77,20 @@
 	} while (0)
 
+/** Static assert macro
+ *
+ */
+#define STATIC_ASSERT(expr) \
+	_Static_assert(expr, "")
+
+#define STATIC_ASSERT_VERBOSE(expr, msg) \
+	_Static_assert(expr, msg)
+
+
 #else /* CONFIG_DEBUG */
 
 #define ASSERT(expr)
 #define ASSERT_VERBOSE(expr, msg)
+#define STATIC_ASSERT(expr)
+#define STATIC_ASSERT_VERBOSE(expr, msg)
 
 #endif /* CONFIG_DEBUG */
Index: kernel/generic/include/printf/verify.h
===================================================================
--- kernel/generic/include/printf/verify.h	(revision a5057cc15989f1ce073bf956a728a028215354da)
+++ kernel/generic/include/printf/verify.h	(revision 2b903cab51c99276896aa768df33ca0a8b114952)
@@ -38,6 +38,12 @@
 #ifndef NVERIFY_PRINTF
 
+#ifdef __clang__
+#define PRINTF_ATTRIBUTE(start, end) \
+	__attribute__((format(__printf__, start, end)))
+#else
 #define PRINTF_ATTRIBUTE(start, end) \
 	__attribute__((format(gnu_printf, start, end)))
+#endif
+
 
 #else /* NVERIFY_PRINTF */