svn commit: r310790 - head/sys/conf

[Warner Losh]

On Thu, Dec 29, 2016 at 2:36 PM, Alexander Kabaev <kan at freebsd.org> wrote:
> Author: kan
> Date: Thu Dec 29 21:36:04 2016
> New Revision: 310790
> URL: https://svnweb.freebsd.org/changeset/base/310790
>
> Log:
>   Use TARGET_ARCH instead of MACHINE_ARCH for MIPS kernel

TARGET_ARCH is only defined for cross builds. I'm pretty sure this is wrong.
It won't work for native builds. TARGET_ARCH only has meaning in Makefile.inc1.

>   MACHINE_ARCH is overwritten by config file and will not
>   contain -hf suffix, so uname -p reported by kernel will
>   be wrong.

Then that must be fixed instead.

Warner

> Modified:
>   head/sys/conf/kern.pre.mk
>
> Modified: head/sys/conf/kern.pre.mk
> ==============================================================================
> --- head/sys/conf/kern.pre.mk   Thu Dec 29 21:30:52 2016        (r310789)
> +++ head/sys/conf/kern.pre.mk   Thu Dec 29 21:36:04 2016        (r310790)
> @@ -74,7 +74,7 @@ CFLAGS+= ${INCLUDES} -D_KERNEL -DHAVE_KE
>  CFLAGS_PARAM_INLINE_UNIT_GROWTH?=100
>  CFLAGS_PARAM_LARGE_FUNCTION_GROWTH?=1000
>  .if ${MACHINE_CPUARCH} == "mips"
> -CFLAGS_ARCH_PARAMS?=--param max-inline-insns-single=1000 -DMACHINE_ARCH='"${MACHINE_ARCH}"'
> +CFLAGS_ARCH_PARAMS?=--param max-inline-insns-single=1000 -DMACHINE_ARCH='"${TARGET_ARCH}"'
>  .endif
>  CFLAGS.gcc+= -fno-common -fms-extensions -finline-limit=${INLINE_LIMIT}
>  CFLAGS.gcc+= --param inline-unit-growth=${CFLAGS_PARAM_INLINE_UNIT_GROWTH}
>