Date: Mon, 3 Jan 2022 15:00:53 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 69ee64c1c23d - main - src.opts.mk: Remove most of the mips support Message-ID: <202201031500.203F0r4N056776@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=69ee64c1c23dfffd46077c474981a68ecc264182 commit 69ee64c1c23dfffd46077c474981a68ecc264182 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2022-01-02 01:08:21 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2022-01-03 15:00:09 +0000 src.opts.mk: Remove most of the mips support Mips had a number of special cases that disabled features that didn't work. Remove them all. However, retain the llvm mips bits because that requires a lot more effort to unwind and will be done separately. Sponsored by: Netflix --- share/mk/src.opts.mk | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 02515f8ff66f..37bc5918a363 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -288,8 +288,8 @@ __DEFAULT_YES_OPTIONS+=LLDB .else __DEFAULT_NO_OPTIONS+=LLDB .endif -# LIB32 is supported on amd64, mips64, and powerpc64 -.if (${__T} == "amd64" || ${__T:Mmips64*} || ${__T} == "powerpc64") +# LIB32 is supported on amd64 and powerpc64 +.if (${__T} == "amd64" || ${__T} == "powerpc64") __DEFAULT_YES_OPTIONS+=LIB32 .else BROKEN_OPTIONS+=LIB32 @@ -298,16 +298,8 @@ BROKEN_OPTIONS+=LIB32 .if ${__T} != "armv6" && ${__T} != "armv7" BROKEN_OPTIONS+=LIBSOFT .endif -.if ${__T:Mmips*} -# GOOGLETEST cannot currently be compiled on mips due to external circumstances. -# Notably, the freebsd-gcc port isn't linking in libgcc so we end up trying ot -# link to a hidden symbol. LLVM would successfully link this in, but some of -# the mips variants are broken under LLVM until LLVM 10. GOOGLETEST should be -# marked no longer broken with the switch to LLVM. -BROKEN_OPTIONS+=GOOGLETEST SSP -.endif -# EFI doesn't exist on mips or powerpc. -.if ${__T:Mmips*} || ${__T:Mpowerpc*} +# EFI doesn't exist on powerpc (well, officially) +.if ${__T:Mpowerpc*} BROKEN_OPTIONS+=EFI .endif # OFW is only for powerpc, exclude others @@ -337,10 +329,6 @@ __DEFAULT_YES_OPTIONS+=OPENSSL_KTLS __DEFAULT_NO_OPTIONS+=OPENSSL_KTLS .endif -.if ${__T:Mmips64*} -# profiling won't work on MIPS64 because there is only assembly for o32 -BROKEN_OPTIONS+=PROFILE -.endif .if ${__T} != "aarch64" && ${__T} != "amd64" && ${__T} != "i386" && \ ${__T} != "powerpc64" BROKEN_OPTIONS+=CXGBETOOL
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201031500.203F0r4N056776>