From owner-svn-src-head@freebsd.org  Sat Nov  4 03:08:07 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4486BE62614;
 Sat,  4 Nov 2017 03:08:07 +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 mx1.freebsd.org (Postfix) with ESMTPS id C25AF81F04;
 Sat,  4 Nov 2017 03:08:04 +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 vA4383LQ005224;
 Sat, 4 Nov 2017 03:08:03 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4383ru005223;
 Sat, 4 Nov 2017 03:08:03 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201711040308.vA4383ru005223@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 4 Nov 2017 03:08:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r325380 - head/sys/boot
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: head/sys/boot
X-SVN-Commit-Revision: 325380
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.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 04 Nov 2017 03:08:07 -0000

Author: imp
Date: Sat Nov  4 03:08:03 2017
New Revision: 325380
URL: https://svnweb.freebsd.org/changeset/base/325380

Log:
  Revert "WIP: centralize machine links"
  
  This reverts commit accidentally pushed r325376

Modified:
  head/sys/boot/defs.mk

Modified: head/sys/boot/defs.mk
==============================================================================
--- head/sys/boot/defs.mk	Sat Nov  4 03:07:58 2017	(r325379)
+++ head/sys/boot/defs.mk	Sat Nov  4 03:08:03 2017	(r325380)
@@ -84,40 +84,6 @@ CFLAGS+= -DLOADER_MBR_SUPPORT
 .if ${LOADER_GELI_SUPPORT:Uyes} == "yes"
 CFLAGS+= -DLOADER_GELI_SUPPORT
 .endif
-
-_ILINKS=machine
-.if ${MACHINE} != ${MACHINE_CPUARCH} && ${MACHINE} != "arm64"
-_ILINKS+=${MACHINE_CPUARCH}
 .endif
-.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
-_ILINKS+=x86
-.endif
-CLEANFILES+=${_ILINKS}
-
-all: ${PROG}
-
-beforedepend: ${_ILINKS}
-beforebuild: ${_ILINKS}
-
-# Ensure that the links exist without depending on it when it exists which
-# causes all the modules to be rebuilt when the directory pointed to changes.
-.for _link in ${_ILINKS}
-.if !exists(${.OBJDIR}/${_link})
-${OBJS}:	${_link}
-.endif
-.endfor
-
-.NOPATH: ${_ILINKS}
-
-${_ILINKS}:
-	@case ${.TARGET} in \
-	machine) \
-		path=${SYSDIR}/${MACHINE}/include ;; \
-	*) \
-		path=${SYSDIR}/${.TARGET:T}/include ;; \
-	esac ; \
-	path=`(cd $$path && /bin/pwd)` ; \
-	${ECHO} ${.TARGET:T} "->" $$path ; \
-	ln -fhs $$path ${.TARGET:T}
 
 .endif # __BOOT_DEFS_MK__