diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
index e897249c32e6..8f0163a3d0a0 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -245,17 +245,6 @@ CFLAGS+= -ftrivial-auto-var-init=pattern
 .endif
 .endif
 
-#
-# Add -gdwarf-2 when compiling -g. The default starting in clang v3.4
-# and gcc 4.8 is to generate DWARF version 4. However, our tools don't
-# cope well with DWARF 4, so force it to genereate DWARF2, which they
-# understand. Do this unconditionally as it is harmless when not needed,
-# but critical for these newer versions.
-#
-.if ${CFLAGS:M-g} != "" && ${CFLAGS:M-gdwarf*} == ""
-CFLAGS+=	-gdwarf-2
-.endif
-
 CFLAGS+= ${CWARNFLAGS:M*} ${CWARNFLAGS.${.IMPSRC:T}}
 CFLAGS+= ${CWARNFLAGS.${COMPILER_TYPE}}
 CFLAGS+= ${CFLAGS.${COMPILER_TYPE}} ${CFLAGS.${.IMPSRC:T}}