From owner-svn-src-all@freebsd.org  Sat Apr  8 16:14:31 2017
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 7BCB4D35C42;
 Sat,  8 Apr 2017 16:14:31 +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 mx1.freebsd.org (Postfix) with ESMTPS id 4C18F24B;
 Sat,  8 Apr 2017 16:14:31 +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 v38GEU89037394;
 Sat, 8 Apr 2017 16:14:30 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v38GEUEI037393;
 Sat, 8 Apr 2017 16:14:30 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201704081614.v38GEUEI037393@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Sat, 8 Apr 2017 16:14:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r316645 - head
X-SVN-Group: head
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.23
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Apr 2017 16:14:31 -0000

Author: emaste
Date: Sat Apr  8 16:14:30 2017
New Revision: 316645
URL: https://svnweb.freebsd.org/changeset/base/316645

Log:
  Unconditionally include arm64 in make universe / tinderbox
  
  As of r316629 FreeBSD/arm64 uses the in-tree LLD linker by default, and
  does not require an external an aarch64-binutils port or package.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/Makefile

Modified: head/Makefile
==============================================================================
--- head/Makefile	Sat Apr  8 14:41:39 2017	(r316644)
+++ head/Makefile	Sat Apr  8 16:14:30 2017	(r316645)
@@ -427,16 +427,6 @@ TARGET_ARCHES_powerpc?=	powerpc powerpc6
 TARGET_ARCHES_${target}?= ${target}
 .endfor
 
-# XXX Remove arm64 from universe if the required binutils package is missing.
-# It does not build with the in-tree linker.
-.if !exists(/usr/local/aarch64-freebsd/bin/ld) && ${TARGETS:Marm64}
-_UNIVERSE_TARGETS:= ${_UNIVERSE_TARGETS:Narm64}
-universe: universe_arm64_skip .PHONY
-universe_epilogue: universe_arm64_skip .PHONY
-universe_arm64_skip: universe_prologue .PHONY
-	@echo ">> arm64 skipped - install aarch64-binutils port or package to build"
-.endif
-
 .if defined(UNIVERSE_TARGET)
 MAKE_JUST_WORLDS=	YES
 .else