Date: Wed, 20 Nov 2019 08:42:28 -0800 From: John Baldwin <jhb@FreeBSD.org> To: Li-Wen Hsu <lwhsu@FreeBSD.org>, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r354899 - head/usr.sbin/jail Message-ID: <b313e534-b1d2-88fd-0830-1509c983d5b3@FreeBSD.org> In-Reply-To: <201911201635.xAKGZwT4082365@repo.freebsd.org> References: <201911201635.xAKGZwT4082365@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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. Also, it would be good to wrap this in .if ${LINKER_TYPE} == "bfd" I think. (I was able to build a world + kernel with lld earlier this week, though it doesn't yet boot) -- John Baldwin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?b313e534-b1d2-88fd-0830-1509c983d5b3>