svn commit: r358262 - head/sys/conf

[Kristof Provost]

Thanks!

On 23 Feb 2020, at 20:04, Warner Losh wrote:
> Author: imp
> Date: Sun Feb 23 19:04:15 2020
> New Revision: 358262
> URL: https://svnweb.freebsd.org/changeset/base/358262
>
> Log:
>   Use MACHINE_ARCH instead of TARGET_ARCH
>
>   TARGET_ARCH is only for use in Makefile.inc1 contexts. MACHINE_ARCH 
> is the
>   preferred thing to set.  Makefile.inc1 sets MACHINE_ARCH in the 
> cross build
>   case, and make sets it in the native build case. This will fix 
> anybody doing a
>   native build. Add a comment for why we have to do this dance so 
> when/if the
>   problem with CFLAGS is fixed for the kernel this workaround can be 
> removed.
>
> Modified:
>   head/sys/conf/Makefile.riscv
>
> Modified: head/sys/conf/Makefile.riscv
> ==============================================================================
> --- head/sys/conf/Makefile.riscv	Sun Feb 23 17:59:51 2020	(r358261)
> +++ head/sys/conf/Makefile.riscv	Sun Feb 23 19:04:15 2020	(r358262)
> @@ -46,7 +46,9 @@ SYSTEM_LD= @${LD} -N -m ${LD_EMULATION} -Bdynamic -T 
> $
>  CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls
>  .endif
>
> -CFLAGS += -DMACHINE_ARCH=\"${TARGET_ARCH}\"
> +# Currently, the compile flags don't let the kernel know if this is a 
> hard-float
> +# ABI build or a soft-float ABI build. We need to pass in this 
> information.
> +CFLAGS += -DMACHINE_ARCH=\"${MACHINE_ARCH}\"
>
>  # hack because genassym.c includes sys/bus.h which includes these.
>  genassym.o: bus_if.h device_if.h