From nobody Mon Jan 03 15:00:53 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 24DAA1936936; Mon, 3 Jan 2022 15:00:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JSJpZ4dVrz3qct; Mon, 3 Jan 2022 15:00:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F2B6D27357; Mon, 3 Jan 2022 15:00:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 203F0r6o056777; Mon, 3 Jan 2022 15:00:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 203F0r4N056776; Mon, 3 Jan 2022 15:00:53 GMT (envelope-from git) Date: Mon, 3 Jan 2022 15:00:53 GMT Message-Id: <202201031500.203F0r4N056776@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 69ee64c1c23d - main - src.opts.mk: Remove most of the mips support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 69ee64c1c23dfffd46077c474981a68ecc264182 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641222054; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ixLyjjtHPceefjEQKLoMfGVArHPrVXELqM6w2QW46k4=; b=yctiqFYnWesY/r4t70fG8yqQkKg9kTEErpy0rWIL/G0lHh+w6BPNsnPN75hoCg9P09Mi2z ktAf/WF3ZFP99Njy9rmim3w/z0epJXGH3ux8IGB3tZK9Iugwc8YBSB0uY9VPlwjONvsWuM W3JMDmoMkQrfOj9zV4rOX2qheSpq27973y7WwjlANExuWMZfi1e/Yl93NYCilQsQ8NV4hZ DHRoDCK2npFF2Da9OQeytWPGa7qdh+AqlrQ60MxP9Qi8iBsH7cVXYnv029aEFSE6u4MrxS n3+A4Hl4VsoyH4JaJgYy3DjuD1QNkmCxXB4tPwoQVei9QrkpgFkbMv7xVKt1mA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641222054; a=rsa-sha256; cv=none; b=Qsb7iDWwuOn5Aq7yG3ReRhMKPPi8NCdFRZmOvu4G1UxrPeIWIBeMzElzpd1P1F054QV75r nmEzUcwcb1Ojv9Q6I9UnnCWE6FpL23M7zls574GEySFOFJgqPtU5hz/f4SiJZ5057xnWoq z0H63as0j585Uqr+LNkQh2ujB0ll4czPr7MlulgsKN/FZ5NjJ4ftlF/H0Lx6ZhlbrjpKyV KMGmz0vpgZ8yDFa9bCtyCOgQzv4ELQk7ogMUWGHrMEpxCLxoHvs734o4esR2BuxYOKdV0t dS4WOInVsA6fvDUG6kiZ1k1FlDDV4pgyVH0USsj9qAESzQq9Gjq/90N5aWdTKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=69ee64c1c23dfffd46077c474981a68ecc264182 commit 69ee64c1c23dfffd46077c474981a68ecc264182 Author: Warner Losh AuthorDate: 2022-01-02 01:08:21 +0000 Commit: Warner Losh 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