From nobody Fri Jan 07 05:46:52 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id EECF8193597C; Fri, 7 Jan 2022 05:46:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JVXKS44TZz3tKG; Fri, 7 Jan 2022 05:46:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6C7B22DE0D; Fri, 7 Jan 2022 05:46:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2075kqTg007332; Fri, 7 Jan 2022 05:46:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2075kqn9007331; Fri, 7 Jan 2022 05:46:52 GMT (envelope-from git) Date: Fri, 7 Jan 2022 05:46:52 GMT Message-Id: <202201070546.2075kqn9007331@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: b68d6892ba8a - main - libsoft: Remove targets to generate libsoft List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b68d6892ba8aa14470e94a408b43ce4d8b1761da Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641534412; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LLWyKRPuo3TE3clzJPODcprMbVxdTsZ1Nb8/CNOMEtU=; b=ew/uz89G3tcz5ccdEFSMO1RP+eV0f/gBWifH+/Gk50UfCAKcMv7zZx97pD9CjF13+walAX /5NI3BsKhnRbjHPvHI03svtBc985mrLjxzTqfGSiKeLxU0mbF46zaeGeED0vjZz4TfbFsb uIegvBNODLDJSqtmB22uMBn6+ls/N3N02yO5I/jsoFLMrk+sHxKGxB5c0dF39P8yXqlTVq D+NzbbE0TCs/3ES1qp7EVKNEwcLbU7hACZkYeC5NNix0yCnV9zHDsm/CgEfsw3bsMPsiDe SQSMGSsSfuQlxy98Y8shwy/4UB+kVu8e3YF7sBVpfNQKx6uV1GtzQooOHPEPXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641534412; a=rsa-sha256; cv=none; b=bbeyAnP7Q28GX3D69jZFrCiWxJ9c82quo5ki8iiHM+bwr1NWQqX7d92BKb1wJwGgkM8fmf 34nEKeFNox/nttSyHUQUMdcN25eyzJqgj1j5kzlNgXZcPd3IhrlqkeKvTYheoZGwLU7yOT XcxdnUktbpQt1gSclI7kc6pQ2jFork5C367Yo/QPayqEpn68BpHylIE1IdBGblMshVGdx/ w2v16/Q7PwNYcnx/rNkiJ3QB1TPQTWWhkTmjKcCffDwE9ps1NT6a4/ktGR9uRAjKnFCQNM WH1HIuD0dKkxjZCtzVop9CscPkGW4RcBoeFOD8bRdrQKvY58SHbtJuOMngXMpQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b68d6892ba8aa14470e94a408b43ce4d8b1761da commit b68d6892ba8aa14470e94a408b43ce4d8b1761da Author: Warner Losh AuthorDate: 2022-01-07 05:34:15 +0000 Commit: Warner Losh CommitDate: 2022-01-07 05:34:15 +0000 libsoft: Remove targets to generate libsoft Remove the targets needed to make and install libsoft. Sponsored by: Netflix --- Makefile | 4 ++-- Makefile.inc1 | 3 --- share/mk/bsd.compat.mk | 15 +-------------- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index 113ca99623c7..ef430aa41e66 100644 --- a/Makefile +++ b/Makefile @@ -158,7 +158,7 @@ TGTS= all all-man buildenv buildenvvars buildkernel buildworld \ makeman sysent \ _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ _build-tools _build-metadata _cross-tools _includes _libraries \ - build32 distribute32 install32 buildsoft distributesoft installsoft \ + build32 distribute32 install32 \ builddtb xdev xdev-build xdev-install \ xdev-links native-xtools native-xtools-install stageworld stagekernel \ stage-packages stage-packages-kernel stage-packages-world \ @@ -187,7 +187,7 @@ TGTS+= ${BITGTS} # the interactive tty prompt. The safest route is to just whitelist # the ones that benefit from it. META_TGT_WHITELIST+= \ - _* build32 buildfiles buildincludes buildkernel buildsoft \ + _* build32 buildfiles buildincludes buildkernel \ buildworld everything kernel-toolchain kernel-toolchains kernel \ kernels libraries native-xtools showconfig test-includes \ test-system-compiler test-system-linker tinderbox toolchain \ diff --git a/Makefile.inc1 b/Makefile.inc1 index 963ffac7d09b..2cc00beed80d 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -847,9 +847,6 @@ XCFLAGS+= ${BFLAGS} .if ${MK_LIB32} == "yes" _LIBCOMPAT= 32 .include "Makefile.libcompat" -.elif ${MK_LIBSOFT} == "yes" -_LIBCOMPAT= SOFT -.include "Makefile.libcompat" .endif # META_MODE normally ignores host file changes since every build updates diff --git a/share/mk/bsd.compat.mk b/share/mk/bsd.compat.mk index 252049381230..fa6391b1adc2 100644 --- a/share/mk/bsd.compat.mk +++ b/share/mk/bsd.compat.mk @@ -67,18 +67,6 @@ LIB32CFLAGS= -DCOMPAT_32BIT LIB32DTRACE= ${DTRACE} -32 LIB32WMAKEFLAGS+= -DCOMPAT_32BIT -# ------------------------------------------------------------------- -# soft-fp world -.if ${COMPAT_ARCH:Marmv[67]*} != "" -HAS_COMPAT=SOFT -LIBSOFTCFLAGS= -DCOMPAT_SOFTFP -LIBSOFTCPUFLAGS= -mfloat-abi=softfp -LIBSOFT_MACHINE= arm -LIBSOFT_MACHINE_ARCH= ${COMPAT_ARCH} -LIBSOFTWMAKEENV= CPUTYPE=soft -LIBSOFTWMAKEFLAGS= -DCOMPAT_SOFTFP -.endif - # ------------------------------------------------------------------- # In the program linking case, select LIBCOMPAT .if defined(NEED_COMPAT) @@ -128,8 +116,7 @@ LIBCOMPATLDFLAGS+= -L${LIBCOMPATTMP}/usr/lib${libcompat} LIBCOMPATWMAKEENV+= MACHINE=${LIBCOMPAT_MACHINE} LIBCOMPATWMAKEENV+= MACHINE_ARCH=${LIBCOMPAT_MACHINE_ARCH} -# -B is needed to find /usr/lib32/crti.o for GCC and /usr/libsoft/crti.o for -# Clang/GCC. +# -B is needed to find /usr/lib32/crti.o for gcc. LIBCOMPATCFLAGS+= -B${LIBCOMPATTMP}/usr/lib${libcompat} .if defined(WANT_COMPAT)