--- //depot/vendor/freebsd_7/src/sys/conf/kmod.mk	2008/03/17 12:37:45
+++ //depot/yahoo/ybsd_7/src/sys/conf/kmod.mk	2008/03/26 15:04:56
@@ -85,6 +86,11 @@
 CFLAGS+=	-D_KERNEL
 CFLAGS+=	-DKLD_MODULE
 
+ISPAE!= sysctl -n kern.features.pae 2>&1 || true
+.if ${ISPAE} == 1
+CFLAGS+=	-DPAE
+.endif
+
 # Don't use any standard or source-relative include directories.
 .if ${CC} == "icc"
 NOSTDINC=	-X
@@ -158,13 +164,17 @@
 .endfor
 .endif
 
+.if !defined(NO_ALWAYS_DEBUG)
+DEBUG_FLAGS?=	-g
+.endif
+
 OBJS+=	${SRCS:N*.h:R:S/$/.o/g}
 
 .if !defined(PROG)
 PROG=	${KMOD}.ko
 .endif
 
-.if !defined(DEBUG_FLAGS)
+.if !defined(DEBUG_FLAGS) || !defined(NO_ALWAYS_DEBUG)
 FULLPROG=	${PROG}
 .else
 FULLPROG=	${PROG}.debug
@@ -253,7 +263,7 @@
 
 CLEANFILES+= ${PROG} ${KMOD}.kld ${OBJS}
 
-.if defined(DEBUG_FLAGS)
+.if defined(DEBUG_FLAGS) && defined(NO_ALWAYS_DEBUG)
 CLEANFILES+= ${FULLPROG} ${PROG}.symbols
 .endif
 
@@ -270,7 +280,7 @@
 _kmodinstall:
 	${INSTALL} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \
 	    ${_INSTALLFLAGS} ${PROG} ${DESTDIR}${KMODDIR}
-.if defined(DEBUG_FLAGS) && !defined(INSTALL_NODEBUG)
+.if defined(DEBUG_FLAGS) && defined(NO_ALWAYS_DEBUG) && !defined(INSTALL_NODEBUG)
 	${INSTALL} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \
 	    ${_INSTALLFLAGS} ${PROG}.symbols ${DESTDIR}${KMODDIR}
 .endif