From 18983e3b889877e6fabcd4d7d3220a5d84850add Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Sat, 6 Jun 2020 02:27:28 +0000
Subject: [PATCH] src.opts.mk: disable BINUTILS_BOOTSTRAP universally

As of r361853 skein_block_asm.S is assembled using Clang's integrated
assembler.

PR:		233611
Sponsored by:	The FreeBSD Foundation
---
 share/mk/src.opts.mk | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 1a8a41f0cc48..f23e4e07849b 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -201,6 +201,7 @@ __DEFAULT_NO_OPTIONS = \
     BEARSSL \
     BHYVE_SNAPSHOT \
     BINUTILS \
+    BINUTILS_BOOTSTRAP \
     BSD_GREP \
     CLANG_EXTRAS \
     DTRACE_TESTS \
@@ -291,12 +292,6 @@ __DEFAULT_NO_OPTIONS+=LLVM_TARGET_BPF
 .if ${__T} == "aarch64" || ${__T:Mriscv*} != ""
 BROKEN_OPTIONS+=BINUTILS BINUTILS_BOOTSTRAP GDB
 .endif
-# BINUTILS_BOOTSTRAP is needed on amd64 only, for skein_block_asm.s
-.if ${__T} == "amd64"
-__DEFAULT_YES_OPTIONS+=BINUTILS_BOOTSTRAP
-.else
-__DEFAULT_NO_OPTIONS+=BINUTILS_BOOTSTRAP
-.endif
 .if ${__T:Mriscv*} != ""
 BROKEN_OPTIONS+=OFED
 .endif