Date: Thu, 21 Nov 2019 01:46:34 +0000 From: Glen Barber <gjb@freebsd.org> To: John Baldwin <jhb@freebsd.org> Cc: "Bjoern A. Zeeb" <bzeeb-lists@lists.zabbadoz.net>, Warner Losh <imp@bsdimp.com>, src-committers <src-committers@freebsd.org>, svn-src-all <svn-src-all@freebsd.org>, svn-src-head <svn-src-head@freebsd.org> Subject: Re: svn commit: r354900 - head/usr.sbin/jail Message-ID: <20191121014634.GK5599@FreeBSD.org> In-Reply-To: <5d4541f5-fe6c-ecc7-c383-0dfd9596ec0f@FreeBSD.org> References: <201911201654.xAKGsMTv094014@repo.freebsd.org> <CANCZdfqVLZUqGiCDagwkULH7xegrZwehRsn8Ek-BJR=OVTpXGw@mail.gmail.com> <59bf120c-2f35-1a22-b6fa-a9c9bb8cfdf4@FreeBSD.org> <CANCZdfoG198Qqj90NS=NZ_%2BsMWoEPffGcJJmg25u4U97KgPfBQ@mail.gmail.com> <991bdc33-516d-6e6d-1880-44930441893d@FreeBSD.org> <A9CE2EDE-BF95-41EA-9F21-868804E992A2@lists.zabbadoz.net> <5d4541f5-fe6c-ecc7-c383-0dfd9596ec0f@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--A/JKaSqKPqQLCbw0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Wed, Nov 20, 2019 at 04:44:58PM -0800, John Baldwin wrote:
> On 11/20/19 3:42 PM, Bjoern A. Zeeb wrote:
> > On 20 Nov 2019, at 23:32, John Baldwin wrote:
> >=20
> > Hijacking a side-thread:
> >=20
> > PreS: I think we have way too many of these options and should just=20
> > remove 3/4 of them again or someone build a proper matrix documenting=
=20
> > them all and in which case to use in the developers handbook ;-)
> >=20
> >> This one also seems dubious, but in a different way:
> >>
> >> usr.bin/Makefile:
> >>
> >> # ARM64TODO gprof does not build
> >> # RISCVTODO gprof does not build
> >> .if ${MACHINE_ARCH} !=3D "aarch64" && ${MACHINE_CPUARCH} !=3D "riscv"
> >> SUBDIR.${MK_TOOLCHAIN}+=3D gprof
> >> .endif
> >>
> >> Somewhat exacerbated by the whole aarch64 vs arm64 thing and probably
> >> confusion on when to use CPUARCH vs ARCH.
> >=20
> > This particular case could actually be removed as I thought I made that=
=20
> > at least compile when I was working on s390x:
> > https://svnweb.freebsd.org/base?view=3Drevision&revision=3D351329
> >=20
> >=20
> > You can however find more of these elsewhere:
> >=20
> > ../lib/libc/tests/sys/Makefile:.if ${MACHINE_CPUARCH} !=3D "aarch64" &&=
=20
> > ${MACHINE_CPUARCH} !=3D "riscv"
> > ../lib/libcompiler_rt/Makefile.inc:.if ${MACHINE_CPUARCH} =3D=3D "aarch=
64"=20
> > || ${MACHINE_CPUARCH} =3D=3D "riscv"
> > ../stand/libsa/Makefile:.if ${MACHINE_CPUARCH} =3D=3D "aarch64" ||=20
> > ${MACHINE_CPUARCH} =3D=3D "riscv"
> > ../usr.bin/Makefile:.if ${MACHINE_ARCH} !=3D "aarch64" &&=20
> > ${MACHINE_CPUARCH} !=3D "riscv"
> > ../usr.bin/gprof/Makefile:.if ${MACHINE_ARCH} !=3D "aarch64" &&=20
> > ${MACHINE_ARCH} !=3D "riscv" && \
>=20
> The tests comparing MACHINE_CPUARCH against aarch64 are confusing indeed.
> My understanding is that MACHINE_CPUARCH is arm64 for aarch64? It's kind
> of hard to guess since arch(7) goes to great length to try to describe
> these variables but doesn't give a handy table of what they actually are
> for the various architectures.
>=20
This breaks the build, regardless.
=3D=3D=3D> usr.sbin/jail (cleandir)
=3D=3D=3D> usr.bin/procstat/tests (cleandir)
make[4]: "/releng/13-amd64-GENERIC-snap/usr/src/usr.sbin/jail/Makefile" li=
ne 21: Malformed conditional (${LINKER_TYPE} =3D=3D "bfd" && ${MACHINE} =3D=
=3D "riscv")
=3D=3D=3D> usr.bin/rctl (cleandir)
make[4]: Fatal errors encountered -- cannot continue
make[4]: stopped in /releng/13-amd64-GENERIC-snap/usr/src/usr.sbin/jail
--- cleandir_subdir_usr.sbin/jail ---
*** [cleandir_subdir_usr.sbin/jail] Error code 1
Glen
--A/JKaSqKPqQLCbw0
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAl3V7GcACgkQAxRYpUeP
4pMqcw/+Palor+xFakid/tF3JE2fDSiKJxLrm/1uoZPJhZaYT4IZamOVBaJrWcW6
aHndBOU0fwKMVaTGxNQCqQOUwkv+D5EnaK84hAfjUZa+MNh4aJ1jXh2H5QSQE87f
xeV4Dytk0MUULdOXyerz+b72ZfL7lOybx8J53JlrMapmv2cMqqIjShhPDvzJ68+q
9851AXFCXqvdr2TQpY/sJLVrODi4w3UaqsKyIeJlhUrgwEiknw+M9ceFP801V2Yf
QPr+xZmOY3sRq6KOG7MtYc/V/nomBC6oCF1AR9jLOrnAdgKSoza01W7tvZpc4ehg
nGiqPWoiJ6Q6LRGPwHdr2uvytnGsOwHnLhK+h3DrjrVswnxKpnahcTzoLyP0UHvo
BhgVltMK/62Zg13IhpbGR/QWaf6xRlB5zh6zlntNoJOEW1KmqW2fDZIuHuEv7zKK
S1w8OlYio7VksxiV41zJXCLCsy6ijlHZhy1LbZM3xbWpUOfd1eUDeE49oIFhxjYX
6vEFjhsc7YEYD9V8xtNKeYfBWZlXqIqEEoGIJ8rd2fsgmaX+uEimN5Qpt+5JutZy
1dNdcsQy6//iR/vua7d80e00KDaiX+r1dkFvVvfpQfDWVFy2+IdZRa8VLzvb3hsu
P5MDlq2XLTLCpnCgQBiHIqzjH0hiCn4QQANPhWJxAE663Dmvln4=
=X0MP
-----END PGP SIGNATURE-----
--A/JKaSqKPqQLCbw0--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20191121014634.GK5599>