From owner-svn-src-all@freebsd.org Thu Sep 12 18:14:45 2019 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 001DED6005; Thu, 12 Sep 2019 18:14:45 +0000 (UTC) (envelope-from emaste@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46Tn3m6DXRz4Ymq; Thu, 12 Sep 2019 18:14:44 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B4B6622A7C; Thu, 12 Sep 2019 18:14:44 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8CIEi99093863; Thu, 12 Sep 2019 18:14:44 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8CIEifh093862; Thu, 12 Sep 2019 18:14:44 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <201909121814.x8CIEifh093862@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Thu, 12 Sep 2019 18:14:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r352259 - head/sys/modules X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/sys/modules X-SVN-Commit-Revision: 352259 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Sep 2019 18:14:45 -0000 Author: emaste Date: Thu Sep 12 18:14:44 2019 New Revision: 352259 URL: https://svnweb.freebsd.org/changeset/base/352259 Log: arm64: connect Linuxulator to the build More work needs to be done, but it is capable of running basic statically or dynamically linked Linux/arm64 binaries. Relnotes: Yes Sponsored by: The FreeBSD Foundation Modified: head/sys/modules/Makefile Modified: head/sys/modules/Makefile ============================================================================== --- head/sys/modules/Makefile Thu Sep 12 17:42:37 2019 (r352258) +++ head/sys/modules/Makefile Thu Sep 12 18:14:44 2019 (r352259) @@ -207,9 +207,6 @@ SUBDIR= \ libiconv \ libmchain \ lindebugfs \ - ${_linux} \ - ${_linux_common} \ - ${_linux64} \ linuxkpi \ ${_lio} \ lpt \ @@ -466,10 +463,22 @@ SUBDIR+= iscsi_initiator SUBDIR+= fdt .endif +# Linuxulator .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ ${MACHINE_CPUARCH} == "i386" SUBDIR+= linprocfs SUBDIR+= linsysfs +.endif +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" +SUBDIR+= linux +.endif +.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" +SUBDIR+= linux64 +SUBDIR+= linux_common +.endif + +.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ + ${MACHINE_CPUARCH} == "i386" _ena= ena .if ${MK_OFED} != "no" || defined(ALL_MODULES) _ibcore= ibcore @@ -590,7 +599,6 @@ _if_ndis= if_ndis _io= io _ix= ix _ixv= ixv -_linux= linux .if ${MK_SOURCELESS_UCODE} != "no" _lio= lio .endif @@ -692,8 +700,6 @@ _efirt= efirt _iavf= iavf _ioat= ioat _ixl= ixl -_linux64= linux64 -_linux_common= linux_common _nvdimm= nvdimm _pms= pms _qlxge= qlxge