Date: Thu, 21 Mar 2024 21:30:20 +0100 From: Dimitry Andric <dim@FreeBSD.org> To: Justin Hibbits <chmeee@has.gonegalt.net> Cc: "src-committers@freebsd.org" <src-committers@FreeBSD.org>, "dev-commits-src-all@freebsd.org" <dev-commits-src-all@FreeBSD.org>, "dev-commits-src-main@freebsd.org" <dev-commits-src-main@FreeBSD.org> Subject: Re: git: f0620ceeccf0 - main - Fix building of several libclang_rt libraries for powerpc64 and powerp64le Message-ID: <628CFE63-DC26-48E9-8425-B4C3C760C653@FreeBSD.org> In-Reply-To: <20240321162153.0048ccba@ralga.knownspace> References: <202403211711.42LHBlpr041561@gitrepo.freebsd.org> <20240321162153.0048ccba@ralga.knownspace>
next in thread | previous in thread | raw e-mail | index | archive | help
On 21 Mar 2024, at 21:21, Justin Hibbits <chmeee@has.gonegalt.net> = wrote: >=20 > On Thu, 21 Mar 2024 17:11:47 GMT > Dimitry Andric <dim@FreeBSD.org> wrote: >=20 >> The branch main has been updated by dim: >>=20 >> URL: >> = https://cgit.FreeBSD.org/src/commit/?id=3Df0620ceeccf070a69352105c5dbc23cf= f499a732 >>=20 >> commit f0620ceeccf070a69352105c5dbc23cff499a732 >> Author: Dimitry Andric <dim@FreeBSD.org> >> AuthorDate: 2024-03-21 13:53:36 +0000 >> Commit: Dimitry Andric <dim@FreeBSD.org> >> CommitDate: 2024-03-21 17:05:25 +0000 >>=20 >> Fix building of several libclang_rt libraries for powerpc64 and >> powerp64le=20 >> I reorganized the libclang_rt Makefile in e77a1bb27574 to make it >> more readable and maintainable, but the check for 32-bit powerpc was >> wrong. This caused almost no libclang_rt libraries to be built for >> powerpc64 and powerpc64le. >>=20 >> PR: 262706 >> Reported by: tuexen >> Fixes: e77a1bb27574 >> MFC after: 3 days >> --- >> lib/libclang_rt/Makefile | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >>=20 >> diff --git a/lib/libclang_rt/Makefile b/lib/libclang_rt/Makefile >> index 46f7fdf814be..984da3f34156 100644 >> --- a/lib/libclang_rt/Makefile >> +++ b/lib/libclang_rt/Makefile >> @@ -67,7 +67,7 @@ SUBDIR+=3D ${SD_CFI} >> SUBDIR+=3D ${SD_SAFESTACK} >> SUBDIR+=3D ${SD_STATS} >> SUBDIR+=3D ${SD_UBSAN} >> -.elif ${MACHINE_CPUARCH} =3D=3D "powerpc" >> +.elif ${MACHINE_ARCH} =3D=3D "powerpc" >=20 > If you're excluding 32-bit powerpc you'll want to also exclude > powerpcspe. Though, you could just omit both powerpc and powerpcspe > from the list here, since there's no default error case. I wanted to keep the place open, for if at some point there would be = some sort of support for either of those architectures. But I guess the thing is better written as: ... .elif ${MACHINE_CPUARCH} =3D=3D "powerpc" . if ${MACHINE_ARCH} =3D=3D "powerpc64" # some subdirs . elif ${MACHINE_ARCH} =3D=3D "powerpc64le" # other subdirs . else # remark about nothing being available yet . endif .elif # other CPUARCH values -Dimitry
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?628CFE63-DC26-48E9-8425-B4C3C760C653>