From owner-svn-src-all@freebsd.org Wed Nov 20 18:01:43 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 D37EC1BE38B for ; Wed, 20 Nov 2019 18:01:43 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) (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 47J9Vt6trVz499r for ; Wed, 20 Nov 2019 18:01:42 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x735.google.com with SMTP id e2so604347qkn.5 for ; Wed, 20 Nov 2019 10:01:42 -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=hLqK5e+8scpHJfzIwvUCsujzQapWmK+PJNzlCIfxb10=; b=0SZ8jfEWk3l7xjWd+k4WAspfoQXMAX+Yy36xlV+xdEhPtog5xXZWwJTPrqy7NNhxy8 /2RoSvLrhugdVWaEOgK4/zsQkXBTyWPrei8wEAT7mXd0E6giVNmAYO9+pPi7s1u4R8Wk 8M3J5qNZY1KJWk3Smn5q9tf2BeuA5PzT9O8BosMKL+Sjq8IGy3pkEnIS2W0cN39kFz4e 3Ee/TJj6+qXgQW7TeUoAL7im/JhjwW1QCiACclE+jEv5rbVFI1UrTZKDSt1MlzT2sDVC uXW1zu5nh3K/hFllLs+fvwkBJHzxJ74ugKuXy94nOO8ThGgRIFIzpH7NpbOPHwAKj3fT z24g== 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=hLqK5e+8scpHJfzIwvUCsujzQapWmK+PJNzlCIfxb10=; b=h6GHdd7IASvoXJDm7sHpvW3vmnB57Bgepkcl2B1IeCLMLCl52ce7Q8xQcypbmjzbz5 37INmFMo9/2x2bJ72P9qKnQub2KeWpSmCzKmfcqeloY7vAjPlMTwWe5+2JOSwYQy3Ocp hQQYod0oUfw1ukoItXNx6K/j6EnJmEbQG9j9fOAFI1mH3OD3hBXeiG9Y9S0BHxjMc+iv H/AD3K+j3BmwQuwisRNRmWQe6UZTDiUw+UskQhtz7Sq0T5NAnNGCySI1m2yDmNWwRLHU DvTviZJ6foxUA4qtPbQN7oSEqrc8B6I7rajMl8SvAmgZxZn/AUgmVGIMxjEO17GDxHq1 czvw== X-Gm-Message-State: APjAAAXPJdSyfOTrZhoiqH01SS7YbY6R6SFNjkva5x0f7dyeeGnPDS7a 3otOUwuPGhOglb9NPUkYtVw5KEGOFNp4366TuAPqs4eG X-Google-Smtp-Source: APXvYqwEmYMci1ZePRH8++yBfupNxh/5NLPXYdxXCX4j2dTZZY3BFsWQV+5Rel/6O0c6rUsXoXKjtiS+48VcoYnrfbU= X-Received: by 2002:a37:b0c5:: with SMTP id z188mr3732612qke.215.1574272901685; Wed, 20 Nov 2019 10:01:41 -0800 (PST) MIME-Version: 1.0 References: <201911201654.xAKGsMTv094014@repo.freebsd.org> In-Reply-To: <201911201654.xAKGsMTv094014@repo.freebsd.org> From: Warner Losh Date: Wed, 20 Nov 2019 11:01:30 -0700 Message-ID: Subject: Re: svn commit: r354900 - head/usr.sbin/jail To: Li-Wen Hsu Cc: src-committers , svn-src-all , svn-src-head X-Rspamd-Queue-Id: 47J9Vt6trVz499r X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=0SZ8jfEW; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::735) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-4.74 / 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)[]; RCPT_COUNT_THREE(0.00)[4]; 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]; 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)[5.3.7.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.74)[ip: (-9.36), ipnet: 2607:f8b0::/32(-2.30), 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 18:01:43 -0000 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. Warner > CFLAGS+=-Wl,--no-relax > .endif > >