From nobody Mon Nov 13 21:34:51 2023 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 4STjPl2T7hz50m7g; Mon, 13 Nov 2023 21:34:51 +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 4STjPl22pzz3RNq; Mon, 13 Nov 2023 21:34:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699911291; 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=iUBY5PJF0Frpqq1uqrHegvn5EMyo+dySAit2diD0i7U=; b=GVsd7/FoyvYqEZv8WkRyPPGna/MXciHB722ccvlbOHnPGb6XzTS4rvLU6XmOsM9zq1+Sxz h5rlV/Npoyz1fwIMYXV1rtKFnn0U3QoTEIWokIkwmuVhfU3i+mnYRuAH5A7hqvJfy6NJwm XA6oR8J1ate1syDHryrteusV3vogaCvt2m5qLV9RnjH6c58OuoKXPV17k6Fzs5pU+VW3WV qryzKTEeXJKimnOUCInmKoc2Q43rlpHxda2lrtrWLNdV3/nAEOD/cxHCL/JAnWG6ilxTmZ x4Pq1AWRCSms+PNsK/4CiIAS4BUI7OZZeFrSNLhWFy1NA5K5lDx+z0B158mlKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699911291; 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=iUBY5PJF0Frpqq1uqrHegvn5EMyo+dySAit2diD0i7U=; b=N9aISyV3S8WnaoYvlP3rK0XSTMK5l6jXByo1OzrUUkiMZbbU/dVAI9J65x8/93KXVpdUfw ysJ0Q7lq4TOGzqH9njhspwwYhpOap5dP/GlJ8E3j9DRqL5cVyERa6AjAn1U6KQm0exA0Ft B6cHBr4T4RUGrS20EUOprMUAqPKYuuaAVSXj+opfzemGJ+Y8roeMCnGTGrJ1ELAwRqxJtk 8BTvKN38klFbX1xF9axIbdM79uGVNmbrFDXgG73kRBycy6uy4Ea4tPeiB40rmCky2LoFUU syS0v/K6nPsQUO4hdDrJRHGw3jLWONNLBF+XOvk+RCmuvv4CiJLsmWL3nQRKUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699911291; a=rsa-sha256; cv=none; b=WLycBJTIdRX2ws5g1ZT4hE2T4XhdtOOzOobJ7cJwsCusACRgsMS87uCYWZvdlxfMM3eW86 tXqTEEd/FssccQRDo3s1QQrDCfJ4eExhmVfUYRATqBQirtN4rvRXbmgI03Y9hbtA02f7u/ E/7eh7u0S8yPf+DLRebJRLDevg+ZVMmrm8DT7usq7W474UW3cDzDgbcrbRaEjpG6w2aNQ4 WPwezOOw44bVr+lYKw52Hj9I8IcPIWfUucw7Ezd1K6lrvJQF422rTNtbPe/0V37I2kQS1o bkNFlMIECSKLJZB8w/7O0NUAl5ODJDnHVNijU8+uMAAAC2DoN5bMFObsZXw/LA== 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 4STjPl17WDz6Mf; Mon, 13 Nov 2023 21:34:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ADLYpMh078257; Mon, 13 Nov 2023 21:34:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ADLYpAE078254; Mon, 13 Nov 2023 21:34:51 GMT (envelope-from git) Date: Mon, 13 Nov 2023 21:34:51 GMT Message-Id: <202311132134.3ADLYpAE078254@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: ec4c2adb5067 - main - Retire LLD_IS_LD option 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec4c2adb5067f7458e71c4098e716ee93508e96c Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=ec4c2adb5067f7458e71c4098e716ee93508e96c commit ec4c2adb5067f7458e71c4098e716ee93508e96c Author: Brooks Davis AuthorDate: 2023-11-13 21:34:14 +0000 Commit: Brooks Davis CommitDate: 2023-11-13 21:34:14 +0000 Retire LLD_IS_LD option The option was added to parallel the CLANG_IS_CC which was removed in commit 20a66ab4bf8511e51e11321b775d36c92e77fa69. Reviewed by: imp, dim, emaste Differential Revision: https://reviews.freebsd.org/D42575 --- UPDATING | 4 ++++ share/man/man5/src.conf.5 | 9 +-------- share/mk/src.opts.mk | 1 - tools/build/mk/OptionalObsoleteFiles.inc | 5 ----- tools/build/options/WITHOUT_LLD_IS_LD | 6 ------ tools/build/options/WITH_LLD_IS_LD | 1 - usr.bin/clang/lld/Makefile | 2 +- 7 files changed, 6 insertions(+), 22 deletions(-) diff --git a/UPDATING b/UPDATING index 1ee0731742b3..763f8f29a4f0 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 15.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20231113: + The WITHOUT_LLD_IS_LD option has been removed. When LLD is enabled + it is always installed as /usr/bin/ld. + 20231027: Forward compatibility (running the new code on old kernels) for the "ino64" project have been removed. The need for it has passed long ago. diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 67a906e964b2..e6affc81ab9c 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,5 +1,5 @@ .\" DO NOT EDIT-- this file is @generated by tools/build/options/makeman. -.Dd October 29, 2023 +.Dd November 13, 2023 .Dt SRC.CONF 5 .Os .Sh NAME @@ -902,13 +902,6 @@ amd64/amd64, arm64/aarch64, i386/i386, powerpc/powerpc, powerpc/powerpc64 and po Do not build the LLD linker during the bootstrap phase of the build. To be able to build the system an alternate linker must be provided via XLD. -.It Va WITHOUT_LLD_IS_LD -Do not install a -.Pa /usr/bin/ld symlink -to -.Pa ld.lld . -The system will not have a usable tool chain unless a linker is provided -some other way. .It Va WITHOUT_LLVM_ASSERTIONS Disable debugging assertions in LLVM. .It Va WITH_LLVM_BINUTILS diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index ecb944262955..cf7f3f7dffa7 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -124,7 +124,6 @@ __DEFAULT_YES_OPTIONS = \ LEGACY_CONSOLE \ LLD \ LLD_BOOTSTRAP \ - LLD_IS_LD \ LLVM_ASSERTIONS \ LLVM_COV \ LLVM_CXXFILT \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index f4eb36f50df1..5335e5ea4ffc 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -162,11 +162,6 @@ OLD_FILES+=usr/share/man/man8/bhyveload.8.gz OLD_DIRS+=usr/share/examples/bhyve .endif -.if ${MK_LLD_IS_LD} == no -OLD_FILES+=usr/bin/ld -OLD_FILES+=usr/share/man/man1/ld.1.gz -.endif - .if ${MK_BLACKLIST} == no OLD_FILES+=etc/blacklistd.conf OLD_FILES+=etc/rc.d/blacklistd diff --git a/tools/build/options/WITHOUT_LLD_IS_LD b/tools/build/options/WITHOUT_LLD_IS_LD deleted file mode 100644 index 8fca09cf94b8..000000000000 --- a/tools/build/options/WITHOUT_LLD_IS_LD +++ /dev/null @@ -1,6 +0,0 @@ -Do not install a -.Pa /usr/bin/ld symlink -to -.Pa ld.lld . -The system will not have a usable tool chain unless a linker is provided -some other way. diff --git a/tools/build/options/WITH_LLD_IS_LD b/tools/build/options/WITH_LLD_IS_LD deleted file mode 100644 index fd6bfc684d1a..000000000000 --- a/tools/build/options/WITH_LLD_IS_LD +++ /dev/null @@ -1 +0,0 @@ -Use LLVM's LLD as the system linker. diff --git a/usr.bin/clang/lld/Makefile b/usr.bin/clang/lld/Makefile index ec0c10e17441..86f6b6f76ee8 100644 --- a/usr.bin/clang/lld/Makefile +++ b/usr.bin/clang/lld/Makefile @@ -9,7 +9,7 @@ PACKAGE= lld PROG_CXX= ld.lld # Man page directory .PATH: ${LLD_SRCS}/docs -.if (!defined(TOOLS_PREFIX) && ${MK_LLD_IS_LD} != "no") || \ +.if !defined(TOOLS_PREFIX) || \ (defined(TOOLS_PREFIX) && ${MK_LLD_BOOTSTRAP} != "no") SYMLINKS= ${PROG_CXX} ${BINDIR}/ld MLINKS= ld.lld.1 ld.1