From owner-svn-src-head@freebsd.org Mon Feb 24 07:16:43 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 45DB825467C; Mon, 24 Feb 2020 07:16:43 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48QtfM0J7zz4KYB; Mon, 24 Feb 2020 07:16:43 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.codepro.be", Issuer "Let's Encrypt Authority X3" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id BD1F918CBB; Mon, 24 Feb 2020 07:16:42 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: from [10.10.132.6] (ptr-8rg5e4gf2trfnnplmcg.18120a2.ip6.access.telenet.be [IPv6:2a02:1811:2408:6002:7cea:4a52:c574:960]) (Authenticated sender: kp) by venus.codepro.be (Postfix) with ESMTPSA id A07464996A; Mon, 24 Feb 2020 08:16:40 +0100 (CET) From: "Kristof Provost" To: "Warner Losh" Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r358262 - head/sys/conf Date: Mon, 24 Feb 2020 08:16:40 +0100 X-Mailer: MailMate (1.13.1r5671) Message-ID: <658E787D-8949-4D5B-B6C4-4F6394260E96@FreeBSD.org> In-Reply-To: <202002231904.01NJ4FmD046982@repo.freebsd.org> References: <202002231904.01NJ4FmD046982@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; format=flowed X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Feb 2020 07:16:43 -0000 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