Removed COPTS support from kmod.mk and kern.pre.mk.

COPTS support in bsd.prog.mk is preserved but discouraged.

share/mk/bsd.README

@@ -217,7 +217,7 @@ CLEANFILES	Additional files to remove and
 CLEANDIRS	additional directories to remove during clean and cleandir
 		targets.  "rm -f" and "rm -rf" used respectively.
 
-COPTS		Additional flags to the compiler when creating C objects.
+CFLAGS		Flags to the compiler when creating C objects.
 
 FILES		A list of non-executable files.
 		The installation is controlled by the FILESNAME, FILESOWN,

share/mk/bsd.prog.mk

@@ -5,6 +5,7 @@
 
 .SUFFIXES: .out .o .c .cc .cpp .cxx .C .m .y .l .ln .s .S .asm
 
+# XXX The use of COPTS in modern makefiles is discouraged.
 .if defined(COPTS)
 CFLAGS+=${COPTS}
 .endif

sys/conf/Makefile.powerpc

@@ -33,7 +33,7 @@ S=	../../..
 .endif
 .include "$S/conf/kern.pre.mk"
 
-COPTS+= -msoft-float
+CFLAGS+= -msoft-float
 
 %BEFORE_DEPEND
 

sys/conf/kern.pre.mk

@@ -66,8 +66,8 @@ INCLUDES+= -I$S/contrib/dev/ath -I$S/contrib/dev/ath/freebsd
 # ... and the same for the NgATM stuff
 INCLUDES+= -I$S/contrib/ngatm
 
-COPTS=	${INCLUDES} -D_KERNEL -include opt_global.h
-CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
+CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG}
+CFLAGS+= ${INCLUDES} -D_KERNEL -include opt_global.h
 .if ${CC} != "icc"
 CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT}
 CFLAGS+= --param inline-unit-growth=100

sys/conf/kmod.mk

@@ -73,7 +73,7 @@ OBJCOPY?=	objcopy
 .if ${CC} == "icc"
 CFLAGS:=	${CFLAGS:C/(-x[^M^K^W]+)[MKW]+|-x[MKW]+/\1/}
 .endif
-CFLAGS+=	${COPTS} -D_KERNEL
+CFLAGS+=	-D_KERNEL
 CFLAGS+=	-DKLD_MODULE
 
 # Don't use any standard or source-relative include directories.