Index: sys/arch/amd64/include/types.h
===================================================================
RCS file: /cvsroot/src/sys/arch/amd64/include/types.h,v
retrieving revision 1.61
diff -u -r1.61 types.h
--- sys/arch/amd64/include/types.h	22 Sep 2019 10:35:12 -0000	1.61
+++ sys/arch/amd64/include/types.h	23 Sep 2019 18:04:17 -0000
@@ -74,8 +74,11 @@
 #define	__SIMPLELOCK_LOCKED	1
 #define	__SIMPLELOCK_UNLOCKED	0
 
+#if !__has_feature(undefined_behavior_sanitizer) && \
+	!defined(__SANITIZE_UNDEFINED__)
 /* The amd64 does not have strict alignment requirements. */
 #define	__NO_STRICT_ALIGNMENT
+#endif
 
 #define	__HAVE_NEW_STYLE_BUS_H
 #define	__HAVE_CPU_COUNTER