Date: Sun, 2 Feb 2020 11:37:28 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r357407 - head Message-ID: <202002021137.012BbSwd008392@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Sun Feb 2 11:37:27 2020 New Revision: 357407 URL: https://svnweb.freebsd.org/changeset/base/357407 Log: Per the firm plan, start to remove sparc64 The sparc64 architecture is being removed from FreeBSD 13, starting now. This removes it from the top level only. It is the only architecture that didn't see substantial work after the call to get things working with the external toolchain. Modified: head/Makefile head/Makefile.inc1 Modified: head/Makefile ============================================================================== --- head/Makefile Sun Feb 2 09:38:40 2020 (r357406) +++ head/Makefile Sun Feb 2 11:37:27 2020 (r357407) @@ -89,7 +89,7 @@ # # See src/UPDATING `COMMON ITEMS' for more complete information. # -# If TARGET=machine (e.g. powerpc, sparc64, ...) is specified you can +# If TARGET=machine (e.g. powerpc, arm64, ...) is specified you can # cross build world for other machine types using the buildworld target, # and once the world is built you can cross build a kernel using the # buildkernel target. @@ -488,7 +488,7 @@ worlds: .PHONY # In all cases, if the user specifies TARGETS on the command line, # honor that most of all. # -TARGETS?=amd64 arm arm64 i386 mips powerpc riscv sparc64 +TARGETS?=amd64 arm arm64 i386 mips powerpc riscv _UNIVERSE_TARGETS= ${TARGETS} TARGET_ARCHES_arm?= armv6 armv7 TARGET_ARCHES_arm64?= aarch64 @@ -501,14 +501,12 @@ TARGET_ARCHES_${target}?= ${target} .endfor MAKE_PARAMS_mips?= CROSS_TOOLCHAIN=mips-gcc6 -MAKE_PARAMS_sparc64?= CROSS_TOOLCHAIN=sparc64-gcc6 TOOLCHAINS_mips= mips-gcc6 -TOOLCHAINS_sparc64= sparc64-gcc6 # Remove architectures only supported by external toolchain from # universe if required toolchain packages are missing. -.for target in mips sparc64 +.for target in mips .if ${_UNIVERSE_TARGETS:M${target}} .for toolchain in ${TOOLCHAINS_${target}} .if !exists(/usr/local/share/toolchains/${toolchain}.mk) Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Sun Feb 2 09:38:40 2020 (r357406) +++ head/Makefile.inc1 Sun Feb 2 11:37:27 2020 (r357407) @@ -153,8 +153,7 @@ KNOWN_ARCHES?= aarch64/arm64 \ powerpc64/powerpc \ powerpcspe/powerpc \ riscv64/riscv \ - riscv64sf/riscv \ - sparc64 + riscv64sf/riscv .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} @@ -2290,8 +2289,6 @@ _basic_bootstrap_tools_multilink+=bin/test test,[ _basic_bootstrap_tools=usr.bin/awk usr.bin/cut bin/expr usr.bin/gencat \ usr.bin/join usr.bin/mktemp bin/rmdir usr.bin/sed usr.bin/sort \ usr.bin/truncate usr.bin/tsort -# elf2aout is required for sparc64 build -_basic_bootstrap_tools+=usr.bin/elf2aout # file2c is required for building usr.sbin/config: _basic_bootstrap_tools+=usr.bin/file2c # uuencode/uudecode required for share/tabset @@ -2915,14 +2912,10 @@ _cddl_lib_libctf= cddl/lib/libctf _cddl_lib= cddl/lib cddl/lib/libctf__L: lib/libz__L .endif -# cddl/lib/libdtrace requires lib/libproc and lib/librtld_db; it's only built -# on select architectures though (see cddl/lib/Makefile) -.if ${MACHINE_CPUARCH} != "sparc64" _prebuild_libs+= lib/libprocstat lib/libproc lib/librtld_db lib/libprocstat__L: lib/libelf__L lib/libkvm__L lib/libutil__L lib/libproc__L: lib/libprocstat__L lib/librtld_db__L: lib/libprocstat__L -.endif .if ${MK_CRYPT} != "no" .if ${MK_OPENSSL} != "no"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002021137.012BbSwd008392>