Author: emaste
Date: Sun Jun 7 00:07:21 2020
New Revision: 361880
URL: https://svnweb.freebsd.org/changeset/base/361880
Log:
Retire BINUTILS and BINUTILS_BOOTSTRAP options
As of r361857 all BINUTILS options are disabled by default - ports
have been changed to depend on binutils if they require GNU as, and
all base system assembly files have been switched to use Clang's
integrated assembler.
Relnotes: Yes
Sponsored by: The FreeBSD Foundation
Deleted:
head/tools/build/options/WITHOUT_BINUTILS
head/tools/build/options/WITHOUT_BINUTILS_BOOTSTRAP
head/tools/build/options/WITH_BINUTILS
head/tools/build/options/WITH_BINUTILS_BOOTSTRAP
Modified:
head/Makefile.inc1
head/ObsoleteFiles.inc
head/gnu/usr.bin/Makefile
head/gnu/usr.bin/binutils/Makefile
head/share/mk/src.opts.mk
head/tools/build/mk/OptionalObsoleteFiles.inc
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Sat Jun 6 22:26:44 2020 (r361879)
+++ head/Makefile.inc1 Sun Jun 7 00:07:21 2020 (r361880)
@@ -300,7 +300,7 @@ TEST_SYSTEM_COMPILER_VARS= \
X_COMPILER_FREEBSD_VERSION
TEST_SYSTEM_LINKER_VARS= \
USING_SYSTEM_LINKER MK_SYSTEM_LINKER \
- MK_LLD_BOOTSTRAP MK_BINUTILS_BOOTSTRAP \
+ MK_LLD_BOOTSTRAP \
WANT_LINKER_TYPE WANT_LINKER_VERSION WANT_LINKER_VERSION_FILE \
WANT_LINKER_FREEBSD_VERSION WANT_LINKER_FREEBSD_VERSION_FILE \
LD LINKER_TYPE LINKER_FEATURES LINKER_VERSION \
@@ -2421,9 +2421,6 @@ _dtrace_tools= cddl/lib/libctf cddl/usr.bin/ctfconvert
# If we're given an XAS, don't build binutils.
.if ${XAS:M/*} == ""
-.if ${MK_BINUTILS_BOOTSTRAP} != "no"
-_binutils= gnu/usr.bin/binutils
-.endif
.if ${MK_ELFTOOLCHAIN_BOOTSTRAP} != "no"
_elftctools= lib/libelftc \
lib/libpe \
@@ -2467,7 +2464,6 @@ cross-tools: .MAKE .PHONY
${_clang_libs} \
${_clang} \
${_lld} \
- ${_binutils} \
${_elftctools} \
${_dtrace_tools} \
${_btxld} \
@@ -2565,9 +2561,6 @@ SUBDIR_DEPEND_usr.bin/clang= lib/clang
NXBDIRS+= lib/clang
NXBDIRS+= usr.bin/clang
.endif
-.if ${MK_BINUTILS} != "no"
-NXBDIRS+= gnu/usr.bin/binutils
-.endif
# XXX: native-xtools passes along ${NXBDIRS} in SUBDIR_OVERRIDE that needs
# to be evaluated after NXBDIRS is set.
.if make(install) && !empty(SUBDIR_OVERRIDE)
@@ -3273,7 +3266,6 @@ _xb-build-tools: .PHONY
XDEVDIRS= \
${_clang_libs} \
${_lld} \
- ${_binutils} \
${_elftctools} \
usr.bin/ar \
${_clang}
Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc Sat Jun 6 22:26:44 2020 (r361879)
+++ head/ObsoleteFiles.inc Sun Jun 7 00:07:21 2020 (r361880)
@@ -36,6 +36,212 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20200606: retire binutils build infrastructure
+.if !defined(WITH_PORT_BASE_BINUTILS)
+OLD_FILES+=usr/bin/as
+OLD_FILES+=usr/bin/ld.bfd
+OLD_FILES+=usr/share/man/man1/as.1.gz
+OLD_FILES+=usr/share/man/man7/as.7.gz
+OLD_FILES+=usr/share/man/man7/ld.7.gz
+OLD_FILES+=usr/share/man/man7/ldint.7.gz
+OLD_FILES+=usr/share/man/man7/binutils.7.gz
+.endif
+OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.x
+OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xbn
+OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xc
+OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xd
+OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xdc
+OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xdw
+OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xn
+OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xr
+OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xs
+OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xsc
+OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xsw
+OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xu
+OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xw
+OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.x
+OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xbn
+OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xc
+OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xd
+OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xdc
+OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xdw
+OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xn
+OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xr
+OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xs
+OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xsc
+OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xsw
+OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xu
+OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xw
+OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.x
+OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xbn
+OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xc
+OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xd
+OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xdc
+OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xdw
+OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xn
+OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xr
+OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xs
+OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xsc
+OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xsw
+OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xu
+OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xw
+OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.x
+OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xbn
+OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xc
+OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xd
+OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xdc
+OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xdw
+OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xn
+OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xr
+OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xs
+OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xsc
+OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xsw
+OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xu
+OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xw
+OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.x
+OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xbn
+OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xc
+OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xd
+OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xdc
+OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xdw
+OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xn
+OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xr
+OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xs
+OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xsc
+OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xsw
+OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xu
+OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xw
+OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.x
+OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xbn
+OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xc
+OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xd
+OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xdc
+OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xdw
+OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xn
+OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xr
+OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xs
+OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xsc
+OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xsw
+OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xu
+OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xw
+OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.x
+OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xbn
+OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xc
+OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xd
+OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xdc
+OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xdw
+OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xn
+OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xr
+OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xs
+OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xsc
+OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xsw
+OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xu
+OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xw
+OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.x
+OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xbn
+OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xc
+OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xd
+OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xdc
+OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xdw
+OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xn
+OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xr
+OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xs
+OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xsc
+OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xsw
+OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xu
+OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xw
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.x
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xbn
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xc
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xd
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xdc
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xdw
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xn
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xr
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xs
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xsc
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xsw
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xu
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xw
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.x
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xbn
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xc
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xd
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xdc
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xdw
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xn
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xr
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xs
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xsc
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xsw
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xu
+OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xw
+OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.x
+OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xbn
+OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xc
+OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xd
+OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xdc
+OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xdw
+OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xn
+OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xr
+OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xs
+OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xsc
+OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xsw
+OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xu
+OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xw
+OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.x
+OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xbn
+OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xc
+OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xd
+OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xdc
+OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xdw
+OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xn
+OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xr
+OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xs
+OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xsc
+OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xsw
+OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xu
+OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xw
+OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.x
+OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xbn
+OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xc
+OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xd
+OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xdc
+OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xdw
+OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xn
+OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xr
+OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xs
+OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xsc
+OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xsw
+OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xu
+OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xw
+OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.x
+OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xbn
+OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xc
+OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xd
+OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xdc
+OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xdw
+OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xn
+OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xr
+OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xs
+OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xsc
+OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xsw
+OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xu
+OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xw
+OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.x
+OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xbn
+OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xc
+OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xd
+OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xdc
+OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xdw
+OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xn
+OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xr
+OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xs
+OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xsc
+OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xsw
+OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xu
+OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xw
+
# 20200601: OpenSSL 32-bit compat engines moved to /usr/lib32/engines
OLD_LIBS+=usr/lib32/capi.so
OLD_LIBS+=usr/lib32/padlock.so
Modified: head/gnu/usr.bin/Makefile
==============================================================================
--- head/gnu/usr.bin/Makefile Sat Jun 6 22:26:44 2020 (r361879)
+++ head/gnu/usr.bin/Makefile Sun Jun 7 00:07:21 2020 (r361880)
@@ -2,15 +2,10 @@
.include <src.opts.mk>
-
-.if ${MK_GDB} != "no" || ${MK_BINUTILS} != "no"
-SUBDIR+= binutils
-.endif
-
SUBDIR.${MK_DIALOG}+= dialog
SUBDIR.${MK_GNU_DIFF}+= diff3
SUBDIR.${MK_GNU_GREP}+= grep
-SUBDIR.${MK_GDB}+= gdb
+SUBDIR.${MK_GDB}+= binutils gdb
SUBDIR_DEPEND_gdb= binutils
SUBDIR.${MK_TESTS}+= tests
Modified: head/gnu/usr.bin/binutils/Makefile
==============================================================================
--- head/gnu/usr.bin/binutils/Makefile Sat Jun 6 22:26:44 2020
(r361879)
+++ head/gnu/usr.bin/binutils/Makefile Sun Jun 7 00:07:21 2020
(r361880)
@@ -6,18 +6,6 @@ SUBDIR= libiberty \
libbfd \
libopcodes
-SUBDIR.${MK_BINUTILS}+= doc
-
-# GNU as is used on x86 only, for a few files that cannot be assembled by
-# Clang IAS. Other archs either use Clang IAS for every assembly file, or
-# use external toolchain.
-.if (${TARGET} == "amd64" || ${TARGET} == "i386") && \
- (${MK_BINUTILS} != "no" || ${MK_BINUTILS_BOOTSTRAP} != "no")
-SUBDIR+= as
-.endif
-
-SUBDIR_DEPEND_as=libbfd libiberty libopcodes
-
.if !make(install)
SUBDIR_PARALLEL=
.endif
Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk Sat Jun 6 22:26:44 2020 (r361879)
+++ head/share/mk/src.opts.mk Sun Jun 7 00:07:21 2020 (r361880)
@@ -200,8 +200,6 @@ __DEFAULT_YES_OPTIONS = \
__DEFAULT_NO_OPTIONS = \
BEARSSL \
BHYVE_SNAPSHOT \
- BINUTILS \
- BINUTILS_BOOTSTRAP \
BSD_GREP \
CLANG_EXTRAS \
DTRACE_TESTS \
@@ -288,9 +286,9 @@ __DEFAULT_NO_OPTIONS+=LLVM_TARGET_BPF
.include <bsd.compiler.mk>
-# In-tree binutils/gcc are older versions without modern architecture support.
+# In-tree gdb is an older versions without modern architecture support.
.if ${__T} == "aarch64" || ${__T:Mriscv*} != ""
-BROKEN_OPTIONS+=BINUTILS BINUTILS_BOOTSTRAP GDB
+BROKEN_OPTIONS+=GDB
.endif
.if ${__T:Mriscv*} != ""
BROKEN_OPTIONS+=OFED
@@ -469,14 +467,12 @@ MK_ZONEINFO_LEAPSECONDS_SUPPORT:= no
.endif
.if ${MK_CROSS_COMPILER} == "no"
-MK_BINUTILS_BOOTSTRAP:= no
MK_CLANG_BOOTSTRAP:= no
MK_ELFTOOLCHAIN_BOOTSTRAP:= no
MK_LLD_BOOTSTRAP:= no
.endif
.if ${MK_TOOLCHAIN} == "no"
-MK_BINUTILS:= no
MK_CLANG:= no
MK_GDB:= no
MK_INCLUDES:= no
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc Sat Jun 6 22:26:44
2020 (r361879)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Sun Jun 7 00:07:21
2020 (r361880)
@@ -200,219 +200,11 @@ OLD_FILES+=usr/share/man/man8/bhyveload.8.gz
OLD_DIRS+=usr/share/examples/bhyve
.endif
-.if ${MK_BINUTILS} == no
.if !defined(WITH_PORT_BASE_BINUTILS)
-OLD_FILES+=usr/bin/as
.if ${MK_LLD_IS_LD} == no
OLD_FILES+=usr/bin/ld
OLD_FILES+=usr/share/man/man1/ld.1.gz
.endif
-.endif
-OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.x
-OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xbn
-OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xc
-OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xd
-OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xdc
-OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xdw
-OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xn
-OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xr
-OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xs
-OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xsc
-OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xsw
-OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xu
-OLD_FILES+=usr/libdata/ldscripts/armelf_fbsd.xw
-OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.x
-OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xbn
-OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xc
-OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xd
-OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xdc
-OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xdw
-OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xn
-OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xr
-OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xs
-OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xsc
-OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xsw
-OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xu
-OLD_FILES+=usr/libdata/ldscripts/armelfb_fbsd.xw
-OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.x
-OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xbn
-OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xc
-OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xd
-OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xdc
-OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xdw
-OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xn
-OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xr
-OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xs
-OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xsc
-OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xsw
-OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xu
-OLD_FILES+=usr/libdata/ldscripts/elf32_sparc.xw
-OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.x
-OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xbn
-OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xc
-OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xd
-OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xdc
-OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xdw
-OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xn
-OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xr
-OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xs
-OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xsc
-OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xsw
-OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xu
-OLD_FILES+=usr/libdata/ldscripts/elf32btsmip_fbsd.xw
-OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.x
-OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xbn
-OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xc
-OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xd
-OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xdc
-OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xdw
-OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xn
-OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xr
-OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xs
-OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xsc
-OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xsw
-OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xu
-OLD_FILES+=usr/libdata/ldscripts/elf32btsmipn32_fbsd.xw
-OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.x
-OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xbn
-OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xc
-OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xd
-OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xdc
-OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xdw
-OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xn
-OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xr
-OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xs
-OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xsc
-OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xsw
-OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xu
-OLD_FILES+=usr/libdata/ldscripts/elf32ltsmip_fbsd.xw
-OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.x
-OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xbn
-OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xc
-OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xd
-OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xdc
-OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xdw
-OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xn
-OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xr
-OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xs
-OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xsc
-OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xsw
-OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xu
-OLD_FILES+=usr/libdata/ldscripts/elf32ltsmipn32_fbsd.xw
-OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.x
-OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xbn
-OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xc
-OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xd
-OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xdc
-OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xdw
-OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xn
-OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xr
-OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xs
-OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xsc
-OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xsw
-OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xu
-OLD_FILES+=usr/libdata/ldscripts/elf32ppc_fbsd.xw
-OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.x
-OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xbn
-OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xc
-OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xd
-OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xdc
-OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xdw
-OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xn
-OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xr
-OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xs
-OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xsc
-OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xsw
-OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xu
-OLD_FILES+=usr/libdata/ldscripts/elf64_sparc.xw
-OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.x
-OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xbn
-OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xc
-OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xd
-OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xdc
-OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xdw
-OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xn
-OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xr
-OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xs
-OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xsc
-OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xsw
-OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xu
-OLD_FILES+=usr/libdata/ldscripts/elf64_sparc_fbsd.xw
-OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.x
-OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xbn
-OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xc
-OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xd
-OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xdc
-OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xdw
-OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xn
-OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xr
-OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xs
-OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xsc
-OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xsw
-OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xu
-OLD_FILES+=usr/libdata/ldscripts/elf64btsmip_fbsd.xw
-OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.x
-OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xbn
-OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xc
-OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xd
-OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xdc
-OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xdw
-OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xn
-OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xr
-OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xs
-OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xsc
-OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xsw
-OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xu
-OLD_FILES+=usr/libdata/ldscripts/elf64ltsmip_fbsd.xw
-OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.x
-OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xbn
-OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xc
-OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xd
-OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xdc
-OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xdw
-OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xn
-OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xr
-OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xs
-OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xsc
-OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xsw
-OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xu
-OLD_FILES+=usr/libdata/ldscripts/elf64ppc_fbsd.xw
-OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.x
-OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xbn
-OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xc
-OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xd
-OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xdc
-OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xdw
-OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xn
-OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xr
-OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xs
-OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xsc
-OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xsw
-OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xu
-OLD_FILES+=usr/libdata/ldscripts/elf_i386_fbsd.xw
-OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.x
-OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xbn
-OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xc
-OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xd
-OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xdc
-OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xdw
-OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xn
-OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xr
-OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xs
-OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xsc
-OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xsw
-OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xu
-OLD_FILES+=usr/libdata/ldscripts/elf_x86_64_fbsd.xw
-.if !defined(WITH_PORT_BASE_BINUTILS)
-OLD_FILES+=usr/share/man/man1/as.1.gz
-OLD_FILES+=usr/share/man/man7/as.7.gz
-OLD_FILES+=usr/share/man/man7/ld.7.gz
-OLD_FILES+=usr/share/man/man7/ldint.7.gz
-OLD_FILES+=usr/share/man/man7/binutils.7.gz
-.endif
-.endif
-.if !defined(WITH_PORT_BASE_BINUTILS)
-OLD_FILES+=usr/bin/ld.bfd
.endif
.if ${MK_BLACKLIST} == no
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
