# HG changeset patch
# Parent  4c7e153ac2b10b978a562da518ad3ffbd1bdc62c

diff -r 4c7e153ac2b1 -r a454cd0a1a28 sys/conf/Makefile.mips
--- a/sys/conf/Makefile.mips
+++ b/sys/conf/Makefile.mips
@@ -41,16 +41,16 @@ TRAMPLOADADDR?=0x807963c0
 
 # We default to the MIPS32 ISA, if none specified in the
 # kernel configuration file.
-ARCH_FLAGS?=-march=mips32
+CFLAGS_ARCH?=-march=mips32
 EXTRA_FLAGS=-fno-pic -mno-abicalls -G0 -DKERNLOADADDR=${KERNLOADADDR}
 
 HACK_EXTRA_FLAGS=-shared
 
 # We add the -fno-pic flag to kernels because otherwise performance
 # is extremely poor, as well as -mno-abicalls to force no ABI usage.
-CFLAGS+=${EXTRA_FLAGS} $(ARCH_FLAGS)
-HACK_EXTRA_FLAGS+=${EXTRA_FLAGS} $(ARCH_FLAGS)
-TRAMP_ARCH_FLAGS?=$(ARCH_FLAGS)
+CFLAGS+=${EXTRA_FLAGS}
+HACK_EXTRA_FLAGS+=${EXTRA_FLAGS} $(CFLAGS_ARCH)
+TRAMP_ARCH_FLAGS?=$(CFLAGS_ARCH)
 TRAMP_EXTRA_FLAGS=${EXTRA_FLAGS} ${TRAMP_ARCH_FLAGS}
 .if ${MACHINE_ARCH:Mmips64*} != ""
 TRAMP_ELFSIZE=64
diff -r 4c7e153ac2b1 -r a454cd0a1a28 sys/conf/kern.pre.mk
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -100,6 +100,7 @@ CFLAGS.gcc+= --param large-function-grow
 .if defined(CFLAGS_ARCH_PARAMS)
 CFLAGS.gcc+=${CFLAGS_ARCH_PARAMS}
 .endif
+CFLAGS+=${CFLAGS_ARCH}
 WERROR?= -Werror
 
 # XXX LOCORE means "don't declare C stuff" not "for locore.s".