From nobody Sun Dec 5 20:57:56 2021 X-Original-To: dev-commits-src-branches@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 4E49718BE9E2; Sun, 5 Dec 2021 20:57:57 +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 4J6f5w5Wc6z3G31; Sun, 5 Dec 2021 20:57:56 +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 9398D1F00F; Sun, 5 Dec 2021 20:57:56 +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 1B5KvuJQ003998; Sun, 5 Dec 2021 20:57:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B5Kvu2P003997; Sun, 5 Dec 2021 20:57:56 GMT (envelope-from git) Date: Sun, 5 Dec 2021 20:57:56 GMT Message-Id: <202112052057.1B5Kvu2P003997@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 5b356e6395c1 - stable/13 - Update OptionalObsoleteFiles.inc after 021385aba562 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5b356e6395c144f1c6fbcf1cd15506d00133ed71 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638737876; 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=q+MoDPFtn1hVb8x+OOYKCF5qjszv6BHmmXAUWdyMchY=; b=nphIZGqR+6bGS36E8d6LC/L+yoNc2zAmZdYeyYHHV9nICC6pTobZ2JTkAVHpYsj2J7yc/w 6OAEjY1w1D8nGl+8Ezij6zoyFXT9mM/T/McPVJyWlFFVqm5Hwul+cap5QAwm3s/XYJKJNK H0pT+Wiksd1gcaR0iKWIYygHuI9sh+xJYQSblAAn9icn1o9leYOOM/8ra/6b5bt9pNIYMf 7zcznnnHf9N7Psxkw6veDnMQSoyGH8ORKCPz/KU/EthEHjr813mrYYxIl90y6EqVZB7yMr Td1RiQEvj3UKNjQFfHx2twHKOTc1onO8lQKMcj4tnHCnYx/2re6Y1b3RVNVsEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638737876; a=rsa-sha256; cv=none; b=GSZkGKGU5VgCxpPnAoLUodZowFyOlmQ8+arjkmJho/JLD+G+OV4uMof8xNRQHvlZP4z2FX w8PwYl5BgDlDtE9q1uGmxhJQwjkAtU8pqLK7fcoxu8lHlNU/kL1h4qnkrQfd0AbrrCm+b7 I0Jk1tf3gTxMUt25XFpakCazAoXd9nVPaTKX71BhVbjBu+tFvyN0IzJHCd2jN4UYxOQpAW KEjJb3YnMgdYJz1kPhXrOgjEptFCjivc1fkn9iMHhUBb9Lruf8068GyrJujAyKIJhwKCYl pjhfYBET70te3ykAT1wi/DW3dGUN7aJYelBQTgoaPnkCWaWbhGkOKHZJk5AQvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=5b356e6395c144f1c6fbcf1cd15506d00133ed71 commit 5b356e6395c144f1c6fbcf1cd15506d00133ed71 Author: Alex Richardson AuthorDate: 2021-10-11 10:46:30 +0000 Commit: Dimitry Andric CommitDate: 2021-12-05 20:56:38 +0000 Update OptionalObsoleteFiles.inc after 021385aba562 I forgot to update this file so make delete-old would incorrectly remove the newly-installed LLVM binutils. While touching the file also update for 8e1c989abbd1 since ObsoleteFiles.inc now inludes the tablegen binaries. Reported by: Herbert J. Skuhra Reviewed By: emaste, imp Differential Revision: https://reviews.freebsd.org/D32022 (cherry picked from commit 88c027338f182e2af56d0dbabd4a94fbca6f091a) --- ObsoleteFiles.inc | 1 + tools/build/mk/OptionalObsoleteFiles.inc | 36 ++++++++++++++++---------------- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 18d49ad09c3a..4a4c5cc58b99 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -40,6 +40,7 @@ OLD_FILES+=usr/bin/llvm-tblgen OLD_FILES+=usr/bin/clang-tblgen OLD_FILES+=usr/bin/lldb-tblgen +OLD_FILES+=usr/share/man/man1/llvm-tblgen.1.gz # 20211115: vm_page busy functions removed OLD_FILES+=share/man/man9/vm_page_sbusy.9.gz diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 3379e7e70ec8..ea42479a2d69 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1221,18 +1221,30 @@ OLD_FILES+=usr/share/man/man8/zfsloader.8.gz OLD_FILES+=usr/share/man/man8/zpool.8.gz .endif -.if ${MK_CLANG} == no -OLD_FILES+=usr/bin/clang -OLD_FILES+=usr/bin/clang++ -OLD_FILES+=usr/bin/clang-cpp -OLD_FILES+=usr/bin/clang-tblgen +.if ${MK_CLANG} == no && ${MK_LLVM_BINUTILS} == no OLD_FILES+=usr/bin/llvm-addr2line OLD_FILES+=usr/bin/llvm-ar OLD_FILES+=usr/bin/llvm-nm +OLD_FILES+=usr/bin/llvm-objcopy OLD_FILES+=usr/bin/llvm-objdump OLD_FILES+=usr/bin/llvm-ranlib +OLD_FILES+=usr/bin/llvm-size +OLD_FILES+=usr/bin/llvm-strings OLD_FILES+=usr/bin/llvm-symbolizer -OLD_FILES+=usr/bin/llvm-tblgen +OLD_FILES+=usr/share/man/man1/llvm-addr2line.1.gz +OLD_FILES+=usr/share/man/man1/llvm-ar.1.gz +OLD_FILES+=usr/share/man/man1/llvm-nm.1.gz +OLD_FILES+=usr/share/man/man1/llvm-objcopy.1.gz +OLD_FILES+=usr/share/man/man1/llvm-ranlib.1.gz +OLD_FILES+=usr/share/man/man1/llvm-size.1.gz +OLD_FILES+=usr/share/man/man1/llvm-strings.1.gz +OLD_FILES+=usr/share/man/man1/llvm-symbolizer.1.gz +.endif + +.if ${MK_CLANG} == no +OLD_FILES+=usr/bin/clang +OLD_FILES+=usr/bin/clang++ +OLD_FILES+=usr/bin/clang-cpp OLD_FILES+=usr/lib/clang/12.0.1/include/cuda_wrappers/algorithm OLD_FILES+=usr/lib/clang/12.0.1/include/cuda_wrappers/complex OLD_FILES+=usr/lib/clang/12.0.1/include/cuda_wrappers/new @@ -1531,12 +1543,6 @@ OLD_DIRS+=usr/share/doc/llvm OLD_FILES+=usr/share/man/man1/clang.1.gz OLD_FILES+=usr/share/man/man1/clang++.1.gz OLD_FILES+=usr/share/man/man1/clang-cpp.1.gz -OLD_FILES+=usr/share/man/man1/llvm-addr2line.1.gz -OLD_FILES+=usr/share/man/man1/llvm-ar.1.gz -OLD_FILES+=usr/share/man/man1/llvm-nm.1.gz -OLD_FILES+=usr/share/man/man1/llvm-ranlib.1.gz -OLD_FILES+=usr/share/man/man1/llvm-symbolizer.1.gz -OLD_FILES+=usr/share/man/man1/llvm-tblgen.1.gz .endif .if ${MK_CLANG_EXTRAS} == no @@ -1557,11 +1563,8 @@ OLD_FILES+=usr/bin/llvm-lto2 OLD_FILES+=usr/bin/llvm-mc OLD_FILES+=usr/bin/llvm-mca OLD_FILES+=usr/bin/llvm-modextract -OLD_FILES+=usr/bin/llvm-objcopy OLD_FILES+=usr/bin/llvm-pdbutil OLD_FILES+=usr/bin/llvm-rtdyld -OLD_FILES+=usr/bin/llvm-size -OLD_FILES+=usr/bin/llvm-strings OLD_FILES+=usr/bin/llvm-xray OLD_FILES+=usr/bin/opt OLD_FILES+=usr/share/man/man1/bugpoint.1.gz @@ -1574,10 +1577,7 @@ OLD_FILES+=usr/share/man/man1/llvm-dis.1.gz OLD_FILES+=usr/share/man/man1/llvm-dwarfdump.1 OLD_FILES+=usr/share/man/man1/llvm-extract.1.gz OLD_FILES+=usr/share/man/man1/llvm-link.1.gz -OLD_FILES+=usr/share/man/man1/llvm-objcopy.1.gz OLD_FILES+=usr/share/man/man1/llvm-pdbutil.1.gz -OLD_FILES+=usr/share/man/man1/llvm-size.1.gz -OLD_FILES+=usr/share/man/man1/llvm-strings.1.gz OLD_FILES+=usr/share/man/man1/opt.1.gz .endif