commit 4fa84f7eb41642b174fe9d218921bcf2f9f5d8c0
Author: Ed Maste <emaste@FreeBSD.org>
Date:   Thu May 7 14:21:00 2020 -0400

    default WITHOUT_BINUTILS on all archs
    
    PR:             205250 [exp-run]

diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 1f4d908ce8a3..f4fa921c8b11 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -200,6 +200,7 @@ __DEFAULT_YES_OPTIONS = \
 __DEFAULT_NO_OPTIONS = \
     BEARSSL \
     BHYVE_SNAPSHOT \
+    BINUTILS \
     BSD_GREP \
     CLANG_EXTRAS \
     CLEAN \
@@ -291,15 +292,11 @@ __DEFAULT_NO_OPTIONS+=LLVM_TARGET_BPF
 .if ${__T} == "aarch64" || ${__T:Mriscv*} != ""
 BROKEN_OPTIONS+=BINUTILS BINUTILS_BOOTSTRAP GDB
 .endif
-# BINUTILS is enabled on x86 to provide as for ports - PR 205250
 # BINUTILS_BOOTSTRAP is needed on amd64 only, for skein_block_asm.s
 .if ${__T} == "amd64"
-__DEFAULT_YES_OPTIONS+=BINUTILS BINUTILS_BOOTSTRAP
-.elif ${__T} == "i386"
-__DEFAULT_YES_OPTIONS+=BINUTILS
-__DEFAULT_NO_OPTIONS+=BINUTILS_BOOTSTRAP
+__DEFAULT_YES_OPTIONS+=BINUTILS_BOOTSTRAP
 .else
-__DEFAULT_NO_OPTIONS+=BINUTILS BINUTILS_BOOTSTRAP
+__DEFAULT_NO_OPTIONS+=BINUTILS_BOOTSTRAP
 .endif
 .if ${__T:Mriscv*} != ""
 BROKEN_OPTIONS+=OFED