svn commit: r361857 - head/share/mk

[Ed Maste]

Author: emaste
Date: Sat Jun  6 02:27:28 2020
New Revision: 361857
URL: https://svnweb.freebsd.org/changeset/base/361857

Log:
  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

Modified:
  head/share/mk/src.opts.mk

Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk	Sat Jun  6 01:56:30 2020	(r361856)
+++ head/share/mk/src.opts.mk	Sat Jun  6 02:27:28 2020	(r361857)
@@ -201,6 +201,7 @@ __DEFAULT_NO_OPTIONS = \
     BEARSSL \
     BHYVE_SNAPSHOT \
     BINUTILS \
+    BINUTILS_BOOTSTRAP \
     BSD_GREP \
     CLANG_EXTRAS \
     DTRACE_TESTS \
@@ -290,12 +291,6 @@ __DEFAULT_NO_OPTIONS+=LLVM_TARGET_BPF
 # In-tree binutils/gcc are older versions without modern architecture support.
 .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