From nobody Fri Dec 31 22:10:14 2021 X-Original-To: dev-commits-src-main@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 0FCDE192B6AF; Fri, 31 Dec 2021 22:10:15 +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 4JQfTL5jPRz4fYr; Fri, 31 Dec 2021 22:10:14 +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 A47F113716; Fri, 31 Dec 2021 22:10:14 +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 1BVMAER9059937; Fri, 31 Dec 2021 22:10:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BVMAE8G059930; Fri, 31 Dec 2021 22:10:14 GMT (envelope-from git) Date: Fri, 31 Dec 2021 22:10:14 GMT Message-Id: <202112312210.1BVMAE8G059930@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: f9bf88760dbf - main - mips: Remove system module support List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: f9bf88760dbf1b46757d8e8ac13cccbe6e6a6c81 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640988614; 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=gBSn9I9MZRfePKZqh2DAkQTlEoeqltSWqjAhhqFQchQ=; b=ofIY40lk8Zvvc9ZysQExvHHz1Y5UTL+CEv9DVtiE+7wKQ5AeyYo62D2Xjy85oI8wiiyAjm rysVDKYWUNCuA1W9YB9Z7dt7gKGWCTnGNgjckgDYjcuyTUPMvPl9fc7Sv4QtUoEmUylvrp zXL0J98e8FCDvGjcmCp/ngzD/9FWfWZaojCfXPSWENXw0THfJqpLM5Ac5Tfo+m+ekFOnNn Mf2DmN8O8f69SfpvIq7g8I36mwL3s7WveDxQcl3Ezj1tR5Pj1qa39f+E0w/EqV8EOL4Qks hE8O4yooS5hqPCPIILWgn06VI2njHB1Ui1K9fQT8WhwhTkXsmZdRplIip09P5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640988614; a=rsa-sha256; cv=none; b=FAuVUnLTm+1lwY6DRrc3qttf6QIUiy6mTxM0VPwkclJ0FM1neLpZeyVz5eOniAVjYvsxo8 8QErRr/FHw+5TmSEjs8QywBwy89AjV8OKuK7JNXKS3YQjRRqXd50U559ASuaXoy3p/2+NF QI/ohpYsBoXZuT+gwe6xv468Qtd0BAPfwEMSj4NfkqKmPHcz9qUPL1HFR9KMtp6Zn/lJJH nmosBU1Wh1a187f00M8ec6XLg5l2IdC/dJcjcQC+XDy2f4bU+QZAM+w6IaOLpjUekjnpbT kHg60r2WhRMu/MVJDfGkTBgORybIMC7+kVo9SvVePpurX5fS8emw4QXDbDd31Q== 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=f9bf88760dbf1b46757d8e8ac13cccbe6e6a6c81 commit f9bf88760dbf1b46757d8e8ac13cccbe6e6a6c81 Author: Warner Losh AuthorDate: 2021-12-31 22:02:35 +0000 Commit: Warner Losh CommitDate: 2021-12-31 22:09:46 +0000 mips: Remove system module support Remove all mips .if conditionals. Since _sym was now set unconditionally, just add it to the right place w/o a variable. Sponsored by: Netflix --- sys/modules/Makefile | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 188ddd8d7e8b..65d7ea7fefa2 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -356,7 +356,7 @@ SUBDIR= \ ${_sume} \ ${_superio} \ ${_p2sb} \ - ${_sym} \ + sym \ ${_syscons} \ sysvipc \ tcp \ @@ -406,8 +406,7 @@ _autofs= autofs .endif .if ${MK_CDDL} != "no" || defined(ALL_MODULES) -.if (${MACHINE_CPUARCH} != "arm" || ${MACHINE_ARCH:Marmv[67]*} != "") && \ - ${MACHINE_CPUARCH} != "mips" +.if ${MACHINE_CPUARCH} != "arm" || ${MACHINE_ARCH:Marmv[67]*} != "" .if ${KERN_OPTS:MKDTRACE_HOOKS} SUBDIR+= dtrace .endif @@ -551,17 +550,13 @@ _bce= bce _fxp= fxp _ispfw= ispfw _ti= ti - -.if ${MACHINE_CPUARCH} != "mips" _mwlfw= mwlfw _otusfw= otusfw _ralfw= ralfw _rtwnfw= rtwnfw .endif -.endif .if ${MK_SOURCELESS_UCODE} != "no" && ${MACHINE_CPUARCH} != "arm" && \ - ${MACHINE_CPUARCH} != "mips" && \ ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "powerpcspe" && \ ${MACHINE_CPUARCH} != "riscv" _cxgbe= cxgbe @@ -575,8 +570,7 @@ _ice_ddp= ice_ddp .endif # These rely on 64bit atomics -.if ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "powerpcspe" && \ - ${MACHINE_CPUARCH} != "mips" +.if ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "powerpcspe" _mps= mps _mpr= mpr .endif @@ -590,20 +584,14 @@ SUBDIR+= zfs .endif .if ${MACHINE_CPUARCH} != "aarch64" && ${MACHINE_CPUARCH} != "arm" && \ - ${MACHINE_CPUARCH} != "mips" && ${MACHINE_CPUARCH} != "powerpc" && \ - ${MACHINE_CPUARCH} != "riscv" + ${MACHINE_CPUARCH} != "powerpc" && ${MACHINE_CPUARCH} != "riscv" _syscons= syscons .endif -.if ${MACHINE_CPUARCH} != "mips" -# no BUS_SPACE_UNSPECIFIED -# No barrier instruction support (specific to this driver) -_sym= sym # intr_disable() is a macro, causes problems .if ${MK_SOURCELESS_UCODE} != "no" _cxgb= cxgb .endif -.endif .if ${MACHINE_CPUARCH} == "aarch64" _allwinner= allwinner