From owner-svn-src-head@freebsd.org Wed Nov 6 18:54:05 2019 Return-Path: Delivered-To: svn-src-head@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 5414C1BD3FC; Wed, 6 Nov 2019 18:54:05 +0000 (UTC) (envelope-from imp@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 477bKn1X3rz4VTm; Wed, 6 Nov 2019 18:54:05 +0000 (UTC) (envelope-from imp@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 17A4E17D8; Wed, 6 Nov 2019 18:54:05 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xA6Is4TG024530; Wed, 6 Nov 2019 18:54:04 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xA6Is4v1024529; Wed, 6 Nov 2019 18:54:04 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201911061854.xA6Is4v1024529@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Wed, 6 Nov 2019 18:54:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r354408 - head/sys/conf X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/conf X-SVN-Commit-Revision: 354408 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Nov 2019 18:54:05 -0000 Author: imp Date: Wed Nov 6 18:54:04 2019 New Revision: 354408 URL: https://svnweb.freebsd.org/changeset/base/354408 Log: Remove obsolete addition of MACHINE_CPUARCH In the past, we would add symbolic links for MACHINE_CPUARCH when it differed from MACHINE. This was for pc98 only, however. All other architectures didn't need this and it was really due to pc98 pulling from i386 rather than something more intrinsic. At the time, we had the split we did to mimic what NetBSD did for its 68k ports where many different kernels were possible for the same architecture. Since then, both projects have moved away from this convention to having a more generic MACHINE for each architecture. FreeBSD's new arm64/aarch64 breaks this old notion and so was an exception to the rule. So, we no longer need to create this link for any old machine or any new machine, delete it entirely. Differential Revision: https://reviews.freebsd.org/D22246 Modified: head/sys/conf/kmod.mk Modified: head/sys/conf/kmod.mk ============================================================================== --- head/sys/conf/kmod.mk Wed Nov 6 18:39:32 2019 (r354407) +++ head/sys/conf/kmod.mk Wed Nov 6 18:54:04 2019 (r354408) @@ -283,9 +283,6 @@ _MAP_DEBUG_PREFIX= yes .endif _ILINKS=machine -.if ${MACHINE} != ${MACHINE_CPUARCH} && ${MACHINE} != "arm64" -_ILINKS+=${MACHINE_CPUARCH} -.endif .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" _ILINKS+=x86 .endif