From owner-svn-src-all@freebsd.org Wed Nov 20 23:04:57 2019 Return-Path: Delivered-To: svn-src-all@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 4ABC21C4CC8 for ; Wed, 20 Nov 2019 23:04:57 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x831.google.com (mail-qt1-x831.google.com [IPv6:2607:f8b0:4864:20::831]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47JJDm2Rg3z4V46 for ; Wed, 20 Nov 2019 23:04:56 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x831.google.com with SMTP id g50so1485088qtb.4 for ; Wed, 20 Nov 2019 15:04:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=C/VV1ml/kxFYUkSJI/j06bqIzkro3A3+asaRfEEUXKk=; b=DS2oT1qrA0Z1oY91Iiu6YDHWzQM3tIgdMLNbbUgJ1wIlogewcsio2HrEsKQ6I1L1pF Hrs3oguekXcaaRQsa3XGwT2bEGBHjb/9sdHMGmJPF/pFWltOLkmGlJtr67E+LXUzSRaq oiOilX54yA42QUaiviUGcLnaIB840GF3Wm7/l5zblkfTdlpjGFyIlIQuDCoat3BXFjC3 78235fQ2oq2n/hwcDeGiBPXjqJ/k0tWCNf479RcpW9cpTgD2rhV3uEW//lWS8ldO5b1y 3zOnzNEaf+mtn6T2sxnC+25L9nHShma7lH3VUBcXuMCPxdn2gro00YbQuL52DGFRUjlg Tl7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=C/VV1ml/kxFYUkSJI/j06bqIzkro3A3+asaRfEEUXKk=; b=SzjtBpMo57GteLHWqWtMLOWds+L0ZFiljO8OH2yez1d0f+AdzTVcpw2Y4J//vZh3Jc n6IFd2Y9CwQsEyIGjTRMUDp6yTyW+QWE7k7k0NKN8qng5t70tS8MFC+kQUtmeMn4z/SG CqST4ElQfVeiy8Ic10MOMooNGRgr+3beS5mIssz2xCiF1I+JtwnHD5GCQHFwmdJoaXC4 Bkmniwfh3PHyqEjbyDZqIficBXHSAKgX6UUsmOcNIUSnPpAGeJd7cOlw56kFWs/qQhay yB9Ty0UOdzrxcONyXIMiKq0h0t6KxdRHHPbnTKeRcrVnR2voMG4JEdpRyCnSM3/Gfa+0 4KVg== X-Gm-Message-State: APjAAAWIDEn+jmK0CoLpypFvKmsZK8iTBFMglfDmCMNnsDoaY8WUoAKt 6EsdqCx5icJ2RBtLOGy+ReKdN97t9d1rOrCx7jJPDw== X-Google-Smtp-Source: APXvYqxHnhH2HeWogyH9gWY/x2XsKncDd6nLjWaCxmnUAwAUoDJQcX8q6vaoJW1WQW4YS9ezWCKP8NTkezvw4LT9T6o= X-Received: by 2002:ac8:754c:: with SMTP id b12mr5365284qtr.291.1574291094946; Wed, 20 Nov 2019 15:04:54 -0800 (PST) MIME-Version: 1.0 References: <201911201654.xAKGsMTv094014@repo.freebsd.org> <59bf120c-2f35-1a22-b6fa-a9c9bb8cfdf4@FreeBSD.org> In-Reply-To: <59bf120c-2f35-1a22-b6fa-a9c9bb8cfdf4@FreeBSD.org> From: Warner Losh Date: Wed, 20 Nov 2019 16:04:44 -0700 Message-ID: Subject: Re: svn commit: r354900 - head/usr.sbin/jail To: John Baldwin Cc: Li-Wen Hsu , src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: 47JJDm2Rg3z4V46 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=DS2oT1qr; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::831) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-4.72 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[svn-src-all@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[1.3.8.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; IP_SCORE(-2.72)[ip: (-9.26), ipnet: 2607:f8b0::/32(-2.29), asn: 15169(-1.97), country: US(-0.05)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Nov 2019 23:04:57 -0000 On Wed, Nov 20, 2019 at 3:09 PM John Baldwin wrote: > On 11/20/19 10:01 AM, Warner Losh wrote: > > On Wed, Nov 20, 2019 at 9:54 AM Li-Wen Hsu wrote: > > > >> Author: lwhsu > >> Date: Wed Nov 20 16:54:21 2019 > >> New Revision: 354900 > >> URL: https://svnweb.freebsd.org/changeset/base/354900 > >> > >> Log: > >> Use the correct variable, also limit the scope to bfd > >> > >> PR: 242109 > >> Reported by: jhb > >> Sponsored by: The FreeBSD Foundation > >> > >> Modified: > >> head/usr.sbin/jail/Makefile > >> > >> Modified: head/usr.sbin/jail/Makefile > >> > >> > ============================================================================== > >> --- head/usr.sbin/jail/Makefile Wed Nov 20 16:35:58 2019 > (r354899) > >> +++ head/usr.sbin/jail/Makefile Wed Nov 20 16:54:21 2019 > (r354900) > >> @@ -18,7 +18,7 @@ CFLAGS+=-I. -I${.CURDIR} > >> # workaround for GNU ld (GNU Binutils) 2.33.1: > >> # relocation truncated to fit: R_RISCV_GPREL_I against `.LANCHOR2' > >> # https://bugs.freebsd.org/242109 > >> -.if ${MACHINE_ARCH} == "riscv" > >> +.if ${LINKER_TYPE} == "bfd" && ${MACHINE} == "riscv" > >> > > > > MACHINE isn't the right thing to use here. It's never the proper thing in > > userland makefiles, unless they are interfacing with the kernel. > > > > MACHINE_CPUARCH is what you want here. > > Eh, that claim doesn't seem quite true. src.opts.mk only uses MACHINE > and not > MACHINE_CPUARCH for example (to set _TT that is then used all over the > place in src.opts.mk). My experience is that uses of *_CPUARCH are in > fact > pretty rare. > However, __TT is used bogusly in many places in src.opts.mk. They are all relatively new related to llvm (and one for google test). MACHINE has always been for the kernel and MACHINE_ARCH for userland. MACHINE_CPUARCH was created for those architectures where we have a number of MACHINE_ARCH to make things easier to cope with. I've done several sweeps of the tree over the years to keep this enforced, so I'm quite sure of the dichotomy... Warner