From owner-svn-src-all@freebsd.org Wed Nov 20 16:58:20 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 B71471BC25A; Wed, 20 Nov 2019 16:58:20 +0000 (UTC) (envelope-from lwhsu.freebsd@gmail.com) Received: from mail-yw1-f68.google.com (mail-yw1-f68.google.com [209.85.161.68]) (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 47J85m4WDnz449P; Wed, 20 Nov 2019 16:58:20 +0000 (UTC) (envelope-from lwhsu.freebsd@gmail.com) Received: by mail-yw1-f68.google.com with SMTP id y64so209213ywe.3; Wed, 20 Nov 2019 08:58:20 -0800 (PST) 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=3E8tWrcdWSnY2EEhsL10JUvzgzrgXoNDi+Bh2vIaG50=; b=ECygpPE0E4OYmNdPOxVvczvWI6FBT+p1g1GNrz+8oRrKWIOfl4M+c7b6fmxiMty8v2 cGaz8pM3PAp6AgEya5rNZQUtTc0eisvJraGjdCw94u7z98wWTw+L0JssoyYFYadYYnA2 X5ez58hOOXVecIEcALVAenbmm3A1TOwjgBf/9xcN8YmwVnYiJbLltdvEfSyD+WR+bQGN go4HRp7mCRxIPRHlXBGtN0q+uNbG9O5o4WMy2vIV2K5UwQAQOr6XgWBjXFxvp6P82MH4 KB19Rtqvq73ZPT68H7IbyrXORUpSLwgCGeQ5KCgQdfE0aSZzTrShRrZiXVLB6AMU22fB Tovw== X-Gm-Message-State: APjAAAVbxBDoNgthvIAuTaooz1fxU1nUlfVD8KcSmK5o1fOtNVs2oxc6 jsoOteCtXldhVOQMwY6ldF5UH4EKw26+z2RChCcyYNCe X-Google-Smtp-Source: APXvYqx4cdTgIygqRP9xrsr0kKOmjG1cb/8VDb7G9+v2cQE3gM+0E3AIhe5Lw9IVfhGs6yK7aZ6aedwzrjwt5qLhUjk= X-Received: by 2002:a81:8301:: with SMTP id t1mr2326496ywf.400.1574269099002; Wed, 20 Nov 2019 08:58:19 -0800 (PST) MIME-Version: 1.0 References: <201911201635.xAKGZwT4082365@repo.freebsd.org> In-Reply-To: From: Li-Wen Hsu Date: Thu, 21 Nov 2019 00:58:07 +0800 Message-ID: Subject: Re: svn commit: r354899 - head/usr.sbin/jail To: John Baldwin Cc: src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 47J85m4WDnz449P X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-6.00 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[]; NEURAL_HAM_LONG(-1.00)[-0.999,0] 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 16:58:20 -0000 On Thu, Nov 21, 2019 at 12:42 AM John Baldwin wrote: > > On 11/20/19 8:35 AM, Li-Wen Hsu wrote: > > Author: lwhsu > > Date: Wed Nov 20 16:35:58 2019 > > New Revision: 354899 > > URL: https://svnweb.freebsd.org/changeset/base/354899 > > > > Log: > > Limit the workaround to riscv only > > > > PR: 242109 > > 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:32:13 2019 (r354898) > > +++ head/usr.sbin/jail/Makefile Wed Nov 20 16:35:58 2019 (r354899) > > @@ -18,7 +18,9 @@ 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" > > CFLAGS+=-Wl,--no-relax > > +.endif > > Eh, will that work? I think MACHINE and MACHINE_CPUARCH are riscv, > but MACHINE_ARCH is riscv64 and riscv64sf. No it doesn't. I was too lazy to do scp from test machine to commit machine and caused a copy-n-paste error, but ${MACHINE} should be better since it covers more. > Also, it would be good to wrap this in .if ${LINKER_TYPE} == "bfd" I think. Also added in r354900. Thanks for the suggestion. > (I was able to build a world + kernel with lld earlier this week, though it > doesn't yet boot) Looking forward to building world & kernel with llvm toolchain. Thanks, Li-Wen