git: fb173fc89e9c - main - Combine and sort MK_LLVM_COV

The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/src/commit/?id=fb173fc89e9c6908426bf60b1a449f1ff19d51df

commit fb173fc89e9c6908426bf60b1a449f1ff19d51df
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2023-11-09 01:00:36 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2023-11-14 16:49:55 +0000

    Combine and sort MK_LLVM_COV
    
    These used to be grouped with MK_GCOV option or the like.
    
    Reviewed by:    emaste, imp, netchild
    Pull Request:   https://github.com/freebsd/freebsd-src/pull/896
---
 tools/build/mk/OptionalObsoleteFiles.inc | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 87184f021890..99e6ea1c8be3 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -1985,18 +1985,6 @@ OLD_FILES+=usr/share/man/man8/strfile.8.gz
 OLD_FILES+=usr/share/man/man8/unstr.8.gz
 .endif
 
-.if ${MK_LLVM_COV} == no
-OLD_FILES+=usr/bin/gcov
-OLD_FILES+=usr/share/man/man1/gcov.1.gz
-.endif
-
-.if ${MK_LLVM_COV} == no
-OLD_FILES+=usr/bin/llvm-cov
-OLD_FILES+=usr/bin/llvm-profdata
-OLD_FILES+=usr/share/man/man1/llvm-cov.1.gz
-OLD_FILES+=usr/share/man/man1/llvm-profdata.1.gz
-.endif
-
 .if ${MK_GH_BC} == no
 OLD_FILES+=usr/share/misc/bc.library
 OLD_FILES+=usr/tests/usr.bin/dc/Kyuafile
@@ -3620,6 +3608,15 @@ OLD_FILES+=usr/share/man/man1/lldb-server.1.gz
 OLD_FILES+=usr/share/man/man1/lldb.1.gz
 .endif
 
+.if ${MK_LLVM_COV} == no
+OLD_FILES+=usr/bin/gcov
+OLD_FILES+=usr/bin/llvm-cov
+OLD_FILES+=usr/bin/llvm-profdata
+OLD_FILES+=usr/share/man/man1/gcov.1.gz
+OLD_FILES+=usr/share/man/man1/llvm-cov.1.gz
+OLD_FILES+=usr/share/man/man1/llvm-profdata.1.gz
+.endif
+
 .if ${MK_LOCALES} == no
 OLD_DIRS+=usr/share/locale/af_ZA.ISO8859-15
 OLD_FILES+=usr/share/locale/af_ZA.ISO8859-15/LC_COLLATE