svn commit: r354900 - head/usr.sbin/jail

Warner Losh imp at bsdimp.com
Wed Nov 20 23:04:57 UTC 2019


On Wed, Nov 20, 2019 at 3:09 PM John Baldwin <jhb at freebsd.org> wrote:

> On 11/20/19 10:01 AM, Warner Losh wrote:
> > On Wed, Nov 20, 2019 at 9:54 AM Li-Wen Hsu <lwhsu at freebsd.org> 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


More information about the svn-src-all mailing list