aboutsummaryrefslogtreecommitdiff
path: root/tools/build
diff options
context:
space:
mode:
Diffstat (limited to 'tools/build')
-rw-r--r--tools/build/Makefile35
-rwxr-xr-xtools/build/beinstall.sh2
-rwxr-xr-xtools/build/checkstyle9.pl2748
-rw-r--r--tools/build/cross-build/include/common/sys/types.h4
-rw-r--r--tools/build/cross-build/include/linux/strings.h40
-rw-r--r--tools/build/cross-build/include/linux/unistd.h10
-rw-r--r--tools/build/cross-build/include/mac/stdlib.h1
-rw-r--r--tools/build/cross-build/secure_getenv.c16
-rwxr-xr-xtools/build/depend-cleanup.sh31
-rwxr-xr-xtools/build/make.py16
-rw-r--r--tools/build/mk/Makefile.boot6
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc1387
-rw-r--r--tools/build/options/WITHOUT_ATM3
-rw-r--r--tools/build/options/WITHOUT_CLANG_IS_CC6
-rw-r--r--tools/build/options/WITHOUT_CXX4
-rw-r--r--tools/build/options/WITHOUT_DTRACE2
-rw-r--r--tools/build/options/WITHOUT_KERBEROS_SUPPORT3
-rw-r--r--tools/build/options/WITHOUT_MACHDEP_OPTIMIZATIONS1
-rw-r--r--tools/build/options/WITHOUT_NETLINK4
-rw-r--r--tools/build/options/WITHOUT_NETLINK_SUPPORT5
-rw-r--r--tools/build/options/WITHOUT_OFED5
-rw-r--r--tools/build/options/WITHOUT_PORTSNAP4
-rw-r--r--tools/build/options/WITHOUT_SCTP_SUPPORT4
-rw-r--r--tools/build/options/WITHOUT_TOOLCHAIN2
-rw-r--r--tools/build/options/WITH_CLANG_IS_CC6
-rw-r--r--tools/build/options/WITH_DIRDEPS_BUILD9
-rw-r--r--tools/build/options/WITH_DISK_IMAGE_TOOLS_BOOTSTRAP6
-rw-r--r--tools/build/options/WITH_LIB323
-rw-r--r--tools/build/options/WITH_LLVM_BINUTILS19
-rw-r--r--tools/build/options/WITH_LOADER_FIREWIRE3
-rw-r--r--tools/build/options/WITH_LOADER_VERIEXEC_VECTX7
-rw-r--r--tools/build/options/WITH_META_ERROR_TARGET14
-rw-r--r--tools/build/options/WITH_NETLINK4
-rw-r--r--tools/build/options/WITH_NETLINK_SUPPORT5
-rw-r--r--tools/build/options/WITH_OFED3
-rw-r--r--tools/build/options/WITH_TOOLCHAIN2
-rw-r--r--tools/build/options/WITH_ZFS3
-rwxr-xr-xtools/build/options/makeman16
38 files changed, 3409 insertions, 1030 deletions
diff --git a/tools/build/Makefile b/tools/build/Makefile
index 00f5e3e45337..eb5bd44db6a1 100644
--- a/tools/build/Makefile
+++ b/tools/build/Makefile
@@ -68,13 +68,17 @@ INCS+= stdlib.h
SRCS+= reallocarray.c
.endif
+.if exists(${HOST_INCLUDE_ROOT}/sys/stat.h)
_WITH_UTIMENS!= grep -c utimensat ${HOST_INCLUDE_ROOT}/sys/stat.h || true
+.else
+_WITH_UTIMENS= 0
+.endif
.if ${_WITH_UTIMENS} == 0
SYSINCS+= stat.h
SRCS+= futimens.c utimensat.c
.endif
-_WITH_EXPLICIT_BZERO!= grep -c explicit_bzero ${HOST_INCLUDE_ROOT}/strings.h || true
+_WITH_EXPLICIT_BZERO!= cat ${HOST_INCLUDE_ROOT}/strings.h ${HOST_INCLUDE_ROOT}/string.h | grep -c explicit_bzero || true
.if ${_WITH_EXPLICIT_BZERO} == 0
# .PATH: ${SRCTOP}/sys/libkern
# Adding sys/libkern to .PATH breaks building the cross-build compat library
@@ -121,7 +125,11 @@ CHACHA20INCSDIR= ${INCLUDEDIR}/crypto/chacha20
CHACHA20INCS+= ${SRCTOP}/sys/crypto/chacha20/_chacha.h \
${SRCTOP}/sys/crypto/chacha20/chacha.h
+.if ${MACHINE} == "host"
+_host_arch= ${_HOST_ARCH}
+.else
_host_arch=${MACHINE}
+.endif
.if ${_host_arch} == "x86_64"
# bmake on Linux/mac often prints that instead of amd64
_host_arch=amd64
@@ -150,9 +158,18 @@ INCS+= ${SRCTOP}/include/nlist.h
SYSINCS+= ${SRCTOP}/sys/sys/imgact_aout.h
SYSINCS+= ${SRCTOP}/sys/sys/nlist_aout.h
+# macOS's bitstring lacks FreeBSD-specific additions used by makefs's ZFS code
+# and Linux doesn't have it at all. Older FreeBSD versions lack recent
+# additions.
+INCS+= ${SRCTOP}/include/bitstring.h
+SYSINCS+= ${SRCTOP}/sys/sys/bitstring.h
.if ${.MAKE.OS} != "FreeBSD"
.PATH: ${.CURDIR}/cross-build
+
+# Needed by our sys/types.h wrapper
+SYSINCS+= ${SRCTOP}/sys/sys/bitcount.h
+
# dbopen() behaves differently on Linux and FreeBSD so we ensure that we
# bootstrap the FreeBSD db code. The cross-build headers #define dbopen() to
# __freebsd_dbopen() so that we don't ever use the host version
@@ -181,6 +198,8 @@ SRCS+= rpmatch.c
# On Linux, glibc does not provide strlcpy,strlcat or strmode.
.PATH: ${LIBC_SRCTOP}/string
SRCS+= strlcpy.c strlcat.c strmode.c
+# On Linux, glibc provides ffs* but not fls*
+SRCS+= fls.c flsl.c flsll.c
# Compile the fgetln/fgetwln/closefrom fallback code from libbsd:
SRCS+= fgetln_fallback.c fgetwln_fallback.c closefrom.c
CFLAGS.closefrom.c+= -DSTDC_HEADERS -DHAVE_SYS_DIR_H -DHAVE_DIRENT_H \
@@ -189,7 +208,14 @@ CFLAGS.closefrom.c+= -DSTDC_HEADERS -DHAVE_SYS_DIR_H -DHAVE_DIRENT_H \
SRCS+= progname.c
# Stub implementations of fflagstostr/strtofflags
SRCS+= fflags.c
-.endif
+
+.endif # ${MAKE.OS} == "Linux"
+
+.if ${.MAKE.OS} == "Darwin"
+# Standalone implementation of secure_getenv(), not available on MacOS.
+SRCS+= secure_getenv.c
+.endif # ${MAKE.OS} == "Darwin"
+
# Provide the same arc4random implementation on Linux/macOS
CFLAGS.arc4random.c+= -I${SRCTOP}/sys/crypto/chacha20 -D__isthreaded=1
SRCS+= arc4random.c arc4random_uniform.c
@@ -212,7 +238,7 @@ subr_capability.c: ${SRCTOP}/sys/kern/subr_capability.c
cp ${.ALLSRC} ${.TARGET}
SRCS+= subr_capability.c
CLEANFILES+= subr_capability.c
-.endif
+.endif # ${MAKE.OS} != "FreeBSD"
CASPERINC+= ${SRCTOP}/lib/libcasper/services/cap_fileargs/cap_fileargs.h
CASPERINC+= ${SRCTOP}/lib/libcasper/services/cap_net/cap_net.h
@@ -240,7 +266,7 @@ DISKINCS+= ${SRCTOP}/sys/sys/disk/bsd.h
# Needed to build config (since it uses libnv)
SYSINCS+= ${SRCTOP}/sys/sys/nv.h ${SRCTOP}/sys/sys/cnv.h \
- ${SRCTOP}/sys/sys/dnv.h
+ ${SRCTOP}/sys/sys/dnv.h ${SRCTOP}/sys/sys/nv_namespace.h
# Needed when bootstrapping ldd (since it uses DF_1_PIE)
SYSINCS+= ${SRCTOP}/sys/sys/elf32.h
@@ -339,7 +365,6 @@ host-symlinks:
# yet (this happens if we are crossbuilding from Linux/Mac).
INSTALLDIR_LIST= \
bin \
- lib/casper \
lib/geom \
usr/include/casper \
usr/include/private/ucl \
diff --git a/tools/build/beinstall.sh b/tools/build/beinstall.sh
index 46c65d87e61a..dfb3c4d64083 100755
--- a/tools/build/beinstall.sh
+++ b/tools/build/beinstall.sh
@@ -181,7 +181,7 @@ MERGEMASTER_CMD="${srcdir}/usr.sbin/mergemaster/mergemaster.sh"
# May be a worktree, in which case .git is a file, not a directory.
if [ -e .git ] ; then
- commit_time=$(git show --format='%ct' 2>/dev/null | head -1)
+ commit_time=$(git show -s --format='%ct' 2>/dev/null)
[ $? -ne 0 ] && errx "Can't lookup git commit timestamp"
commit_ts=$(date -r ${commit_time} '+%Y%m%d.%H%M%S')
elif [ -d .svn ] ; then
diff --git a/tools/build/checkstyle9.pl b/tools/build/checkstyle9.pl
new file mode 100755
index 000000000000..5aec3819bf7c
--- /dev/null
+++ b/tools/build/checkstyle9.pl
@@ -0,0 +1,2748 @@
+#!/usr/bin/env perl
+# (c) 2001, Dave Jones. (the file handling bit)
+# (c) 2005, Joel Schopp <jschopp@austin.ibm.com> (the ugly bit)
+# (c) 2007,2008, Andy Whitcroft <apw@uk.ibm.com> (new conditions, test suite)
+# (c) 2008-2010 Andy Whitcroft <apw@canonical.com>
+# Licensed under the terms of the GNU GPL License version 2
+
+use strict;
+use warnings;
+use Term::ANSIColor qw(:constants);
+
+my $P = $0;
+$P =~ s@.*/@@g;
+
+our $SrcFile = qr{\.(?:h|c|cpp|s|S|pl|py|sh)$};
+
+my $V = '0.31';
+
+use Getopt::Long qw(:config no_auto_abbrev);
+
+my $quiet = 0;
+my $tree = 1;
+my $chk_signoff = 1;
+my $chk_patch = undef;
+my $chk_branch = undef;
+my $tst_only;
+my $emacs = 0;
+my $terse = 0;
+my $file = undef;
+my $color = "auto";
+my $no_warnings = 0;
+my $summary = 1;
+my $mailback = 0;
+my $summary_file = 0;
+my $root;
+my %debug;
+my $help = 0;
+
+sub help {
+ my ($exitcode) = @_;
+
+ print << "EOM";
+Usage:
+
+ $P [OPTION]... [FILE]...
+ $P [OPTION]... [GIT-REV-LIST]
+
+Version: $V
+
+Options:
+ -q, --quiet quiet
+ --patch treat FILE as patchfile
+ --branch treat args as GIT revision list
+ --emacs emacs compile window format
+ --terse one line per report
+ -f, --file treat FILE as regular source file
+ --strict fail if only warnings are found
+ --no-summary suppress the per-file summary
+ --mailback only produce a report in case of warnings/errors
+ --summary-file include the filename in summary
+ --debug KEY=[0|1] turn on/off debugging of KEY, where KEY is one of
+ 'values', 'possible', 'type', and 'attr' (default
+ is all off)
+ --test-only=WORD report only warnings/errors containing WORD
+ literally
+ --color[=WHEN] Use colors 'always', 'never', or only when output
+ is a terminal ('auto'). Default is 'auto'.
+ -h, --help, --version display this help and exit
+
+When FILE is - read standard input.
+EOM
+
+ exit($exitcode);
+}
+
+# Use at your own risk
+print "\n", MAGENTA, "WARNING:", RESET, " This code is highly experimental ... likely isn't a great style(9) match yet\n\n";
+
+# Perl's Getopt::Long allows options to take optional arguments after a space.
+# Prevent --color by itself from consuming other arguments
+foreach (@ARGV) {
+ if ($_ eq "--color" || $_ eq "-color") {
+ $_ = "--color=$color";
+ }
+}
+
+GetOptions(
+ 'q|quiet+' => \$quiet,
+ 'tree!' => \$tree,
+ 'signoff!' => \$chk_signoff,
+ 'patch!' => \$chk_patch,
+ 'branch!' => \$chk_branch,
+ 'emacs!' => \$emacs,
+ 'terse!' => \$terse,
+ 'f|file!' => \$file,
+ 'strict!' => \$no_warnings,
+ 'root=s' => \$root,
+ 'summary!' => \$summary,
+ 'mailback!' => \$mailback,
+ 'summary-file!' => \$summary_file,
+
+ 'debug=s' => \%debug,
+ 'test-only=s' => \$tst_only,
+ 'color=s' => \$color,
+ 'no-color' => sub { $color = 'never'; },
+ 'h|help' => \$help,
+ 'version' => \$help
+) or help(1);
+
+help(0) if ($help);
+
+my $exit = 0;
+
+if ($#ARGV < 0) {
+ print "$P: no input files\n";
+ exit(1);
+}
+
+if (!defined $chk_branch && !defined $chk_patch && !defined $file) {
+ $chk_branch = $ARGV[0] =~ /.\.\./ ? 1 : 0;
+ $file = $ARGV[0] =~ /$SrcFile/ ? 1 : 0;
+ $chk_patch = $chk_branch || $file ? 0 : 1;
+} elsif (!defined $chk_branch && !defined $chk_patch) {
+ if ($file) {
+ $chk_branch = $chk_patch = 0;
+ } else {
+ $chk_branch = $ARGV[0] =~ /.\.\./ ? 1 : 0;
+ $chk_patch = $chk_branch ? 0 : 1;
+ }
+} elsif (!defined $chk_branch && !defined $file) {
+ if ($chk_patch) {
+ $chk_branch = $file = 0;
+ } else {
+ $chk_branch = $ARGV[0] =~ /.\.\./ ? 1 : 0;
+ $file = $chk_branch ? 0 : 1;
+ }
+} elsif (!defined $chk_patch && !defined $file) {
+ if ($chk_branch) {
+ $chk_patch = $file = 0;
+ } else {
+ $file = $ARGV[0] =~ /$SrcFile/ ? 1 : 0;
+ $chk_patch = $file ? 0 : 1;
+ }
+} elsif (!defined $chk_branch) {
+ $chk_branch = $chk_patch || $file ? 0 : 1;
+} elsif (!defined $chk_patch) {
+ $chk_patch = $chk_branch || $file ? 0 : 1;
+} elsif (!defined $file) {
+ $file = $chk_patch || $chk_branch ? 0 : 1;
+}
+
+if (($chk_patch && $chk_branch) ||
+ ($chk_patch && $file) ||
+ ($chk_branch && $file)) {
+ die "Only one of --file, --branch, --patch is permitted\n";
+}
+if (!$chk_patch && !$chk_branch && !$file) {
+ die "One of --file, --branch, --patch is required\n";
+}
+
+if ($color =~ /^always$/i) {
+ $color = 1;
+} elsif ($color =~ /^never$/i) {
+ $color = 0;
+} elsif ($color =~ /^auto$/i) {
+ $color = (-t STDOUT);
+} else {
+ die "Invalid color mode: $color\n";
+}
+
+my $dbg_values = 0;
+my $dbg_possible = 0;
+my $dbg_type = 0;
+my $dbg_attr = 0;
+my $dbg_adv_dcs = 0;
+my $dbg_adv_checking = 0;
+my $dbg_adv_apw = 0;
+for my $key (keys %debug) {
+ ## no critic
+ eval "\${dbg_$key} = '$debug{$key}';";
+ die "$@" if ($@);
+}
+
+my $rpt_cleaners = 0;
+
+if ($terse) {
+ $emacs = 1;
+ $quiet++;
+}
+
+my $emitted_corrupt = 0;
+
+our $Ident = qr{
+ [A-Za-z_][A-Za-z\d_]*
+ (?:\s*\#\#\s*[A-Za-z_][A-Za-z\d_]*)*
+ }x;
+our $Storage = qr{extern|static|asmlinkage};
+our $Sparse = qr{
+ __force
+ }x;
+
+# Notes to $Attribute:
+our $Attribute = qr{
+ const|
+ volatile|
+ QEMU_NORETURN|
+ QEMU_WARN_UNUSED_RESULT|
+ QEMU_SENTINEL|
+ QEMU_PACKED|
+ GCC_FMT_ATTR
+ }x;
+our $Modifier;
+our $Inline = qr{inline};
+our $Member = qr{->$Ident|\.$Ident|\[[^]]*\]};
+our $Lval = qr{$Ident(?:$Member)*};
+
+our $Constant = qr{(?:[0-9]+|0x[0-9a-fA-F]+)[UL]*};
+our $Assignment = qr{(?:\*\=|/=|%=|\+=|-=|<<=|>>=|&=|\^=|\|=|=)};
+our $Compare = qr{<=|>=|==|!=|<|>};
+our $Operators = qr{
+ <=|>=|==|!=|
+ =>|->|<<|>>|<|>|!|~|
+ &&|\|\||,|\^|\+\+|--|&|\||\+|-|\*|\/|%
+ }x;
+
+our $NonptrType;
+our $Type;
+our $Declare;
+
+our $NON_ASCII_UTF8 = qr{
+ [\xC2-\xDF][\x80-\xBF] # non-overlong 2-byte
+ | \xE0[\xA0-\xBF][\x80-\xBF] # excluding overlongs
+ | [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2} # straight 3-byte
+ | \xED[\x80-\x9F][\x80-\xBF] # excluding surrogates
+ | \xF0[\x90-\xBF][\x80-\xBF]{2} # planes 1-3
+ | [\xF1-\xF3][\x80-\xBF]{3} # planes 4-15
+ | \xF4[\x80-\x8F][\x80-\xBF]{2} # plane 16
+}x;
+
+our $UTF8 = qr{
+ [\x09\x0A\x0D\x20-\x7E] # ASCII
+ | $NON_ASCII_UTF8
+}x;
+
+# some readers default to ISO-8859-1 when showing email source. detect
+# when UTF-8 is incorrectly interpreted as ISO-8859-1 and reencoded back.
+# False positives are possible but very unlikely.
+our $UTF8_MOJIBAKE = qr{
+ \xC3[\x82-\x9F] \xC2[\x80-\xBF] # c2-df 80-bf
+ | \xC3\xA0 \xC2[\xA0-\xBF] \xC2[\x80-\xBF] # e0 a0-bf 80-bf
+ | \xC3[\xA1-\xAC\xAE\xAF] (?: \xC2[\x80-\xBF]){2} # e1-ec/ee/ef 80-bf 80-bf
+ | \xC3\xAD \xC2[\x80-\x9F] \xC2[\x80-\xBF] # ed 80-9f 80-bf
+ | \xC3\xB0 \xC2[\x90-\xBF] (?: \xC2[\x80-\xBF]){2} # f0 90-bf 80-bf 80-bf
+ | \xC3[\xB1-\xB3] (?: \xC2[\x80-\xBF]){3} # f1-f3 80-bf 80-bf 80-bf
+ | \xC3\xB4 \xC2[\x80-\x8F] (?: \xC2[\x80-\xBF]){2} # f4 80-b8 80-bf 80-bf
+}x;
+
+# There are still some false positives, but this catches most
+# common cases.
+our $typeTypedefs = qr{(?x:
+ (?![KMGTPE]iB) # IEC binary prefix (do not match)
+ [A-Z][A-Z\d_]*[a-z][A-Za-z\d_]* # camelcase
+ | [A-Z][A-Z\d_]*AIOCB # all uppercase
+ | [A-Z][A-Z\d_]*CPU # all uppercase
+ | QEMUBH # all uppercase
+)};
+
+our @typeList = (
+ qr{void},
+ qr{(?:unsigned\s+)?char},
+ qr{(?:unsigned\s+)?short},
+ qr{(?:unsigned\s+)?int},
+ qr{(?:unsigned\s+)?long},
+ qr{(?:unsigned\s+)?long\s+int},
+ qr{(?:unsigned\s+)?long\s+long},
+ qr{(?:unsigned\s+)?long\s+long\s+int},
+ qr{unsigned},
+ qr{float},
+ qr{double},
+ qr{bool},
+ qr{struct\s+$Ident},
+ qr{union\s+$Ident},
+ qr{enum\s+$Ident},
+ qr{${Ident}_t},
+ qr{${Ident}_handler},
+ qr{${Ident}_handler_fn},
+ qr{target_(?:u)?long},
+ qr{hwaddr},
+);
+
+# This can be modified by sub possible. Since it can be empty, be careful
+# about regexes that always match, because they can cause infinite loops.
+our @modifierList = (
+);
+
+sub build_types {
+ my $all = "(?x: \n" . join("|\n ", @typeList) . "\n)";
+ if (@modifierList > 0) {
+ my $mods = "(?x: \n" . join("|\n ", @modifierList) . "\n)";
+ $Modifier = qr{(?:$Attribute|$Sparse|$mods)};
+ } else {
+ $Modifier = qr{(?:$Attribute|$Sparse)};
+ }
+ $NonptrType = qr{
+ (?:$Modifier\s+|const\s+)*
+ (?:
+ (?:typeof|__typeof__)\s*\(\s*\**\s*$Ident\s*\)|
+ (?:$typeTypedefs\b)|
+ (?:${all}\b)
+ )
+ (?:\s+$Modifier|\s+const)*
+ }x;
+ $Type = qr{
+ $NonptrType
+ (?:[\s\*]+\s*const|[\s\*]+|(?:\s*\[\s*\])+)?
+ (?:\s+$Inline|\s+$Modifier)*
+ }x;
+ $Declare = qr{(?:$Storage\s+)?$Type};
+}
+build_types();
+
+$chk_signoff = 0 if ($file);
+
+my @rawlines = ();
+my @lines = ();
+my $vname;
+if ($chk_branch) {
+ my @patches;
+ my %git_commits = ();
+ my $HASH;
+ open($HASH, "-|", "git", "log", "--reverse", "--no-merges", "--format=%H %s", $ARGV[0]) ||
+ die "$P: git log --reverse --no-merges --format='%H %s' $ARGV[0] failed - $!\n";
+
+ for my $line (<$HASH>) {
+ $line =~ /^([0-9a-fA-F]{40,40}) (.*)$/;
+ next if (!defined($1) || !defined($2));
+ my $sha1 = $1;
+ my $subject = $2;
+ push(@patches, $sha1);
+ $git_commits{$sha1} = $subject;
+ }
+
+ close $HASH;
+
+ die "$P: no revisions returned for revlist '$ARGV[0]'\n"
+ unless @patches;
+
+ my $i = 1;
+ my $num_patches = @patches;
+ for my $hash (@patches) {
+ my $FILE;
+ open($FILE, '-|', "git", "show", "--patch-with-stat", $hash) ||
+ die "$P: git show $hash - $!\n";
+ while (<$FILE>) {
+ chomp;
+ push(@rawlines, $_);
+ }
+ close($FILE);
+ $vname = substr($hash, 0, 12) . ' (' . $git_commits{$hash} . ')';
+ if ($num_patches > 1 && $quiet == 0) {
+ my $prefix = "$i/$num_patches";
+ $prefix = BLUE . BOLD . $prefix . RESET if $color;
+ print "$prefix Checking commit $vname\n";
+ $vname = "Patch $i/$num_patches";
+ } else {
+ $vname = "Commit " . $vname;
+ }
+ if (!process($hash)) {
+ $exit = 1;
+ print "\n" if ($num_patches > 1 && $quiet == 0);
+ }
+ @rawlines = ();
+ @lines = ();
+ $i++;
+ }
+} else {
+ for my $filename (@ARGV) {
+ my $FILE;
+ if ($file) {
+ open($FILE, '-|', "diff -u /dev/null $filename") ||
+ die "$P: $filename: diff failed - $!\n";
+ } elsif ($filename eq '-') {
+ open($FILE, '<&STDIN');
+ } else {
+ open($FILE, '<', "$filename") ||
+ die "$P: $filename: open failed - $!\n";
+ }
+ if ($filename eq '-') {
+ $vname = 'Your patch';
+ } else {
+ $vname = $filename;
+ }
+ print "Checking $filename...\n" if @ARGV > 1 && $quiet == 0;
+ while (<$FILE>) {
+ chomp;
+ push(@rawlines, $_);
+ }
+ close($FILE);
+ if (!process($filename)) {
+ $exit = 1;
+ }
+ @rawlines = ();
+ @lines = ();
+ }
+}
+
+exit($exit);
+
+sub top_of_kernel_tree {
+ my ($root) = @_;
+
+ my @tree_check = (
+ "Makefile.inc1", "README.md", "sys",
+ "usr.sbin"
+ );
+
+ foreach my $check (@tree_check) {
+ if (! -e $root . '/' . $check) {
+ return 0;
+ }
+ }
+ return 1;
+}
+
+sub expand_tabs {
+ my ($str) = @_;
+
+ my $res = '';
+ my $n = 0;
+ for my $c (split(//, $str)) {
+ if ($c eq "\t") {
+ $res .= ' ';
+ $n++;
+ for (; ($n % 8) != 0; $n++) {
+ $res .= ' ';
+ }
+ next;
+ }
+ $res .= $c;
+ $n++;
+ }
+
+ return $res;
+}
+sub copy_spacing {
+ (my $res = shift) =~ tr/\t/ /c;
+ return $res;
+}
+
+sub line_stats {
+ my ($line) = @_;
+
+ # Drop the diff line leader and expand tabs
+ $line =~ s/^.//;
+ $line = expand_tabs($line);
+
+ # Pick the indent from the front of the line.
+ my ($white) = ($line =~ /^(\s*)/);
+
+ return (length($line), length($white));
+}
+
+my $sanitise_quote = '';
+
+sub sanitise_line_reset {
+ my ($in_comment) = @_;
+
+ if ($in_comment) {
+ $sanitise_quote = '*/';
+ } else {
+ $sanitise_quote = '';
+ }
+}
+sub sanitise_line {
+ my ($line) = @_;
+
+ my $res = '';
+ my $l = '';
+
+ my $qlen = 0;
+ my $off = 0;
+ my $c;
+
+ # Always copy over the diff marker.
+ $res = substr($line, 0, 1);
+
+ for ($off = 1; $off < length($line); $off++) {
+ $c = substr($line, $off, 1);
+
+ # Comments we are wacking completely including the begin
+ # and end, all to $;.
+ if ($sanitise_quote eq '' && substr($line, $off, 2) eq '/*') {
+ $sanitise_quote = '*/';
+
+ substr($res, $off, 2, "$;$;");
+ $off++;
+ next;
+ }
+ if ($sanitise_quote eq '*/' && substr($line, $off, 2) eq '*/') {
+ $sanitise_quote = '';
+ substr($res, $off, 2, "$;$;");
+ $off++;
+ next;
+ }
+ if ($sanitise_quote eq '' && substr($line, $off, 2) eq '//') {
+ $sanitise_quote = '//';
+
+ substr($res, $off, 2, $sanitise_quote);
+ $off++;
+ next;
+ }
+
+ # A \ in a string means ignore the next character.
+ if (($sanitise_quote eq "'" || $sanitise_quote eq '"') &&
+ $c eq "\\") {
+ substr($res, $off, 2, 'XX');
+ $off++;
+ next;
+ }
+ # Regular quotes.
+ if ($c eq "'" || $c eq '"') {
+ if ($sanitise_quote eq '') {
+ $sanitise_quote = $c;
+
+ substr($res, $off, 1, $c);
+ next;
+ } elsif ($sanitise_quote eq $c) {
+ $sanitise_quote = '';
+ }
+ }
+
+ #print "c<$c> SQ<$sanitise_quote>\n";
+ if ($off != 0 && $sanitise_quote eq '*/' && $c ne "\t") {
+ substr($res, $off, 1, $;);
+ } elsif ($off != 0 && $sanitise_quote eq '//' && $c ne "\t") {
+ substr($res, $off, 1, $;);
+ } elsif ($off != 0 && $sanitise_quote && $c ne "\t") {
+ substr($res, $off, 1, 'X');
+ } else {
+ substr($res, $off, 1, $c);
+ }
+ }
+
+ if ($sanitise_quote eq '//') {
+ $sanitise_quote = '';
+ }
+
+ # The pathname on a #include may be surrounded by '<' and '>'.
+ if ($res =~ /^.\s*\#\s*include\s+\<(.*)\>/) {
+ my $clean = 'X' x length($1);
+ $res =~ s@\<.*\>@<$clean>@;
+
+ # The whole of a #error is a string.
+ } elsif ($res =~ /^.\s*\#\s*(?:error|warning)\s+(.*)\b/) {
+ my $clean = 'X' x length($1);
+ $res =~ s@(\#\s*(?:error|warning)\s+).*@$1$clean@;
+ }
+
+ return $res;
+}
+
+sub ctx_statement_block {
+ my ($linenr, $remain, $off) = @_;
+ my $line = $linenr - 1;
+ my $blk = '';
+ my $soff = $off;
+ my $coff = $off - 1;
+ my $coff_set = 0;
+
+ my $loff = 0;
+
+ my $type = '';
+ my $level = 0;
+ my @stack = ();
+ my $p;
+ my $c;
+ my $len = 0;
+
+ my $remainder;
+ while (1) {
+ @stack = (['', 0]) if ($#stack == -1);
+
+ #warn "CSB: blk<$blk> remain<$remain>\n";
+ # If we are about to drop off the end, pull in more
+ # context.
+ if ($off >= $len) {
+ for (; $remain > 0; $line++) {
+ last if (!defined $lines[$line]);
+ next if ($lines[$line] =~ /^-/);
+ $remain--;
+ $loff = $len;
+ $blk .= $lines[$line] . "\n";
+ $len = length($blk);
+ $line++;
+ last;
+ }
+ # Bail if there is no further context.
+ #warn "CSB: blk<$blk> off<$off> len<$len>\n";
+ if ($off >= $len) {
+ last;
+ }
+ }
+ $p = $c;
+ $c = substr($blk, $off, 1);
+ $remainder = substr($blk, $off);
+
+ #warn "CSB: c<$c> type<$type> level<$level> remainder<$remainder> coff_set<$coff_set>\n";
+
+ # Handle nested #if/#else.
+ if ($remainder =~ /^#\s*(?:ifndef|ifdef|if)\s/) {
+ push(@stack, [ $type, $level ]);
+ } elsif ($remainder =~ /^#\s*(?:else|elif)\b/) {
+ ($type, $level) = @{$stack[$#stack - 1]};
+ } elsif ($remainder =~ /^#\s*endif\b/) {
+ ($type, $level) = @{pop(@stack)};
+ }
+
+ # Statement ends at the ';' or a close '}' at the
+ # outermost level.
+ if ($level == 0 && $c eq ';') {
+ last;
+ }
+
+ # An else is really a conditional as long as its not else if
+ if ($level == 0 && $coff_set == 0 &&
+ (!defined($p) || $p =~ /(?:\s|\}|\+)/) &&
+ $remainder =~ /^(else)(?:\s|{)/ &&
+ $remainder !~ /^else\s+if\b/) {
+ $coff = $off + length($1) - 1;
+ $coff_set = 1;
+ #warn "CSB: mark coff<$coff> soff<$soff> 1<$1>\n";
+ #warn "[" . substr($blk, $soff, $coff - $soff + 1) . "]\n";
+ }
+
+ if (($type eq '' || $type eq '(') && $c eq '(') {
+ $level++;
+ $type = '(';
+ }
+ if ($type eq '(' && $c eq ')') {
+ $level--;
+ $type = ($level != 0)? '(' : '';
+
+ if ($level == 0 && $coff < $soff) {
+ $coff = $off;
+ $coff_set = 1;
+ #warn "CSB: mark coff<$coff>\n";
+ }
+ }
+ if (($type eq '' || $type eq '{') && $c eq '{') {
+ $level++;
+ $type = '{';
+ }
+ if ($type eq '{' && $c eq '}') {
+ $level--;
+ $type = ($level != 0)? '{' : '';
+
+ if ($level == 0) {
+ if (substr($blk, $off + 1, 1) eq ';') {
+ $off++;
+ }
+ last;
+ }
+ }
+ $off++;
+ }
+ # We are truly at the end, so shuffle to the next line.
+ if ($off == $len) {
+ $loff = $len + 1;
+ $line++;
+ $remain--;
+ }
+
+ my $statement = substr($blk, $soff, $off - $soff + 1);
+ my $condition = substr($blk, $soff, $coff - $soff + 1);
+
+ #warn "STATEMENT<$statement>\n";
+ #warn "CONDITION<$condition>\n";
+
+ #print "coff<$coff> soff<$off> loff<$loff>\n";
+
+ return ($statement, $condition,
+ $line, $remain + 1, $off - $loff + 1, $level);
+}
+
+sub statement_lines {
+ my ($stmt) = @_;
+
+ # Strip the diff line prefixes and rip blank lines at start and end.
+ $stmt =~ s/(^|\n)./$1/g;
+ $stmt =~ s/^\s*//;
+ $stmt =~ s/\s*$//;
+
+ my @stmt_lines = ($stmt =~ /\n/g);
+
+ return $#stmt_lines + 2;
+}
+
+sub statement_rawlines {
+ my ($stmt) = @_;
+
+ my @stmt_lines = ($stmt =~ /\n/g);
+
+ return $#stmt_lines + 2;
+}
+
+sub statement_block_size {
+ my ($stmt) = @_;
+
+ $stmt =~ s/(^|\n)./$1/g;
+ $stmt =~ s/^\s*\{//;
+ $stmt =~ s/}\s*$//;
+ $stmt =~ s/^\s*//;
+ $stmt =~ s/\s*$//;
+
+ my @stmt_lines = ($stmt =~ /\n/g);
+ my @stmt_statements = ($stmt =~ /;/g);
+
+ my $stmt_lines = $#stmt_lines + 2;
+ my $stmt_statements = $#stmt_statements + 1;
+
+ if ($stmt_lines > $stmt_statements) {
+ return $stmt_lines;
+ } else {
+ return $stmt_statements;
+ }
+}
+
+sub ctx_statement_full {
+ my ($linenr, $remain, $off) = @_;
+ my ($statement, $condition, $level);
+
+ my (@chunks);
+
+ # Grab the first conditional/block pair.
+ ($statement, $condition, $linenr, $remain, $off, $level) =
+ ctx_statement_block($linenr, $remain, $off);
+ #print "F: c<$condition> s<$statement> remain<$remain>\n";
+ push(@chunks, [ $condition, $statement ]);
+ if (!($remain > 0 && $condition =~ /^\s*(?:\n[+-])?\s*(?:if|else|do)\b/s)) {
+ return ($level, $linenr, @chunks);
+ }
+
+ # Pull in the following conditional/block pairs and see if they
+ # could continue the statement.
+ for (;;) {
+ ($statement, $condition, $linenr, $remain, $off, $level) =
+ ctx_statement_block($linenr, $remain, $off);
+ #print "C: c<$condition> s<$statement> remain<$remain>\n";
+ last if (!($remain > 0 && $condition =~ /^(?:\s*\n[+-])*\s*(?:else|do)\b/s));
+ #print "C: push\n";
+ push(@chunks, [ $condition, $statement ]);
+ }
+
+ return ($level, $linenr, @chunks);
+}
+
+sub ctx_block_get {
+ my ($linenr, $remain, $outer, $open, $close, $off) = @_;
+ my $line;
+ my $start = $linenr - 1;
+ my $blk = '';
+ my @o;
+ my @c;
+ my @res = ();
+
+ my $level = 0;
+ my @stack = ($level);
+ for ($line = $start; $remain > 0; $line++) {
+ next if ($rawlines[$line] =~ /^-/);
+ $remain--;
+
+ $blk .= $rawlines[$line];
+
+ # Handle nested #if/#else.
+ if ($lines[$line] =~ /^.\s*#\s*(?:ifndef|ifdef|if)\s/) {
+ push(@stack, $level);
+ } elsif ($lines[$line] =~ /^.\s*#\s*(?:else|elif)\b/) {
+ $level = $stack[$#stack - 1];
+ } elsif ($lines[$line] =~ /^.\s*#\s*endif\b/) {
+ $level = pop(@stack);
+ }
+
+ foreach my $c (split(//, $lines[$line])) {
+ ##print "C<$c>L<$level><$open$close>O<$off>\n";
+ if ($off > 0) {
+ $off--;
+ next;
+ }
+
+ if ($c eq $close && $level > 0) {
+ $level--;
+ last if ($level == 0);
+ } elsif ($c eq $open) {
+ $level++;
+ }
+ }
+
+ if (!$outer || $level <= 1) {
+ push(@res, $rawlines[$line]);
+ }
+
+ last if ($level == 0);
+ }
+
+ return ($level, @res);
+}
+sub ctx_block_outer {
+ my ($linenr, $remain) = @_;
+
+ my ($level, @r) = ctx_block_get($linenr, $remain, 1, '{', '}', 0);
+ return @r;
+}
+sub ctx_block {
+ my ($linenr, $remain) = @_;
+
+ my ($level, @r) = ctx_block_get($linenr, $remain, 0, '{', '}', 0);
+ return @r;
+}
+sub ctx_statement {
+ my ($linenr, $remain, $off) = @_;
+
+ my ($level, @r) = ctx_block_get($linenr, $remain, 0, '(', ')', $off);
+ return @r;
+}
+sub ctx_block_level {
+ my ($linenr, $remain) = @_;
+
+ return ctx_block_get($linenr, $remain, 0, '{', '}', 0);
+}
+sub ctx_statement_level {
+ my ($linenr, $remain, $off) = @_;
+
+ return ctx_block_get($linenr, $remain, 0, '(', ')', $off);
+}
+
+sub ctx_locate_comment {
+ my ($first_line, $end_line) = @_;
+
+ # Catch a comment on the end of the line itself.
+ my ($current_comment) = ($rawlines[$end_line - 1] =~ m@.*(/\*.*\*/)\s*(?:\\\s*)?$@);
+ return $current_comment if (defined $current_comment);
+
+ # Look through the context and try and figure out if there is a
+ # comment.
+ my $in_comment = 0;
+ $current_comment = '';
+ for (my $linenr = $first_line; $linenr < $end_line; $linenr++) {
+ my $line = $rawlines[$linenr - 1];
+ #warn " $line\n";
+ if ($linenr == $first_line and $line =~ m@^.\s*\*@) {
+ $in_comment = 1;
+ }
+ if ($line =~ m@/\*@) {
+ $in_comment = 1;
+ }
+ if (!$in_comment && $current_comment ne '') {
+ $current_comment = '';
+ }
+ $current_comment .= $line . "\n" if ($in_comment);
+ if ($line =~ m@\*/@) {
+ $in_comment = 0;
+ }
+ }
+
+ chomp($current_comment);
+ return($current_comment);
+}
+sub ctx_has_comment {
+ my ($first_line, $end_line) = @_;
+ my $cmt = ctx_locate_comment($first_line, $end_line);
+
+ ##print "LINE: $rawlines[$end_line - 1 ]\n";
+ ##print "CMMT: $cmt\n";
+
+ return ($cmt ne '');
+}
+
+sub raw_line {
+ my ($linenr, $cnt) = @_;
+
+ my $offset = $linenr - 1;
+ $cnt++;
+
+ my $line;
+ while ($cnt) {
+ $line = $rawlines[$offset++];
+ next if (defined($line) && $line =~ /^-/);
+ $cnt--;
+ }
+
+ return $line;
+}
+
+sub cat_vet {
+ my ($vet) = @_;
+ my ($res, $coded);
+
+ $res = '';
+ while ($vet =~ /([^[:cntrl:]]*)([[:cntrl:]]|$)/g) {
+ $res .= $1;
+ if ($2 ne '') {
+ $coded = sprintf("^%c", unpack('C', $2) + 64);
+ $res .= $coded;
+ }
+ }
+ $res =~ s/$/\$/;
+
+ return $res;
+}
+
+my $av_preprocessor = 0;
+my $av_pending;
+my @av_paren_type;
+my $av_pend_colon;
+
+sub annotate_reset {
+ $av_preprocessor = 0;
+ $av_pending = '_';
+ @av_paren_type = ('E');
+ $av_pend_colon = 'O';
+}
+
+sub annotate_values {
+ my ($stream, $type) = @_;
+
+ my $res;
+ my $var = '_' x length($stream);
+ my $cur = $stream;
+
+ print "$stream\n" if ($dbg_values > 1);
+
+ while (length($cur)) {
+ @av_paren_type = ('E') if ($#av_paren_type < 0);
+ print " <" . join('', @av_paren_type) .
+ "> <$type> <$av_pending>" if ($dbg_values > 1);
+ if ($cur =~ /^(\s+)/o) {
+ print "WS($1)\n" if ($dbg_values > 1);
+ if ($1 =~ /\n/ && $av_preprocessor) {
+ $type = pop(@av_paren_type);
+ $av_preprocessor = 0;
+ }
+
+ } elsif ($cur =~ /^(\(\s*$Type\s*)\)/ && $av_pending eq '_') {
+ print "CAST($1)\n" if ($dbg_values > 1);
+ push(@av_paren_type, $type);
+ $type = 'C';
+
+ } elsif ($cur =~ /^($Type)\s*(?:$Ident|,|\)|\(|\s*$)/) {
+ print "DECLARE($1)\n" if ($dbg_values > 1);
+ $type = 'T';
+
+ } elsif ($cur =~ /^($Modifier)\s*/) {
+ print "MODIFIER($1)\n" if ($dbg_values > 1);
+ $type = 'T';
+
+ } elsif ($cur =~ /^(\#\s*define\s*$Ident)(\(?)/o) {
+ print "DEFINE($1,$2)\n" if ($dbg_values > 1);
+ $av_preprocessor = 1;
+ push(@av_paren_type, $type);
+ if ($2 ne '') {
+ $av_pending = 'N';
+ }
+ $type = 'E';
+
+ } elsif ($cur =~ /^(\#\s*(?:undef\s*$Ident|include\b))/o) {
+ print "UNDEF($1)\n" if ($dbg_values > 1);
+ $av_preprocessor = 1;
+ push(@av_paren_type, $type);
+
+ } elsif ($cur =~ /^(\#\s*(?:ifdef|ifndef|if))/o) {
+ print "PRE_START($1)\n" if ($dbg_values > 1);
+ $av_preprocessor = 1;
+
+ push(@av_paren_type, $type);
+ push(@av_paren_type, $type);
+ $type = 'E';
+
+ } elsif ($cur =~ /^(\#\s*(?:else|elif))/o) {
+ print "PRE_RESTART($1)\n" if ($dbg_values > 1);
+ $av_preprocessor = 1;
+
+ push(@av_paren_type, $av_paren_type[$#av_paren_type]);
+
+ $type = 'E';
+
+ } elsif ($cur =~ /^(\#\s*(?:endif))/o) {
+ print "PRE_END($1)\n" if ($dbg_values > 1);
+
+ $av_preprocessor = 1;
+
+ # Assume all arms of the conditional end as this
+ # one does, and continue as if the #endif was not here.
+ pop(@av_paren_type);
+ push(@av_paren_type, $type);
+ $type = 'E';
+
+ } elsif ($cur =~ /^(\\\n)/o) {
+ print "PRECONT($1)\n" if ($dbg_values > 1);
+
+ } elsif ($cur =~ /^(__attribute__)\s*\(?/o) {
+ print "ATTR($1)\n" if ($dbg_values > 1);
+ $av_pending = $type;
+ $type = 'N';
+
+ } elsif ($cur =~ /^(sizeof)\s*(\()?/o) {
+ print "SIZEOF($1)\n" if ($dbg_values > 1);
+ if (defined $2) {
+ $av_pending = 'V';
+ }
+ $type = 'N';
+
+ } elsif ($cur =~ /^(if|while|for)\b/o) {
+ print "COND($1)\n" if ($dbg_values > 1);
+ $av_pending = 'E';
+ $type = 'N';
+
+ } elsif ($cur =~/^(case)/o) {
+ print "CASE($1)\n" if ($dbg_values > 1);
+ $av_pend_colon = 'C';
+ $type = 'N';
+
+ } elsif ($cur =~/^(return|else|goto|typeof|__typeof__)\b/o) {
+ print "KEYWORD($1)\n" if ($dbg_values > 1);
+ $type = 'N';
+
+ } elsif ($cur =~ /^(\()/o) {
+ print "PAREN('$1')\n" if ($dbg_values > 1);
+ push(@av_paren_type, $av_pending);
+ $av_pending = '_';
+ $type = 'N';
+
+ } elsif ($cur =~ /^(\))/o) {
+ my $new_type = pop(@av_paren_type);
+ if ($new_type ne '_') {
+ $type = $new_type;
+ print "PAREN('$1') -> $type\n"
+ if ($dbg_values > 1);
+ } else {
+ print "PAREN('$1')\n" if ($dbg_values > 1);
+ }
+
+ } elsif ($cur =~ /^($Ident)\s*\(/o) {
+ print "FUNC($1)\n" if ($dbg_values > 1);
+ $type = 'V';
+ $av_pending = 'V';
+
+ } elsif ($cur =~ /^($Ident\s*):(?:\s*\d+\s*(,|=|;))?/) {
+ if (defined $2 && $type eq 'C' || $type eq 'T') {
+ $av_pend_colon = 'B';
+ } elsif ($type eq 'E') {
+ $av_pend_colon = 'L';
+ }
+ print "IDENT_COLON($1,$type>$av_pend_colon)\n" if ($dbg_values > 1);
+ $type = 'V';
+
+ } elsif ($cur =~ /^($Ident|$Constant)/o) {
+ print "IDENT($1)\n" if ($dbg_values > 1);
+ $type = 'V';
+
+ } elsif ($cur =~ /^($Assignment)/o) {
+ print "ASSIGN($1)\n" if ($dbg_values > 1);
+ $type = 'N';
+
+ } elsif ($cur =~/^(;|{|})/) {
+ print "END($1)\n" if ($dbg_values > 1);
+ $type = 'E';
+ $av_pend_colon = 'O';
+
+ } elsif ($cur =~/^(,)/) {
+ print "COMMA($1)\n" if ($dbg_values > 1);
+ $type = 'C';
+
+ } elsif ($cur =~ /^(\?)/o) {
+ print "QUESTION($1)\n" if ($dbg_values > 1);
+ $type = 'N';
+
+ } elsif ($cur =~ /^(:)/o) {
+ print "COLON($1,$av_pend_colon)\n" if ($dbg_values > 1);
+
+ substr($var, length($res), 1, $av_pend_colon);
+ if ($av_pend_colon eq 'C' || $av_pend_colon eq 'L') {
+ $type = 'E';
+ } else {
+ $type = 'N';
+ }
+ $av_pend_colon = 'O';
+
+ } elsif ($cur =~ /^(\[)/o) {
+ print "CLOSE($1)\n" if ($dbg_values > 1);
+ $type = 'N';
+
+ } elsif ($cur =~ /^(-(?![->])|\+(?!\+)|\*|\&\&|\&)/o) {
+ my $variant;
+
+ print "OPV($1)\n" if ($dbg_values > 1);
+ if ($type eq 'V') {
+ $variant = 'B';
+ } else {
+ $variant = 'U';
+ }
+
+ substr($var, length($res), 1, $variant);
+ $type = 'N';
+
+ } elsif ($cur =~ /^($Operators)/o) {
+ print "OP($1)\n" if ($dbg_values > 1);
+ if ($1 ne '++' && $1 ne '--') {
+ $type = 'N';
+ }
+
+ } elsif ($cur =~ /(^.)/o) {
+ print "C($1)\n" if ($dbg_values > 1);
+ }
+ if (defined $1) {
+ $cur = substr($cur, length($1));
+ $res .= $type x length($1);
+ }
+ }
+
+ return ($res, $var);
+}
+
+sub possible {
+ my ($possible, $line) = @_;
+ my $notPermitted = qr{(?:
+ ^(?:
+ $Modifier|
+ $Storage|
+ $Type|
+ DEFINE_\S+
+ )$|
+ ^(?:
+ goto|
+ return|
+ case|
+ else|
+ asm|__asm__|
+ do
+ )(?:\s|$)|
+ ^(?:typedef|struct|enum)\b|
+ ^\#
+ )}x;
+ warn "CHECK<$possible> ($line)\n" if ($dbg_possible > 2);
+ if ($possible !~ $notPermitted) {
+ # Check for modifiers.
+ $possible =~ s/\s*$Storage\s*//g;
+ $possible =~ s/\s*$Sparse\s*//g;
+ if ($possible =~ /^\s*$/) {
+
+ } elsif ($possible =~ /\s/) {
+ $possible =~ s/\s*(?:$Type|\#\#)\s*//g;
+ for my $modifier (split(' ', $possible)) {
+ if ($modifier !~ $notPermitted) {
+ warn "MODIFIER: $modifier ($possible) ($line)\n" if ($dbg_possible);
+ push(@modifierList, $modifier);
+ }
+ }
+
+ } else {
+ warn "POSSIBLE: $possible ($line)\n" if ($dbg_possible);
+ push(@typeList, $possible);
+ }
+ build_types();
+ } else {
+ warn "NOTPOSS: $possible ($line)\n" if ($dbg_possible > 1);
+ }
+}
+
+my $prefix = '';
+
+sub report {
+ my ($level, $msg) = @_;
+ if (defined $tst_only && $msg !~ /\Q$tst_only\E/) {
+ return 0;
+ }
+
+ my $output = '';
+ $output .= BOLD if $color;
+ $output .= $prefix;
+ $output .= RED if $color && $level eq 'ERROR';
+ $output .= MAGENTA if $color && $level eq 'WARNING';
+ $output .= $level . ':';
+ $output .= RESET if $color;
+ $output .= ' ' . $msg . "\n";
+
+ $output = (split('\n', $output))[0] . "\n" if ($terse);
+
+ push(our @report, $output);
+
+ return 1;
+}
+sub report_dump {
+ our @report;
+}
+sub ERROR {
+ if (report("ERROR", $_[0])) {
+ our $clean = 0;
+ our $cnt_error++;
+ }
+}
+sub WARN {
+ if (report("WARNING", $_[0])) {
+ our $clean = 0;
+ our $cnt_warn++;
+ }
+}
+
+# According to tests/qtest/bios-tables-test.c: do not
+# change expected file in the same commit with adding test
+sub checkfilename {
+ my ($name, $acpi_testexpected, $acpi_nontestexpected) = @_;
+
+ # Note: shell script that rebuilds the expected files is in the same
+ # directory as files themselves.
+ # Note: allowed diff list can be changed both when changing expected
+ # files and when changing tests.
+ if ($name =~ m#^tests/data/acpi/# and not $name =~ m#^\.sh$#) {
+ $$acpi_testexpected = $name;
+ } elsif ($name !~ m#^tests/qtest/bios-tables-test-allowed-diff.h$#) {
+ $$acpi_nontestexpected = $name;
+ }
+ if (defined $$acpi_testexpected and defined $$acpi_nontestexpected) {
+ ERROR("Do not add expected files together with tests, " .
+ "follow instructions in " .
+ "tests/qtest/bios-tables-test.c: both " .
+ $$acpi_testexpected . " and " .
+ $$acpi_nontestexpected . " found\n");
+ }
+}
+
+sub process {
+ my $filename = shift;
+
+ my $linenr=0;
+ my $prevline="";
+ my $prevrawline="";
+ my $stashline="";
+ my $stashrawline="";
+
+ my $length;
+ my $indent;
+ my $previndent=0;
+ my $stashindent=0;
+
+ our $clean = 1;
+ my $signoff = 0;
+ my $is_patch = 0;
+
+ my $in_header_lines = $file ? 0 : 1;
+ my $in_commit_log = 0; #Scanning lines before patch
+ my $non_utf8_charset = 0;
+
+ our @report = ();
+ our $cnt_lines = 0;
+ our $cnt_error = 0;
+ our $cnt_warn = 0;
+ our $cnt_chk = 0;
+
+ # Trace the real file/line as we go.
+ my $realfile = '';
+ my $realline = 0;
+ my $realcnt = 0;
+ my $here = '';
+ my $in_comment = 0;
+ my $comment_edge = 0;
+ my $first_line = 0;
+ my $p1_prefix = '';
+
+ my $prev_values = 'E';
+
+ # suppression flags
+ my %suppress_ifbraces;
+ my %suppress_whiletrailers;
+ my %suppress_export;
+
+ my $acpi_testexpected;
+ my $acpi_nontestexpected;
+
+ # Pre-scan the patch sanitizing the lines.
+
+ sanitise_line_reset();
+ my $line;
+ foreach my $rawline (@rawlines) {
+ $linenr++;
+ $line = $rawline;
+
+ if ($rawline=~/^\@\@ -\d+(?:,\d+)? \+(\d+)(,(\d+))? \@\@/) {
+ $realline=$1-1;
+ if (defined $2) {
+ $realcnt=$3+1;
+ } else {
+ $realcnt=1+1;
+ }
+ $in_comment = 0;
+
+ # Guestimate if this is a continuing comment. Run
+ # the context looking for a comment "edge". If this
+ # edge is a close comment then we must be in a comment
+ # at context start.
+ my $edge;
+ my $cnt = $realcnt;
+ for (my $ln = $linenr + 1; $cnt > 0; $ln++) {
+ next if (defined $rawlines[$ln - 1] &&
+ $rawlines[$ln - 1] =~ /^-/);
+ $cnt--;
+ #print "RAW<$rawlines[$ln - 1]>\n";
+ last if (!defined $rawlines[$ln - 1]);
+ if ($rawlines[$ln - 1] =~ m@(/\*|\*/)@ &&
+ $rawlines[$ln - 1] !~ m@"[^"]*(?:/\*|\*/)[^"]*"@) {
+ ($edge) = $1;
+ last;
+ }
+ }
+ if (defined $edge && $edge eq '*/') {
+ $in_comment = 1;
+ }
+
+ # Guestimate if this is a continuing comment. If this
+ # is the start of a diff block and this line starts
+ # ' *' then it is very likely a comment.
+ if (!defined $edge &&
+ $rawlines[$linenr] =~ m@^.\s*(?:\*\*+| \*)(?:\s|$)@)
+ {
+ $in_comment = 1;
+ }
+
+ ##print "COMMENT:$in_comment edge<$edge> $rawline\n";
+ sanitise_line_reset($in_comment);
+
+ } elsif ($realcnt && $rawline =~ /^(?:\+| |$)/) {
+ # Standardise the strings and chars within the input to
+ # simplify matching -- only bother with positive lines.
+ $line = sanitise_line($rawline);
+ }
+ push(@lines, $line);
+
+ if ($realcnt > 1) {
+ $realcnt-- if ($line =~ /^(?:\+| |$)/);
+ } else {
+ $realcnt = 0;
+ }
+
+ #print "==>$rawline\n";
+ #print "-->$line\n";
+ }
+
+ $prefix = '';
+
+ $realcnt = 0;
+ $linenr = 0;
+ foreach my $line (@lines) {
+ $linenr++;
+
+ my $rawline = $rawlines[$linenr - 1];
+
+#extract the line range in the file after the patch is applied
+ if ($line=~/^\@\@ -\d+(?:,\d+)? \+(\d+)(,(\d+))? \@\@/) {
+ $is_patch = 1;
+ $first_line = $linenr + 1;
+ $realline=$1-1;
+ if (defined $2) {
+ $realcnt=$3+1;
+ } else {
+ $realcnt=1+1;
+ }
+ annotate_reset();
+ $prev_values = 'E';
+
+ %suppress_ifbraces = ();
+ %suppress_whiletrailers = ();
+ %suppress_export = ();
+ next;
+
+# track the line number as we move through the hunk, note that
+# new versions of GNU diff omit the leading space on completely
+# blank context lines so we need to count that too.
+ } elsif ($line =~ /^( |\+|$)/) {
+ $realline++;
+ $realcnt-- if ($realcnt != 0);
+
+ # Measure the line length and indent.
+ ($length, $indent) = line_stats($rawline);
+
+ # Track the previous line.
+ ($prevline, $stashline) = ($stashline, $line);
+ ($previndent, $stashindent) = ($stashindent, $indent);
+ ($prevrawline, $stashrawline) = ($stashrawline, $rawline);
+
+ #warn "line<$line>\n";
+
+ } elsif ($realcnt == 1) {
+ $realcnt--;
+ }
+
+ my $hunk_line = ($realcnt != 0);
+
+#make up the handle for any error we report on this line
+ $prefix = "$filename:$realline: " if ($emacs && $file);
+ $prefix = "$filename:$linenr: " if ($emacs && !$file);
+
+ $here = "#$linenr: " if (!$file);
+ $here = "#$realline: " if ($file);
+
+ # extract the filename as it passes
+ if ($line =~ /^diff --git.*?(\S+)$/) {
+ $realfile = $1;
+ $realfile =~ s@^([^/]*)/@@ if (!$file);
+ checkfilename($realfile, \$acpi_testexpected, \$acpi_nontestexpected);
+ } elsif ($line =~ /^\+\+\+\s+(\S+)/) {
+ $realfile = $1;
+ $realfile =~ s@^([^/]*)/@@ if (!$file);
+ checkfilename($realfile, \$acpi_testexpected, \$acpi_nontestexpected);
+
+ $p1_prefix = $1;
+ if (!$file && $tree && $p1_prefix ne '' &&
+ -e "$root/$p1_prefix") {
+ WARN("patch prefix '$p1_prefix' exists, appears to be a -p0 patch\n");
+ }
+
+ next;
+ }
+
+ $here .= "FILE: $realfile:$realline:" if ($realcnt != 0);
+
+ my $hereline = "$here\n$rawline\n";
+ my $herecurr = "$here\n$rawline\n";
+ my $hereprev = "$here\n$prevrawline\n$rawline\n";
+
+ $cnt_lines++ if ($realcnt != 0);
+
+# Check for incorrect file permissions
+ if ($line =~ /^new (file )?mode.*[7531]\d{0,2}$/) {
+ my $permhere = $here . "FILE: $realfile\n";
+ if ($realfile =~ /(\bMakefile(?:\.objs)?|\.c|\.cc|\.cpp|\.h|\.mak|\.[sS])$/) {
+ ERROR("do not set execute permissions for source files\n" . $permhere);
+ }
+ }
+
+# Only allow Python 3 interpreter
+ if ($realline == 1 &&
+ $line =~ /^\+#!\ *\/usr\/bin\/(?:env )?python$/) {
+ ERROR("please use python3 interpreter\n" . $herecurr);
+ }
+
+# Accept git diff extended headers as valid patches
+ if ($line =~ /^(?:rename|copy) (?:from|to) [\w\/\.\-]+\s*$/) {
+ $is_patch = 1;
+ }
+
+ if ($line =~ /^(Author|From): .* via .*<qemu-devel\@nongnu.org>/) {
+ ERROR("Author email address is mangled by the mailing list\n" . $herecurr);
+ }
+
+#check the patch for a signoff:
+ if ($line =~ /^\s*signed-off-by:/i) {
+ # This is a signoff, if ugly, so do not double report.
+ $in_commit_log = 0;
+
+ if (!($line =~ /^\s*Signed-off-by:/)) {
+ ERROR("The correct form is \"Signed-off-by\"\n" .
+ $herecurr);
+ }
+ if ($line =~ /^\s*signed-off-by:\S/i) {
+ ERROR("space required after Signed-off-by:\n" .
+ $herecurr);
+ }
+ }
+
+# Check for wrappage within a valid hunk of the file
+ if ($realcnt != 0 && $line !~ m{^(?:\+|-| |\\ No newline|$)}) {
+ ERROR("patch seems to be corrupt (line wrapped?)\n" .
+ $herecurr) if (!$emitted_corrupt++);
+ }
+
+# UTF-8 regex found at http://www.w3.org/International/questions/qa-forms-utf-8.en.php
+ if (($realfile =~ /^$/ || $line =~ /^\+/) &&
+ $rawline !~ m/^$UTF8*$/) {
+ my ($utf8_prefix) = ($rawline =~ /^($UTF8*)/);
+
+ my $blank = copy_spacing($rawline);
+ my $ptr = substr($blank, 0, length($utf8_prefix)) . "^";
+ my $hereptr = "$hereline$ptr\n";
+
+ ERROR("Invalid UTF-8, patch and commit message should be encoded in UTF-8\n" . $hereptr);
+ }
+
+ if ($rawline =~ m/$UTF8_MOJIBAKE/) {
+ ERROR("Doubly-encoded UTF-8\n" . $herecurr);
+ }
+# Check if it's the start of a commit log
+# (not a header line and we haven't seen the patch filename)
+ if ($in_header_lines && $realfile =~ /^$/ &&
+ !($rawline =~ /^\s+\S/ ||
+ $rawline =~ /^(commit\b|from\b|[\w-]+:).*$/i)) {
+ $in_header_lines = 0;
+ $in_commit_log = 1;
+ }
+
+# Check if there is UTF-8 in a commit log when a mail header has explicitly
+# declined it, i.e defined some charset where it is missing.
+ if ($in_header_lines &&
+ $rawline =~ /^Content-Type:.+charset="(.+)".*$/ &&
+ $1 !~ /utf-8/i) {
+ $non_utf8_charset = 1;
+ }
+
+ if ($in_commit_log && $non_utf8_charset && $realfile =~ /^$/ &&
+ $rawline =~ /$NON_ASCII_UTF8/) {
+ WARN("8-bit UTF-8 used in possible commit log\n" . $herecurr);
+ }
+
+# ignore non-hunk lines and lines being removed
+ next if (!$hunk_line || $line =~ /^-/);
+
+# ignore files that are being periodically imported from Linux
+ next if ($realfile =~ /^(linux-headers|include\/standard-headers)\//);
+
+#trailing whitespace
+ if ($line =~ /^\+.*\015/) {
+ my $herevet = "$here\n" . cat_vet($rawline) . "\n";
+ ERROR("DOS line endings\n" . $herevet);
+
+ } elsif ($realfile =~ /^docs\/.+\.txt/ ||
+ $realfile =~ /^docs\/.+\.md/) {
+ if ($rawline =~ /^\+\s+$/ && $rawline !~ /^\+ {4}$/) {
+ # TODO: properly check we're in a code block
+ # (surrounding text is 4-column aligned)
+ my $herevet = "$here\n" . cat_vet($rawline) . "\n";
+ ERROR("code blocks in documentation should have " .
+ "empty lines with exactly 4 columns of " .
+ "whitespace\n" . $herevet);
+ }
+ } elsif ($rawline =~ /^\+.*\S\s+$/ || $rawline =~ /^\+\s+$/) {
+ my $herevet = "$here\n" . cat_vet($rawline) . "\n";
+ ERROR("trailing whitespace\n" . $herevet);
+ $rpt_cleaners = 1;
+ }
+
+# checks for trace-events files
+ if ($realfile =~ /trace-events$/ && $line =~ /^\+/) {
+ if ($rawline =~ /%[-+ 0]*#/) {
+ ERROR("Don't use '#' flag of printf format ('%#') in " .
+ "trace-events, use '0x' prefix instead\n" . $herecurr);
+ } else {
+ my $hex =
+ qr/%[-+ *.0-9]*([hljztL]|ll|hh)?(x|X|"\s*PRI[xX][^"]*"?)/;
+
+ # don't consider groups splitted by [.:/ ], like 2A.20:12ab
+ my $tmpline = $rawline;
+ $tmpline =~ s/($hex[.:\/ ])+$hex//g;
+
+ if ($tmpline =~ /(?<!0x)$hex/) {
+ ERROR("Hex numbers must be prefixed with '0x'\n" .
+ $herecurr);
+ }
+ }
+ }
+
+# check we are in a valid source file if not then ignore this hunk
+ next if ($realfile !~ /$SrcFile/);
+
+#120 column limit; exempt URLs, if no other words on line
+ if ($line =~ /^\+/ &&
+ !($line =~ /^\+\s*"[^"]*"\s*(?:\s*|,|\)\s*;)\s*$/) &&
+ !($rawline =~ /^[^[:alnum:]]*https?:\S*$/) &&
+ $length > 80 &&
+ $realfile !~ /\/tests\//)
+ {
+ if ($length > 120) {
+ ERROR("line over 120 characters\n" . $herecurr);
+ } else {
+ WARN("line over 80 characters\n" . $herecurr);
+ }
+ }
+
+# check for spaces before a quoted newline
+ if ($rawline =~ /^.*\".*\s\\n/) {
+ ERROR("unnecessary whitespace before a quoted newline\n" . $herecurr);
+ }
+
+# check for adding lines without a newline.
+ if ($line =~ /^\+/ && defined $lines[$linenr] && $lines[$linenr] =~ /^\\ No newline at end of file/) {
+ ERROR("adding a line without newline at end of file\n" . $herecurr);
+ }
+
+# check for RCS/CVS revision markers
+ if ($rawline =~ /^\+.*\$(Revision|Log|Id)(?:\$|\b)/) {
+ ERROR("CVS style keyword markers, these will _not_ be updated\n". $herecurr);
+ }
+
+# check we are in a valid C source file if not then ignore this hunk
+ next if ($realfile !~ /\.(h|c|cpp)$/);
+
+# Block comment styles
+
+ # Block comments use /* on a line of its own
+ if ($rawline !~ m@^\+.*/\*.*\*/[ \t)}]*$@ && #inline /*...*/
+ $rawline =~ m@^\+.*/\*[*-]?+[ \t]*[^ \t]@) { # /* or /** or /*- non-blank
+ WARN("Block comments use a leading /* on a separate line\n" . $herecurr);
+ }
+
+# Block comments use * on subsequent lines
+ if ($prevline =~ /$;[ \t]*$/ && #ends in comment
+ $prevrawline =~ /^\+.*?\/\*/ && #starting /*
+ $prevrawline !~ /\*\/[ \t]*$/ && #no trailing */
+ $rawline =~ /^\+/ && #line is new
+ $rawline !~ /^\+[ \t]*\*/) { #no leading *
+ WARN("Block comments use * on subsequent lines\n" . $hereprev);
+ }
+
+# Block comments use */ on trailing lines
+ if ($rawline !~ m@^\+[ \t]*\*/[ \t]*$@ && #trailing */
+ $rawline !~ m@^\+.*/\*.*\*/[ \t]*$@ && #inline /*...*/
+ $rawline !~ m@^\+.*\*{2,}/[ \t]*$@ && #trailing **/
+ $rawline =~ m@^\+[ \t]*.+\*\/[ \t]*$@) { #non blank */
+ WARN("Block comments use a trailing */ on a separate line\n" . $herecurr);
+ }
+
+# Block comment * alignment
+ if ($prevline =~ /$;[ \t]*$/ && #ends in comment
+ $line =~ /^\+[ \t]*$;/ && #leading comment
+ $rawline =~ /^\+[ \t]*\*/ && #leading *
+ (($prevrawline =~ /^\+.*?\/\*/ && #leading /*
+ $prevrawline !~ /\*\/[ \t]*$/) || #no trailing */
+ $prevrawline =~ /^\+[ \t]*\*/)) { #leading *
+ my $oldindent;
+ $prevrawline =~ m@^\+([ \t]*/?)\*@;
+ if (defined($1)) {
+ $oldindent = expand_tabs($1);
+ } else {
+ $prevrawline =~ m@^\+(.*/?)\*@;
+ $oldindent = expand_tabs($1);
+ }
+ $rawline =~ m@^\+([ \t]*)\*@;
+ my $newindent = $1;
+ $newindent = expand_tabs($newindent);
+ if (length($oldindent) ne length($newindent)) {
+ WARN("Block comments should align the * on each line\n" . $hereprev);
+ }
+ }
+
+# Check for potential 'bare' types
+ my ($stat, $cond, $line_nr_next, $remain_next, $off_next,
+ $realline_next);
+ if ($realcnt && $line =~ /.\s*\S/) {
+ ($stat, $cond, $line_nr_next, $remain_next, $off_next) =
+ ctx_statement_block($linenr, $realcnt, 0);
+ $stat =~ s/\n./\n /g;
+ $cond =~ s/\n./\n /g;
+
+ # Find the real next line.
+ $realline_next = $line_nr_next;
+ if (defined $realline_next &&
+ (!defined $lines[$realline_next - 1] ||
+ substr($lines[$realline_next - 1], $off_next) =~ /^\s*$/)) {
+ $realline_next++;
+ }
+
+ my $s = $stat;
+ $s =~ s/{.*$//s;
+
+ # Ignore goto labels.
+ if ($s =~ /$Ident:\*$/s) {
+
+ # Ignore functions being called
+ } elsif ($s =~ /^.\s*$Ident\s*\(/s) {
+
+ } elsif ($s =~ /^.\s*else\b/s) {
+
+ # declarations always start with types
+ } elsif ($prev_values eq 'E' && $s =~ /^.\s*(?:$Storage\s+)?(?:$Inline\s+)?(?:const\s+)?((?:\s*$Ident)+?)\b(?:\s+$Sparse)?\s*\**\s*(?:$Ident|\(\*[^\)]*\))(?:\s*$Modifier)?\s*(?:;|=|,|\()/s) {
+ my $type = $1;
+ $type =~ s/\s+/ /g;
+ possible($type, "A:" . $s);
+
+ # definitions in global scope can only start with types
+ } elsif ($s =~ /^.(?:$Storage\s+)?(?:$Inline\s+)?(?:const\s+)?($Ident)\b\s*(?!:)/s) {
+ possible($1, "B:" . $s);
+ }
+
+ # any (foo ... *) is a pointer cast, and foo is a type
+ while ($s =~ /\(($Ident)(?:\s+$Sparse)*[\s\*]+\s*\)/sg) {
+ possible($1, "C:" . $s);
+ }
+
+ # Check for any sort of function declaration.
+ # int foo(something bar, other baz);
+ # void (*store_gdt)(x86_descr_ptr *);
+ if ($prev_values eq 'E' && $s =~ /^(.(?:typedef\s*)?(?:(?:$Storage|$Inline)\s*)*\s*$Type\s*(?:\b$Ident|\(\*\s*$Ident\))\s*)\(/s) {
+ my ($name_len) = length($1);
+
+ my $ctx = $s;
+ substr($ctx, 0, $name_len + 1, '');
+ $ctx =~ s/\)[^\)]*$//;
+
+ for my $arg (split(/\s*,\s*/, $ctx)) {
+ if ($arg =~ /^(?:const\s+)?($Ident)(?:\s+$Sparse)*\s*\**\s*(:?\b$Ident)?$/s || $arg =~ /^($Ident)$/s) {
+
+ possible($1, "D:" . $s);
+ }
+ }
+ }
+
+ }
+
+#
+# Checks which may be anchored in the context.
+#
+
+# Check for switch () and associated case and default
+# statements should be at the same indent.
+ if ($line=~/\bswitch\s*\(.*\)/) {
+ my $err = '';
+ my $sep = '';
+ my @ctx = ctx_block_outer($linenr, $realcnt);
+ shift(@ctx);
+ for my $ctx (@ctx) {
+ my ($clen, $cindent) = line_stats($ctx);
+ if ($ctx =~ /^\+\s*(case\s+|default:)/ &&
+ $indent != $cindent) {
+ $err .= "$sep$ctx\n";
+ $sep = '';
+ } else {
+ $sep = "[...]\n";
+ }
+ }
+ if ($err ne '') {
+ ERROR("switch and case should be at the same indent\n$hereline$err");
+ }
+ }
+
+# if/while/etc brace do not go on next line, unless defining a do while loop,
+# or if that brace on the next line is for something else
+ if ($line =~ /(.*)\b((?:if|while|for|switch)\s*\(|do\b|else\b)/ && $line !~ /^.\s*\#/) {
+ my $pre_ctx = "$1$2";
+
+ my ($level, @ctx) = ctx_statement_level($linenr, $realcnt, 0);
+ my $ctx_cnt = $realcnt - $#ctx - 1;
+ my $ctx = join("\n", @ctx);
+
+ my $ctx_ln = $linenr;
+ my $ctx_skip = $realcnt;
+
+ while ($ctx_skip > $ctx_cnt || ($ctx_skip == $ctx_cnt &&
+ defined $lines[$ctx_ln - 1] &&
+ $lines[$ctx_ln - 1] =~ /^-/)) {
+ ##print "SKIP<$ctx_skip> CNT<$ctx_cnt>\n";
+ $ctx_skip-- if (!defined $lines[$ctx_ln - 1] || $lines[$ctx_ln - 1] !~ /^-/);
+ $ctx_ln++;
+ }
+
+ #print "realcnt<$realcnt> ctx_cnt<$ctx_cnt>\n";
+ #print "pre<$pre_ctx>\nline<$line>\nctx<$ctx>\nnext<$lines[$ctx_ln - 1]>\n";
+
+ # The length of the "previous line" is checked against 80 because it
+ # includes the + at the beginning of the line (if the actual line has
+ # 79 or 80 characters, it is no longer possible to add a space and an
+ # opening brace there)
+ if ($#ctx == 0 && $ctx !~ /{\s*/ &&
+ defined($lines[$ctx_ln - 1]) && $lines[$ctx_ln - 1] =~ /^\+\s*\{/ &&
+ defined($lines[$ctx_ln - 2]) && length($lines[$ctx_ln - 2]) < 80) {
+ ERROR("that open brace { should be on the previous line\n" .
+ "$here\n$ctx\n$rawlines[$ctx_ln - 1]\n");
+ }
+ if ($level == 0 && $pre_ctx !~ /}\s*while\s*\($/ &&
+ $ctx =~ /\)\s*\;\s*$/ &&
+ defined $lines[$ctx_ln - 1])
+ {
+ my ($nlength, $nindent) = line_stats($lines[$ctx_ln - 1]);
+ if ($nindent > $indent) {
+ ERROR("trailing semicolon indicates no statements, indent implies otherwise\n" .
+ "$here\n$ctx\n$rawlines[$ctx_ln - 1]\n");
+ }
+ }
+ }
+
+# 'do ... while (0/false)' only makes sense in macros, without trailing ';'
+ if ($line =~ /while\s*\((0|false)\);/) {
+ ERROR("suspicious ; after while (0)\n" . $herecurr);
+ }
+
+# Check superfluous trailing ';'
+ if ($line =~ /;;$/) {
+ ERROR("superfluous trailing semicolon\n" . $herecurr);
+ }
+
+# Check relative indent for conditionals and blocks.
+ if ($line =~ /\b(?:(?:if|while|for)\s*\(|do\b)/ && $line !~ /^.\s*#/ && $line !~ /\}\s*while\s*/) {
+ my ($s, $c) = ($stat, $cond);
+
+ substr($s, 0, length($c), '');
+
+ # Make sure we remove the line prefixes as we have
+ # none on the first line, and are going to re-add them
+ # where necessary.
+ $s =~ s/\n./\n/gs;
+
+ # Find out how long the conditional actually is.
+ my @newlines = ($c =~ /\n/gs);
+ my $cond_lines = 1 + $#newlines;
+
+ # We want to check the first line inside the block
+ # starting at the end of the conditional, so remove:
+ # 1) any blank line termination
+ # 2) any opening brace { on end of the line
+ # 3) any do (...) {
+ my $continuation = 0;
+ my $check = 0;
+ $s =~ s/^.*\bdo\b//;
+ $s =~ s/^\s*\{//;
+ if ($s =~ s/^\s*\\//) {
+ $continuation = 1;
+ }
+ if ($s =~ s/^\s*?\n//) {
+ $check = 1;
+ $cond_lines++;
+ }
+
+ # Also ignore a loop construct at the end of a
+ # preprocessor statement.
+ if (($prevline =~ /^.\s*#\s*define\s/ ||
+ $prevline =~ /\\\s*$/) && $continuation == 0) {
+ $check = 0;
+ }
+
+ my $cond_ptr = -1;
+ $continuation = 0;
+ while ($cond_ptr != $cond_lines) {
+ $cond_ptr = $cond_lines;
+
+ # If we see an #else/#elif then the code
+ # is not linear.
+ if ($s =~ /^\s*\#\s*(?:else|elif)/) {
+ $check = 0;
+ }
+
+ # Ignore:
+ # 1) blank lines, they should be at 0,
+ # 2) preprocessor lines, and
+ # 3) labels.
+ if ($continuation ||
+ $s =~ /^\s*?\n/ ||
+ $s =~ /^\s*#\s*?/ ||
+ $s =~ /^\s*$Ident\s*:/) {
+ $continuation = ($s =~ /^.*?\\\n/) ? 1 : 0;
+ if ($s =~ s/^.*?\n//) {
+ $cond_lines++;
+ }
+ }
+ }
+
+ my (undef, $sindent) = line_stats("+" . $s);
+ my $stat_real = raw_line($linenr, $cond_lines);
+
+ # Check if either of these lines are modified, else
+ # this is not this patch's fault.
+ if (!defined($stat_real) ||
+ $stat !~ /^\+/ && $stat_real !~ /^\+/) {
+ $check = 0;
+ }
+ if (defined($stat_real) && $cond_lines > 1) {
+ $stat_real = "[...]\n$stat_real";
+ }
+
+ #print "line<$line> prevline<$prevline> indent<$indent> sindent<$sindent> check<$check> continuation<$continuation> s<$s> cond_lines<$cond_lines> stat_real<$stat_real> stat<$stat>\n";
+
+ if ($check && (($sindent % 4) != 0 ||
+ ($sindent <= $indent && $s ne ''))) {
+ ERROR("suspect code indent for conditional statements ($indent, $sindent)\n" . $herecurr . "$stat_real\n");
+ }
+ }
+
+ # Track the 'values' across context and added lines.
+ my $opline = $line; $opline =~ s/^./ /;
+ my ($curr_values, $curr_vars) =
+ annotate_values($opline . "\n", $prev_values);
+ $curr_values = $prev_values . $curr_values;
+ if ($dbg_values) {
+ my $outline = $opline; $outline =~ s/\t/ /g;
+ print "$linenr > .$outline\n";
+ print "$linenr > $curr_values\n";
+ print "$linenr > $curr_vars\n";
+ }
+ $prev_values = substr($curr_values, -1);
+
+#ignore lines not being added
+ if ($line=~/^[^\+]/) {next;}
+
+# TEST: allow direct testing of the type matcher.
+ if ($dbg_type) {
+ if ($line =~ /^.\s*$Declare\s*$/) {
+ ERROR("TEST: is type\n" . $herecurr);
+ } elsif ($dbg_type > 1 && $line =~ /^.+($Declare)/) {
+ ERROR("TEST: is not type ($1 is)\n". $herecurr);
+ }
+ next;
+ }
+# TEST: allow direct testing of the attribute matcher.
+ if ($dbg_attr) {
+ if ($line =~ /^.\s*$Modifier\s*$/) {
+ ERROR("TEST: is attr\n" . $herecurr);
+ } elsif ($dbg_attr > 1 && $line =~ /^.+($Modifier)/) {
+ ERROR("TEST: is not attr ($1 is)\n". $herecurr);
+ }
+ next;
+ }
+
+# check for initialisation to aggregates open brace on the next line
+ if ($line =~ /^.\s*\{/ &&
+ $prevline =~ /(?:^|[^=])=\s*$/) {
+ ERROR("that open brace { should be on the previous line\n" . $hereprev);
+ }
+
+#
+# Checks which are anchored on the added line.
+#
+
+# check for malformed paths in #include statements (uses RAW line)
+ if ($rawline =~ m{^.\s*\#\s*include\s+[<"](.*)[">]}) {
+ my $path = $1;
+ if ($path =~ m{//}) {
+ ERROR("malformed #include filename\n" .
+ $herecurr);
+ }
+ }
+
+# Remove C99 comments.
+ $line =~ s@//.*@@;
+ $opline =~ s@//.*@@;
+
+# check for global initialisers.
+# if ($line =~ /^.$Type\s*$Ident\s*(?:\s+$Modifier)*\s*=\s*(0|NULL|false)\s*;/) {
+# ERROR("do not initialise globals to 0 or NULL\n" .
+# $herecurr);
+# }
+# check for static initialisers.
+# if ($line =~ /\bstatic\s.*=\s*(0|NULL|false)\s*;/) {
+# ERROR("do not initialise statics to 0 or NULL\n" .
+# $herecurr);
+# }
+
+# * goes on variable not on type
+ # (char*[ const])
+ if ($line =~ m{\($NonptrType(\s*(?:$Modifier\b\s*|\*\s*)+)\)}) {
+ my ($from, $to) = ($1, $1);
+
+ # Should start with a space.
+ $to =~ s/^(\S)/ $1/;
+ # Should not end with a space.
+ $to =~ s/\s+$//;
+ # '*'s should not have spaces between.
+ while ($to =~ s/\*\s+\*/\*\*/) {
+ }
+
+ #print "from<$from> to<$to>\n";
+ if ($from ne $to) {
+ ERROR("\"(foo$from)\" should be \"(foo$to)\"\n" . $herecurr);
+ }
+ } elsif ($line =~ m{\b$NonptrType(\s*(?:$Modifier\b\s*|\*\s*)+)($Ident)}) {
+ my ($from, $to, $ident) = ($1, $1, $2);
+
+ # Should start with a space.
+ $to =~ s/^(\S)/ $1/;
+ # Should not end with a space.
+ $to =~ s/\s+$//;
+ # '*'s should not have spaces between.
+ while ($to =~ s/\*\s+\*/\*\*/) {
+ }
+ # Modifiers should have spaces.
+ $to =~ s/(\b$Modifier$)/$1 /;
+
+ #print "from<$from> to<$to> ident<$ident>\n";
+ if ($from ne $to && $ident !~ /^$Modifier$/) {
+ ERROR("\"foo${from}bar\" should be \"foo${to}bar\"\n" . $herecurr);
+ }
+ }
+
+# function brace can't be on same line, except for #defines of do while,
+# or if closed on same line
+ if (($line=~/$Type\s*$Ident\(.*\).*\s\{/) and
+ !($line=~/\#\s*define.*do\s\{/) and !($line=~/}/)) {
+ ERROR("open brace '{' following function declarations go on the next line\n" . $herecurr);
+ }
+
+# missing space after union, struct or enum definition
+ if ($line =~ /^.\s*(?:typedef\s+)?(enum|union|struct)(?:\s+$Ident)?(?:\s+$Ident)?[=\{]/) {
+ ERROR("missing space after $1 definition\n" . $herecurr);
+ }
+
+# check for spacing round square brackets; allowed:
+# 1. with a type on the left -- int [] a;
+# 2. at the beginning of a line for slice initialisers -- [0...10] = 5,
+# 3. inside a curly brace -- = { [0...10] = 5 }
+# 4. after a comma -- [1] = 5, [2] = 6
+# 5. in a macro definition -- #define abc(x) [x] = y
+ while ($line =~ /(.*?\s)\[/g) {
+ my ($where, $prefix) = ($-[1], $1);
+ if ($prefix !~ /$Type\s+$/ &&
+ ($where != 0 || $prefix !~ /^.\s+$/) &&
+ $prefix !~ /\#\s*define[^(]*\([^)]*\)\s+$/ &&
+ $prefix !~ /[,{:]\s+$/) {
+ ERROR("space prohibited before open square bracket '['\n" . $herecurr);
+ }
+ }
+
+# check for spaces between functions and their parentheses.
+ while ($line =~ /($Ident)\s+\(/g) {
+ my $name = $1;
+ my $ctx_before = substr($line, 0, $-[1]);
+ my $ctx = "$ctx_before$name";
+
+ # Ignore those directives where spaces _are_ permitted.
+ if ($name =~ /^(?:
+ if|for|while|switch|return|case|
+ volatile|__volatile__|coroutine_fn|
+ __attribute__|format|__extension__|
+ asm|__asm__)$/x)
+ {
+
+ # Ignore 'catch (...)' in C++
+ } elsif ($name =~ /^catch$/ && $realfile =~ /(\.cpp|\.h)$/) {
+
+ # cpp #define statements have non-optional spaces, ie
+ # if there is a space between the name and the open
+ # parenthesis it is simply not a parameter group.
+ } elsif ($ctx_before =~ /^.\s*\#\s*define\s*$/) {
+
+ # cpp #elif statement condition may start with a (
+ } elsif ($ctx =~ /^.\s*\#\s*elif\s*$/) {
+
+ # If this whole things ends with a type its most
+ # likely a typedef for a function.
+ } elsif ($ctx =~ /$Type$/) {
+
+ } else {
+ ERROR("space prohibited between function name and open parenthesis '('\n" . $herecurr);
+ }
+ }
+# Check operator spacing.
+ if (!($line=~/\#\s*include/)) {
+ my $ops = qr{
+ <<=|>>=|<=|>=|==|!=|
+ \+=|-=|\*=|\/=|%=|\^=|\|=|&=|
+ =>|->|<<|>>|<|>|=|!|~|
+ &&|\|\||,|\^|\+\+|--|&|\||\+|-|\*|\/|%|
+ \?|::|:
+ }x;
+ my @elements = split(/($ops|;)/, $opline);
+ my $off = 0;
+
+ my $blank = copy_spacing($opline);
+
+ for (my $n = 0; $n < $#elements; $n += 2) {
+ $off += length($elements[$n]);
+
+ # Pick up the preceding and succeeding characters.
+ my $ca = substr($opline, 0, $off);
+ my $cc = '';
+ if (length($opline) >= ($off + length($elements[$n + 1]))) {
+ $cc = substr($opline, $off + length($elements[$n + 1]));
+ }
+ my $cb = "$ca$;$cc";
+
+ my $a = '';
+ $a = 'V' if ($elements[$n] ne '');
+ $a = 'W' if ($elements[$n] =~ /\s$/);
+ $a = 'C' if ($elements[$n] =~ /$;$/);
+ $a = 'B' if ($elements[$n] =~ /(\[|\()$/);
+ $a = 'O' if ($elements[$n] eq '');
+ $a = 'E' if ($ca =~ /^\s*$/);
+
+ my $op = $elements[$n + 1];
+
+ my $c = '';
+ if (defined $elements[$n + 2]) {
+ $c = 'V' if ($elements[$n + 2] ne '');
+ $c = 'W' if ($elements[$n + 2] =~ /^\s/);
+ $c = 'C' if ($elements[$n + 2] =~ /^$;/);
+ $c = 'B' if ($elements[$n + 2] =~ /^(\)|\]|;)/);
+ $c = 'O' if ($elements[$n + 2] eq '');
+ $c = 'E' if ($elements[$n + 2] =~ /^\s*\\$/);
+ } else {
+ $c = 'E';
+ }
+
+ my $ctx = "${a}x${c}";
+
+ my $at = "(ctx:$ctx)";
+
+ my $ptr = substr($blank, 0, $off) . "^";
+ my $hereptr = "$hereline$ptr\n";
+
+ # Pull out the value of this operator.
+ my $op_type = substr($curr_values, $off + 1, 1);
+
+ # Get the full operator variant.
+ my $opv = $op . substr($curr_vars, $off, 1);
+
+ # Ignore operators passed as parameters.
+ if ($op_type ne 'V' &&
+ $ca =~ /\s$/ && $cc =~ /^\s*,/) {
+
+# # Ignore comments
+# } elsif ($op =~ /^$;+$/) {
+
+ # ; should have either the end of line or a space or \ after it
+ } elsif ($op eq ';') {
+ if ($ctx !~ /.x[WEBC]/ &&
+ $cc !~ /^\\/ && $cc !~ /^;/) {
+ ERROR("space required after that '$op' $at\n" . $hereptr);
+ }
+
+ # // is a comment
+ } elsif ($op eq '//') {
+
+ # Ignore : used in class declaration in C++
+ } elsif ($opv eq ':B' && $ctx =~ /Wx[WE]/ &&
+ $line =~ /class/ && $realfile =~ /(\.cpp|\.h)$/) {
+
+ # No spaces for:
+ # ->
+ # : when part of a bitfield
+ } elsif ($op eq '->' || $opv eq ':B') {
+ if ($ctx =~ /Wx.|.xW/) {
+ ERROR("spaces prohibited around that '$op' $at\n" . $hereptr);
+ }
+
+ # , must have a space on the right.
+ # not required when having a single },{ on one line
+ } elsif ($op eq ',') {
+ if ($ctx !~ /.x[WEC]/ && $cc !~ /^}/ &&
+ ($elements[$n] . $elements[$n + 2]) !~ " *}\\{") {
+ ERROR("space required after that '$op' $at\n" . $hereptr);
+ }
+
+ # '*' as part of a type definition -- reported already.
+ } elsif ($opv eq '*_') {
+ #warn "'*' is part of type\n";
+
+ # unary operators should have a space before and
+ # none after. May be left adjacent to another
+ # unary operator, or a cast
+ } elsif ($op eq '!' || $op eq '~' ||
+ $opv eq '*U' || $opv eq '-U' ||
+ $opv eq '&U' || $opv eq '&&U') {
+ if ($op eq '~' && $ca =~ /::$/ && $realfile =~ /(\.cpp|\.h)$/) {
+ # '~' used as a name of Destructor
+
+ } elsif ($ctx !~ /[WEBC]x./ && $ca !~ /(?:\)|!|~|\*|-|\&|\||\+\+|\-\-|\{)$/) {
+ ERROR("space required before that '$op' $at\n" . $hereptr);
+ }
+ if ($op eq '*' && $cc =~/\s*$Modifier\b/) {
+ # A unary '*' may be const
+
+ } elsif ($ctx =~ /.xW/) {
+ ERROR("space prohibited after that '$op' $at\n" . $hereptr);
+ }
+
+ # unary ++ and unary -- are allowed no space on one side.
+ } elsif ($op eq '++' or $op eq '--') {
+ if ($ctx !~ /[WEOBC]x[^W]/ && $ctx !~ /[^W]x[WOBEC]/) {
+ ERROR("space required one side of that '$op' $at\n" . $hereptr);
+ }
+ if ($ctx =~ /Wx[BE]/ ||
+ ($ctx =~ /Wx./ && $cc =~ /^;/)) {
+ ERROR("space prohibited before that '$op' $at\n" . $hereptr);
+ }
+ if ($ctx =~ /ExW/) {
+ ERROR("space prohibited after that '$op' $at\n" . $hereptr);
+ }
+
+ # A colon needs no spaces before when it is
+ # terminating a case value or a label.
+ } elsif ($opv eq ':C' || $opv eq ':L') {
+ if ($ctx =~ /Wx./) {
+ ERROR("space prohibited before that '$op' $at\n" . $hereptr);
+ }
+
+ # All the others need spaces both sides.
+ } elsif ($ctx !~ /[EWC]x[CWE]/) {
+ my $ok = 0;
+
+ if ($realfile =~ /\.cpp|\.h$/) {
+ # Ignore template arguments <...> in C++
+ if (($op eq '<' || $op eq '>') && $line =~ /<.*>/) {
+ $ok = 1;
+ }
+
+ # Ignore :: in C++
+ if ($op eq '::') {
+ $ok = 1;
+ }
+ }
+
+ # Ignore email addresses <foo@bar>
+ if (($op eq '<' &&
+ $cc =~ /^\S+\@\S+>/) ||
+ ($op eq '>' &&
+ $ca =~ /<\S+\@\S+$/))
+ {
+ $ok = 1;
+ }
+
+ # Ignore ?:
+ if (($opv eq ':O' && $ca =~ /\?$/) ||
+ ($op eq '?' && $cc =~ /^:/)) {
+ $ok = 1;
+ }
+
+ if ($ok == 0) {
+ ERROR("spaces required around that '$op' $at\n" . $hereptr);
+ }
+ }
+ $off += length($elements[$n + 1]);
+ }
+ }
+
+#need space before brace following if, while, etc
+ if (($line =~ /\(.*\)\{/ && $line !~ /\($Type\)\{/) ||
+ $line =~ /do\{/) {
+ ERROR("space required before the open brace '{'\n" . $herecurr);
+ }
+
+# closing brace should have a space following it when it has anything
+# on the line
+ if ($line =~ /}(?!(?:,|;|\)))\S/) {
+ ERROR("space required after that close brace '}'\n" . $herecurr);
+ }
+
+# check spacing on square brackets
+ if ($line =~ /\[\s/ && $line !~ /\[\s*$/) {
+ ERROR("space prohibited after that open square bracket '['\n" . $herecurr);
+ }
+ if ($line =~ /\s\]/) {
+ ERROR("space prohibited before that close square bracket ']'\n" . $herecurr);
+ }
+
+# check spacing on parentheses
+ if ($line =~ /\(\s/ && $line !~ /\(\s*(?:\\)?$/ &&
+ $line !~ /for\s*\(\s+;/) {
+ ERROR("space prohibited after that open parenthesis '('\n" . $herecurr);
+ }
+ if ($line =~ /(\s+)\)/ && $line !~ /^.\s*\)/ &&
+ $line !~ /for\s*\(.*;\s+\)/ &&
+ $line !~ /:\s+\)/) {
+ ERROR("space prohibited before that close parenthesis ')'\n" . $herecurr);
+ }
+
+ if ($line =~ /^.\s*(Q(?:S?LIST|SIMPLEQ|TAILQ)_HEAD)\s*\(\s*[^,]/ &&
+ $line !~ /^.typedef/) {
+ ERROR("named $1 should be typedefed separately\n" . $herecurr);
+ }
+
+# Return needs parens
+ if ($line =~ /^.\s*return [^(]/) {
+ ERROR("parentheses required on return\n" . $herecurr);
+ }
+
+# Need a space before open parenthesis after if, while etc
+ if ($line=~/\b(if|while|for|switch|return)\(/) {
+ ERROR("space required before the open parenthesis '('\n" . $herecurr);
+ }
+
+# Check for illegal assignment in if conditional -- and check for trailing
+# statements after the conditional.
+ if ($line =~ /do\s*(?!{)/) {
+ my ($stat_next) = ctx_statement_block($line_nr_next,
+ $remain_next, $off_next);
+ $stat_next =~ s/\n./\n /g;
+ ##print "stat<$stat> stat_next<$stat_next>\n";
+
+ if ($stat_next =~ /^\s*while\b/) {
+ # If the statement carries leading newlines,
+ # then count those as offsets.
+ my ($whitespace) =
+ ($stat_next =~ /^((?:\s*\n[+-])*\s*)/s);
+ my $offset =
+ statement_rawlines($whitespace) - 1;
+
+ $suppress_whiletrailers{$line_nr_next +
+ $offset} = 1;
+ }
+ }
+ if (!defined $suppress_whiletrailers{$linenr} &&
+ $line =~ /\b(?:if|while|for)\s*\(/ && $line !~ /^.\s*#/) {
+ my ($s, $c) = ($stat, $cond);
+
+# if ($c =~ /\bif\s*\(.*[^<>!=]=[^=].*/s) {
+# ERROR("do not use assignment in if condition\n" . $herecurr);
+# }
+
+ # Find out what is on the end of the line after the
+ # conditional.
+ substr($s, 0, length($c), '');
+ $s =~ s/\n.*//g;
+ $s =~ s/$;//g; # Remove any comments
+ if (length($c) && $s !~ /^\s*{?\s*\\*\s*$/ &&
+ $c !~ /}\s*while\s*/)
+ {
+ # Find out how long the conditional actually is.
+ my @newlines = ($c =~ /\n/gs);
+ my $cond_lines = 1 + $#newlines;
+ my $stat_real = '';
+
+ $stat_real = raw_line($linenr, $cond_lines)
+ . "\n" if ($cond_lines);
+ if (defined($stat_real) && $cond_lines > 1) {
+ $stat_real = "[...]\n$stat_real";
+ }
+
+ ERROR("trailing statements should be on next line\n" . $herecurr . $stat_real);
+ }
+ }
+
+# Check for bitwise tests written as boolean
+ if ($line =~ /
+ (?:
+ (?:\[|\(|\&\&|\|\|)
+ \s*0[xX][0-9]+\s*
+ (?:\&\&|\|\|)
+ |
+ (?:\&\&|\|\|)
+ \s*0[xX][0-9]+\s*
+ (?:\&\&|\|\||\)|\])
+ )/x)
+ {
+ ERROR("boolean test with hexadecimal, perhaps just 1 \& or \|?\n" . $herecurr);
+ }
+
+# if and else should not have general statements after it
+ if ($line =~ /^.\s*(?:}\s*)?else\b(.*)/) {
+ my $s = $1;
+ $s =~ s/$;//g; # Remove any comments
+ if ($s !~ /^\s*(?:\sif|(?:{|)\s*\\?\s*$)/) {
+ ERROR("trailing statements should be on next line\n" . $herecurr);
+ }
+ }
+# if should not continue a brace
+ if ($line =~ /}\s*if\b/) {
+ ERROR("trailing statements should be on next line\n" .
+ $herecurr);
+ }
+# case and default should not have general statements after them
+ if ($line =~ /^.\s*(?:case\s*.*|default\s*):/g &&
+ $line !~ /\G(?:
+ (?:\s*$;*)(?:\s*{)?(?:\s*$;*)(?:\s*\\)?\s*$|
+ \s*return\s+
+ )/xg)
+ {
+ ERROR("trailing statements should be on next line\n" . $herecurr);
+ }
+
+ # Check for }<nl>else {, these must be at the same
+ # indent level to be relevant to each other.
+ if ($prevline=~/}\s*$/ and $line=~/^.\s*else\s*/ and
+ $previndent == $indent) {
+ ERROR("else should follow close brace '}'\n" . $hereprev);
+ }
+
+ if ($prevline=~/}\s*$/ and $line=~/^.\s*while\s*/ and
+ $previndent == $indent) {
+ my ($s, $c) = ctx_statement_block($linenr, $realcnt, 0);
+
+ # Find out what is on the end of the line after the
+ # conditional.
+ substr($s, 0, length($c), '');
+ $s =~ s/\n.*//g;
+
+ if ($s =~ /^\s*;/) {
+ ERROR("while should follow close brace '}'\n" . $hereprev);
+ }
+ }
+
+#no spaces allowed after \ in define
+ if ($line=~/\#\s*define.*\\\s$/) {
+ ERROR("Whitespace after \\ makes next lines useless\n" . $herecurr);
+ }
+
+# multi-statement macros should be enclosed in a do while loop, grab the
+# first statement and ensure its the whole macro if its not enclosed
+# in a known good container
+ if ($realfile !~ m@/vmlinux.lds.h$@ &&
+ $line =~ /^.\s*\#\s*define\s*$Ident(\()?/) {
+ my $ln = $linenr;
+ my $cnt = $realcnt;
+ my ($off, $dstat, $dcond, $rest);
+ my $ctx = '';
+
+ my $args = defined($1);
+
+ # Find the end of the macro and limit our statement
+ # search to that.
+ while ($cnt > 0 && defined $lines[$ln - 1] &&
+ $lines[$ln - 1] =~ /^(?:-|..*\\$)/)
+ {
+ $ctx .= $rawlines[$ln - 1] . "\n";
+ $cnt-- if ($lines[$ln - 1] !~ /^-/);
+ $ln++;
+ }
+ $ctx .= $rawlines[$ln - 1];
+
+ ($dstat, $dcond, $ln, $cnt, $off) =
+ ctx_statement_block($linenr, $ln - $linenr + 1, 0);
+ #print "dstat<$dstat> dcond<$dcond> cnt<$cnt> off<$off>\n";
+ #print "LINE<$lines[$ln-1]> len<" . length($lines[$ln-1]) . "\n";
+
+ # Extract the remainder of the define (if any) and
+ # rip off surrounding spaces, and trailing \'s.
+ $rest = '';
+ while ($off != 0 || ($cnt > 0 && $rest =~ /\\\s*$/)) {
+ #print "ADDING cnt<$cnt> $off <" . substr($lines[$ln - 1], $off) . "> rest<$rest>\n";
+ if ($off != 0 || $lines[$ln - 1] !~ /^-/) {
+ $rest .= substr($lines[$ln - 1], $off) . "\n";
+ $cnt--;
+ }
+ $ln++;
+ $off = 0;
+ }
+ $rest =~ s/\\\n.//g;
+ $rest =~ s/^\s*//s;
+ $rest =~ s/\s*$//s;
+
+ # Clean up the original statement.
+ if ($args) {
+ substr($dstat, 0, length($dcond), '');
+ } else {
+ $dstat =~ s/^.\s*\#\s*define\s+$Ident\s*//;
+ }
+ $dstat =~ s/$;//g;
+ $dstat =~ s/\\\n.//g;
+ $dstat =~ s/^\s*//s;
+ $dstat =~ s/\s*$//s;
+
+ # Flatten any parentheses and braces
+ while ($dstat =~ s/\([^\(\)]*\)/1/ ||
+ $dstat =~ s/\{[^\{\}]*\}/1/ ||
+ $dstat =~ s/\[[^\{\}]*\]/1/)
+ {
+ }
+
+ my $exceptions = qr{
+ $Declare|
+ module_param_named|
+ MODULE_PARAM_DESC|
+ DECLARE_PER_CPU|
+ DEFINE_PER_CPU|
+ __typeof__\(|
+ union|
+ struct|
+ \.$Ident\s*=\s*|
+ ^\"|\"$
+ }x;
+ #print "REST<$rest> dstat<$dstat> ctx<$ctx>\n";
+ if ($rest ne '' && $rest ne ',') {
+ if ($rest !~ /while\s*\(/ &&
+ $dstat !~ /$exceptions/)
+ {
+ ERROR("Macros with multiple statements should be enclosed in a do - while loop\n" . "$here\n$ctx\n");
+ }
+
+ } elsif ($ctx !~ /;/) {
+ if ($dstat ne '' &&
+ $dstat !~ /^(?:$Ident|-?$Constant)$/ &&
+ $dstat !~ /$exceptions/ &&
+ $dstat !~ /^\.$Ident\s*=/ &&
+ $dstat =~ /$Operators/)
+ {
+ ERROR("Macros with complex values should be enclosed in parenthesis\n" . "$here\n$ctx\n");
+ }
+ }
+ }
+
+# check for missing bracing around if etc
+ if ($line =~ /(^.*)\b(?:if|while|for)\b/ &&
+ $line !~ /\#\s*if/) {
+ my $allowed = 0;
+
+ # Check the pre-context.
+ if ($line =~ /(\}.*?)$/) {
+ my $pre = $1;
+
+ if ($line !~ /else/) {
+ print "APW: ALLOWED: pre<$pre> line<$line>\n"
+ if $dbg_adv_apw;
+ $allowed = 1;
+ }
+ }
+ my ($level, $endln, @chunks) =
+ ctx_statement_full($linenr, $realcnt, 1);
+ if ($dbg_adv_apw) {
+ print "APW: chunks<$#chunks> linenr<$linenr> endln<$endln> level<$level>\n";
+ print "APW: <<$chunks[1][0]>><<$chunks[1][1]>>\n"
+ if $#chunks >= 1;
+ }
+ if ($#chunks >= 0 && $level == 0) {
+ my $seen = 0;
+ my $herectx = $here . "\n";
+ my $ln = $linenr - 1;
+ for my $chunk (@chunks) {
+ my ($cond, $block) = @{$chunk};
+
+ # If the condition carries leading newlines, then count those as offsets.
+ my ($whitespace) = ($cond =~ /^((?:\s*\n[+-])*\s*)/s);
+ my $offset = statement_rawlines($whitespace) - 1;
+
+ #print "COND<$cond> whitespace<$whitespace> offset<$offset>\n";
+
+ # We have looked at and allowed this specific line.
+ $suppress_ifbraces{$ln + $offset} = 1;
+
+ $herectx .= "$rawlines[$ln + $offset]\n[...]\n";
+ $ln += statement_rawlines($block) - 1;
+
+ substr($block, 0, length($cond), '');
+
+ my $spaced_block = $block;
+ $spaced_block =~ s/\n\+/ /g;
+
+ $seen++ if ($spaced_block =~ /^\s*\{/);
+
+ print "APW: cond<$cond> block<$block> allowed<$allowed>\n"
+ if $dbg_adv_apw;
+ if (statement_lines($cond) > 1) {
+ print "APW: ALLOWED: cond<$cond>\n"
+ if $dbg_adv_apw;
+ $allowed = 1;
+ }
+ if ($block =~/\b(?:if|for|while)\b/) {
+ print "APW: ALLOWED: block<$block>\n"
+ if $dbg_adv_apw;
+ $allowed = 1;
+ }
+ if (statement_block_size($block) > 1) {
+ print "APW: ALLOWED: lines block<$block>\n"
+ if $dbg_adv_apw;
+ $allowed = 1;
+ }
+ }
+ $allowed=1; # disable for now.
+ if ($seen != ($#chunks + 1) && !$allowed) {
+ ERROR("braces {} are necessary for all arms of this statement\n" . $herectx);
+ }
+ }
+ }
+ if (!defined $suppress_ifbraces{$linenr - 1} &&
+ $line =~ /\b(if|while|for|else)\b/ &&
+ $line !~ /\#\s*if/ &&
+ $line !~ /\#\s*else/) {
+ my $allowed = 0;
+
+ # Check the pre-context.
+ if (substr($line, 0, $-[0]) =~ /(\}\s*)$/) {
+ my $pre = $1;
+
+ if ($line !~ /else/) {
+ print "APW: ALLOWED: pre<$pre> line<$line>\n"
+ if $dbg_adv_apw;
+ $allowed = 1;
+ }
+ }
+
+ my ($level, $endln, @chunks) =
+ ctx_statement_full($linenr, $realcnt, $-[0]);
+
+ # Check the condition.
+ my ($cond, $block) = @{$chunks[0]};
+ print "CHECKING<$linenr> cond<$cond> block<$block>\n"
+ if $dbg_adv_checking;
+ if (defined $cond) {
+ substr($block, 0, length($cond), '');
+ }
+ if (statement_lines($cond) > 1) {
+ print "APW: ALLOWED: cond<$cond>\n"
+ if $dbg_adv_apw;
+ $allowed = 1;
+ }
+ if ($block =~/\b(?:if|for|while)\b/) {
+ print "APW: ALLOWED: block<$block>\n"
+ if $dbg_adv_apw;
+ $allowed = 1;
+ }
+ if (statement_block_size($block) > 1) {
+ print "APW: ALLOWED: lines block<$block>\n"
+ if $dbg_adv_apw;
+ $allowed = 1;
+ }
+ # Check the post-context.
+ if (defined $chunks[1]) {
+ my ($cond, $block) = @{$chunks[1]};
+ if (defined $cond) {
+ substr($block, 0, length($cond), '');
+ }
+ if ($block =~ /^\s*\{/) {
+ print "APW: ALLOWED: chunk-1 block<$block>\n"
+ if $dbg_adv_apw;
+ $allowed = 1;
+ }
+ }
+ print "DCS: level=$level block<$block> allowed=$allowed\n"
+ if $dbg_adv_dcs;
+ if ($level == 0 && $block !~ /^\s*\{/ && !$allowed) {
+ my $herectx = $here . "\n";;
+ my $cnt = statement_rawlines($block);
+
+ for (my $n = 0; $n < $cnt; $n++) {
+ $herectx .= raw_line($linenr, $n) . "\n";;
+ }
+
+ ERROR("braces {} are necessary even for single statement blocks\n" . $herectx);
+ }
+ }
+
+# warn about #if 0
+ if ($line =~ /^.\s*\#\s*if\s+0\b/) {
+ ERROR("if this code is redundant consider removing it\n" .
+ $herecurr);
+ }
+
+# Check that the storage class is at the beginning of a declaration
+ if ($line =~ /\b$Storage\b/ && $line !~ /^.\s*$Storage\b/) {
+ ERROR("storage class should be at the beginning of the declaration\n" . $herecurr)
+ }
+
+# check the location of the inline attribute, that it is between
+# storage class and type.
+ if ($line =~ /\b$Type\s+$Inline\b/ ||
+ $line =~ /\b$Inline\s+$Storage\b/) {
+ ERROR("inline keyword should sit between storage class and type\n" . $herecurr);
+ }
+
+# check for sizeof(&)
+ if ($line =~ /\bsizeof\s*\(\s*\&/) {
+ ERROR("sizeof(& should be avoided\n" . $herecurr);
+ }
+
+# check for new externs in .c files.
+ if ($realfile =~ /\.c$/ && defined $stat &&
+ $stat =~ /^.\s*(?:extern\s+)?$Type\s+($Ident)(\s*)\(/s)
+ {
+ my $function_name = $1;
+ my $paren_space = $2;
+
+ my $s = $stat;
+ if (defined $cond) {
+ substr($s, 0, length($cond), '');
+ }
+ if ($s =~ /^\s*;/ &&
+ $function_name ne 'uninitialized_var')
+ {
+ ERROR("externs should be avoided in .c files\n" . $herecurr);
+ }
+
+ if ($paren_space =~ /\n/) {
+ ERROR("arguments for function declarations should follow identifier\n" . $herecurr);
+ }
+
+ } elsif ($realfile =~ /\.c$/ && defined $stat &&
+ $stat =~ /^.\s*extern\s+/)
+ {
+ ERROR("externs should be avoided in .c files\n" . $herecurr);
+ }
+
+# check for gcc specific __FUNCTION__
+ if ($line =~ /__FUNCTION__/) {
+ ERROR("__func__ should be used instead of gcc specific __FUNCTION__\n" . $herecurr);
+ }
+
+# recommend sigaction over signal for portability, when establishing a handler
+ if ($line =~ /\bsignal\s*\(/ && !($line =~ /SIG_(?:IGN|DFL)/)) {
+ ERROR("use sigaction to establish signal handlers; signal is not portable\n" . $herecurr);
+ }
+
+# format strings checks
+ my $string;
+ while ($line =~ /(?:^|")([X\t]*)(?:"|$)/g) {
+ $string = substr($rawline, $-[1], $+[1] - $-[1]);
+ $string =~ s/%%/__/g;
+ # check for %L{u,d,i} in strings
+ if ($string =~ /(?<!%)%L[udi]/) {
+ ERROR("\%Ld/%Lu are not-standard C, use %lld/%llu\n" . $herecurr);
+ }
+ }
+
+ # Continue checking for error messages that contains newlines. This
+ # check handles cases where string literals are spread over multiple lines.
+ # Example:
+ # error_report("Error msg line #1"
+ # "Error msg line #2\n");
+ my $quoted_newline_regex = qr{\+\s*\".*\\n.*\"};
+ my $continued_str_literal = qr{\+\s*\".*\"};
+
+ if ($rawline =~ /$quoted_newline_regex/) {
+ # Backtrack to first line that does not contain only a quoted literal
+ # and assume that it is the start of the statement.
+ my $i = $linenr - 2;
+
+ while (($i >= 0) & $rawlines[$i] =~ /$continued_str_literal/) {
+ $i--;
+ }
+ }
+
+ }
+
+ # If we have no input at all, then there is nothing to report on
+ # so just keep quiet.
+ if ($#rawlines == -1) {
+ return 1;
+ }
+
+ # In mailback mode only produce a report in the negative, for
+ # things that appear to be patches.
+ if ($mailback && ($clean == 1 || !$is_patch)) {
+ return 1;
+ }
+
+ # This is not a patch, and we are are in 'no-patch' mode so
+ # just keep quiet.
+ if (!$chk_patch && !$is_patch) {
+ return 1;
+ }
+
+ if (!$is_patch && $filename !~ /cover-letter\.patch$/) {
+ ERROR("Does not appear to be a unified-diff format patch\n");
+ }
+
+ print report_dump();
+ if ($summary && !($clean == 1 && $quiet == 1)) {
+ print "$filename " if ($summary_file);
+ print "total: $cnt_error errors, $cnt_warn warnings, " .
+ "$cnt_lines lines checked\n";
+ print "\n" if ($quiet == 0);
+ }
+
+ if ($quiet == 0) {
+ # If there were whitespace errors which cleanpatch can fix
+ # then suggest that.
+# if ($rpt_cleaners) {
+# print "NOTE: whitespace errors detected, you may wish to use scripts/cleanpatch or\n";
+# print " scripts/cleanfile\n\n";
+# }
+ }
+
+ if ($clean == 1 && $quiet == 0) {
+ print "$vname has no obvious style problems and is ready for submission.\n"
+ }
+
+ return ($no_warnings ? $clean : $cnt_error == 0);
+}
diff --git a/tools/build/cross-build/include/common/sys/types.h b/tools/build/cross-build/include/common/sys/types.h
index 044ca6bed4f8..82436e7e9224 100644
--- a/tools/build/cross-build/include/common/sys/types.h
+++ b/tools/build/cross-build/include/common/sys/types.h
@@ -68,4 +68,8 @@ typedef unsigned long cap_ioctl_t;
struct cap_rights;
typedef struct cap_rights cap_rights_t;
+
+/* Needed for bitstring */
+#include <sys/bitcount.h>
+
#endif
diff --git a/tools/build/cross-build/include/linux/strings.h b/tools/build/cross-build/include/linux/strings.h
new file mode 100644
index 000000000000..827ef23f1c82
--- /dev/null
+++ b/tools/build/cross-build/include/linux/strings.h
@@ -0,0 +1,40 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright 2022 Jessica Clarke <jrtc27@FreeBSD.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+#pragma once
+#include <sys/cdefs.h>
+
+#include_next <strings.h>
+
+__BEGIN_DECLS
+
+int fls(int) __pure2;
+int flsl(long) __pure2;
+int flsll(long long) __pure2;
+
+__END_DECLS
diff --git a/tools/build/cross-build/include/linux/unistd.h b/tools/build/cross-build/include/linux/unistd.h
index f518df2ac9ae..cd0b28ba39ed 100644
--- a/tools/build/cross-build/include/linux/unistd.h
+++ b/tools/build/cross-build/include/linux/unistd.h
@@ -41,17 +41,9 @@
/* Ensure that unistd.h pulls in getopt */
#define __USE_POSIX2
#endif
-/*
- * Before version 2.25, glibc's unistd.h would define the POSIX subset of
- * getopt.h by defining __need_getopt, including getopt.h (which would
- * disable the header guard) and then undefining it so later including
- * getopt.h explicitly would define the extensions. However, we wrap getopt,
- * and so the wrapper's #pragma once breaks that. Thus getopt.h must be
- * included before the real unistd.h to ensure we get all the extensions.
- */
-#include <getopt.h>
#include_next <unistd.h>
#include <fcntl.h>
+#include <getopt.h>
#include <stdlib.h>
#include <string.h>
#include <sys/syscall.h>
diff --git a/tools/build/cross-build/include/mac/stdlib.h b/tools/build/cross-build/include/mac/stdlib.h
index 314ae0d1dca6..c0c82751fb13 100644
--- a/tools/build/cross-build/include/mac/stdlib.h
+++ b/tools/build/cross-build/include/mac/stdlib.h
@@ -42,6 +42,7 @@ __BEGIN_DECLS
int rpmatch(const char *response);
+char *secure_getenv(const char *name);
long long strtonum(const char *numstr, long long minval, long long maxval,
const char **errstrp);
diff --git a/tools/build/cross-build/secure_getenv.c b/tools/build/cross-build/secure_getenv.c
new file mode 100644
index 000000000000..466035f31a40
--- /dev/null
+++ b/tools/build/cross-build/secure_getenv.c
@@ -0,0 +1,16 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2023 Mark Johnston <markj@FreeBSD.org>
+ */
+
+#include <stdlib.h>
+#include <unistd.h>
+
+char *
+secure_getenv(const char *name)
+{
+ if (issetugid() != 0)
+ return (NULL);
+ return (getenv(name));
+}
diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh
index 39b06b45d45f..f047553c377f 100755
--- a/tools/build/depend-cleanup.sh
+++ b/tools/build/depend-cleanup.sh
@@ -28,9 +28,8 @@ fi
# $3 source extension
clean_dep()
{
- if [ -e "$OBJTOP"/$1/.depend.$2.pico ] && \
- egrep -qw "$2\.$3" "$OBJTOP"/$1/.depend.$2.pico; then \
- echo "Removing stale dependencies and objects for $2.$3"; \
+ if egrep -qw "$2\.$3" "$OBJTOP"/$1/.depend.$2.*o 2>/dev/null; then
+ echo "Removing stale dependencies and objects for $2.$3"
rm -f \
"$OBJTOP"/$1/.depend.$2.* \
"$OBJTOP"/$1/$2.*o \
@@ -90,3 +89,29 @@ fi
if [ "$MACHINE_ARCH" = "amd64" ]; then
clean_dep lib/libc bcmp c
fi
+
+# 20220524 68fe988a40ca kqueue_test binary replaced shell script
+if stat "$OBJTOP"/tests/sys/kqueue/libkqueue/*kqtest* \
+ "$OBJTOP"/tests/sys/kqueue/libkqueue/.depend.kqtest* >/dev/null 2>&1; then
+ echo "Removing old kqtest"
+ rm -f "$OBJTOP"/tests/sys/kqueue/libkqueue/.depend.* \
+ "$OBJTOP"/tests/sys/kqueue/libkqueue/*
+fi
+
+# 20221115 42d10b1b56f2 move from rs.c to rs.cc
+clean_dep usr.bin/rs rs c
+
+# 20230110 bc42155199b5 usr.sbin/zic/zic -> usr.sbin/zic
+if [ -d "$OBJTOP"/usr.sbin/zic/zic ] ; then
+ echo "Removing old zic directory"
+ rm -rf "$OBJTOP"/usr.sbin/zic/zic
+fi
+
+# 20230208 29c5f8bf9a01 move from mkmakefile.c to mkmakefile.cc
+clean_dep usr.sbin/config mkmakefile c
+# 20230209 83d7ed8af3d9 convert to main.cc and mkoptions.cc
+clean_dep usr.sbin/config main c
+clean_dep usr.sbin/config mkoptions c
+
+# 20230401 54579376c05e kqueue1 from syscall to C wrapper
+clean_dep lib/libc kqueue1 S
diff --git a/tools/build/make.py b/tools/build/make.py
index 799ea89b74b3..de159bc2bfe5 100755
--- a/tools/build/make.py
+++ b/tools/build/make.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
# PYTHON_ARGCOMPLETE_OKAY
# -
-# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+# SPDX-License-Identifier: BSD-2-Clause
#
# Copyright (c) 2018 Alex Richardson <arichardson@FreeBSD.org>
#
@@ -71,12 +71,6 @@ def bootstrap_bmake(source_root, objdir_prefix):
global new_env_vars
env.update(new_env_vars)
- if sys.platform.startswith("linux"):
- # Work around the deleted file bmake/missing/sys/cdefs.h
- # TODO: bmake should keep the compat sys/cdefs.h
- env["CFLAGS"] = "-I{src}/tools/build/cross-build/include/common " \
- "-I{src}/tools/build/cross-build/include/linux " \
- "-D_GNU_SOURCE=1".format(src=source_root)
configure_args = [
"--with-default-sys-path=" + str(bmake_install_dir / "share/mk"),
"--with-machine=amd64", # TODO? "--with-machine-arch=amd64",
@@ -267,5 +261,13 @@ if __name__ == "__main__":
shlex.quote(s) for s in [str(bmake_binary)] + bmake_args)
debug("Running `env ", env_cmd_str, " ", make_cmd_str, "`", sep="")
os.environ.update(new_env_vars)
+
+ # Fedora defines bash function wrapper for some shell commands and this
+ # makes 'which <command>' return the function's source code instead of
+ # the binary path. Undefine it to restore the original behavior.
+ os.unsetenv("BASH_FUNC_which%%")
+ os.unsetenv("BASH_FUNC_ml%%")
+ os.unsetenv("BASH_FUNC_module%%")
+
os.chdir(str(source_root))
os.execv(str(bmake_binary), [str(bmake_binary)] + bmake_args)
diff --git a/tools/build/mk/Makefile.boot b/tools/build/mk/Makefile.boot
index 138dff45930b..3bbb183021b2 100644
--- a/tools/build/mk/Makefile.boot
+++ b/tools/build/mk/Makefile.boot
@@ -35,7 +35,6 @@ LIBZ:=${WORLDTMP}/legacy/usr/lib/libz.a
CFLAGS+= -Werror=implicit-function-declaration -Werror=implicit-int \
-Werror=return-type -Wundef
CFLAGS+= -DHAVE_NBTOOL_CONFIG_H=1
-CFLAGS+= -I${SRCTOP}/tools/build/cross-build/include/common
# This is needed for code that compiles for pre-C11 C standards
CWARNFLAGS.clang+=-Wno-typedef-redefinition
# bsd.sys.mk explicitly turns on -Wsystem-headers, but that's extremely
@@ -69,6 +68,11 @@ CFLAGS+= -idirafter ${SRCTOP}/contrib/libarchive/libarchive
.endif
.endif # ${.MAKE.OS} != "FreeBSD"
+.if ${.MAKE.OS} != "FreeBSD"
+# Add the common compatibility headers after the OS-specific ones.
+CFLAGS+= -I${SRCTOP}/tools/build/cross-build/include/common
+.endif
+
# we do not want to capture dependencies referring to the above
UPDATE_DEPENDFILE= no
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 85257d41140c..20654515cfd1 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -80,44 +80,6 @@ OLD_FILES+=usr/share/man/man1/batch.1.gz
OLD_FILES+=usr/share/man/man8/atrun.8.gz
.endif
-.if ${MK_ATM} == no
-OLD_FILES+=usr/bin/sscop
-OLD_FILES+=usr/include/netnatm/addr.h
-OLD_FILES+=usr/include/netnatm/api/atmapi.h
-OLD_FILES+=usr/include/netnatm/api/ccatm.h
-OLD_FILES+=usr/include/netnatm/api/unisap.h
-OLD_DIRS+=usr/include/netnatm/api
-OLD_FILES+=usr/include/netnatm/msg/uni_config.h
-OLD_FILES+=usr/include/netnatm/msg/uni_hdr.h
-OLD_FILES+=usr/include/netnatm/msg/uni_ie.h
-OLD_FILES+=usr/include/netnatm/msg/uni_msg.h
-OLD_FILES+=usr/include/netnatm/msg/unimsglib.h
-OLD_FILES+=usr/include/netnatm/msg/uniprint.h
-OLD_FILES+=usr/include/netnatm/msg/unistruct.h
-OLD_DIRS+=usr/include/netnatm/msg
-OLD_FILES+=usr/include/netnatm/saal/sscfu.h
-OLD_FILES+=usr/include/netnatm/saal/sscfudef.h
-OLD_FILES+=usr/include/netnatm/saal/sscop.h
-OLD_FILES+=usr/include/netnatm/saal/sscopdef.h
-OLD_DIRS+=usr/include/netnatm/saal
-OLD_FILES+=usr/include/netnatm/sig/uni.h
-OLD_FILES+=usr/include/netnatm/sig/unidef.h
-OLD_FILES+=usr/include/netnatm/sig/unisig.h
-OLD_DIRS+=usr/include/netnatm/sig
-OLD_FILES+=usr/include/netnatm/unimsg.h
-OLD_FILES+=usr/lib/libngatm.a
-OLD_FILES+=usr/lib/libngatm.so
-OLD_LIBS+=usr/lib/libngatm.so.4
-OLD_FILES+=usr/lib/libngatm_p.a
-OLD_FILES+=usr/share/man/man1/sscop.1.gz
-OLD_FILES+=usr/share/man/man3/libngatm.3.gz
-OLD_FILES+=usr/share/man/man3/uniaddr.3.gz
-OLD_FILES+=usr/share/man/man3/unifunc.3.gz
-OLD_FILES+=usr/share/man/man3/unimsg.3.gz
-OLD_FILES+=usr/share/man/man3/unisap.3.gz
-OLD_FILES+=usr/share/man/man3/unistruct.3.gz
-.endif
-
.if ${MK_AUDIT} == no
OLD_FILES+=etc/rc.d/auditd
OLD_FILES+=etc/rc.d/auditdistd
@@ -178,6 +140,15 @@ OLD_FILES+=usr/share/man/man8/autounmountd.8.gz
OLD_DIRS+=etc/autofs
.endif
+.if ${MK_BEARSSL} == no
+OLD_FILES+=usr/lib/libbearssl.a
+OLD_FILES+=usr/lib/libbearssl.so
+OLD_LIBS+=usr/lib/libbearssl.so.5
+OLD_FILES+=usr/lib/libsecureboot.a
+OLD_FILES+=usr/lib/libsecureboot.so
+OLD_LIBS+=usr/lib/libsecureboot.so.5
+.endif
+
.if ${MK_BHYVE} == no
OLD_FILES+=usr/lib/libvmmapi.a
OLD_FILES+=usr/lib/libvmmapi.so
@@ -192,12 +163,10 @@ OLD_FILES+=usr/share/man/man8/bhyveload.8.gz
OLD_DIRS+=usr/share/examples/bhyve
.endif
-.if !defined(WITH_PORT_BASE_BINUTILS)
.if ${MK_LLD_IS_LD} == no
OLD_FILES+=usr/bin/ld
OLD_FILES+=usr/share/man/man1/ld.1.gz
.endif
-.endif
.if ${MK_BLACKLIST} == no
OLD_FILES+=etc/blacklistd.conf
@@ -461,9 +430,11 @@ OLD_FILES+=usr/libexec/bsdinstall/netconfig_ipv4
OLD_FILES+=usr/libexec/bsdinstall/netconfig_ipv6
OLD_FILES+=usr/libexec/bsdinstall/partedit
OLD_FILES+=usr/libexec/bsdinstall/rootpass
+OLD_FILES+=usr/libexec/bsdinstall/runconsoles
OLD_FILES+=usr/libexec/bsdinstall/script
OLD_FILES+=usr/libexec/bsdinstall/scriptedpart
OLD_FILES+=usr/libexec/bsdinstall/services
+OLD_FILES+=usr/libexec/bsdinstall/startbsdinstall
OLD_FILES+=usr/libexec/bsdinstall/time
OLD_FILES+=usr/libexec/bsdinstall/umount
OLD_FILES+=usr/libexec/bsdinstall/wlanconfig
@@ -884,14 +855,15 @@ OLD_DIRS+=usr/tests/usr.bin/calendar
.if ${MK_CASPER} == no
OLD_LIBS+=lib/libcasper.so.1
-OLD_LIBS+=lib/casper/libcap_dns.so.2
-OLD_LIBS+=lib/casper/libcap_fileargs.so.1
-OLD_LIBS+=lib/casper/libcap_grp.so.1
-OLD_LIBS+=lib/casper/libcap_net.so.1
-OLD_LIBS+=lib/casper/libcap_pwd.so.1
-OLD_LIBS+=lib/casper/libcap_sysctl.so.1
-OLD_LIBS+=lib/casper/libcap_sysctl.so.2
-OLD_LIBS+=lib/casper/libcap_syslog.so.1
+OLD_LIBS+=lib/libcap_dns.so.2
+OLD_LIBS+=lib/libcap_fileargs.so.1
+OLD_LIBS+=lib/libcap_grp.so.1
+OLD_LIBS+=lib/libcap_net.so.1
+OLD_LIBS+=lib/libcap_netdb.so.1
+OLD_LIBS+=lib/libcap_pwd.so.1
+OLD_LIBS+=lib/libcap_sysctl.so.1
+OLD_LIBS+=lib/libcap_sysctl.so.2
+OLD_LIBS+=lib/libcap_syslog.so.1
.endif
.if ${MK_CCD} == no
@@ -902,13 +874,9 @@ OLD_FILES+=usr/share/man/man4/ccd.4.gz
OLD_FILES+=usr/share/man/man8/ccdconfig.8.gz
.endif
-.if ${MK_CDDL} == no
-OLD_LIBS+=lib/libavl.so.2
+.if ${MK_DTRACE} == no
OLD_LIBS+=lib/libctf.so.2
OLD_LIBS+=lib/libdtrace.so.2
-OLD_LIBS+=lib/libnvpair.so.2
-OLD_LIBS+=lib/libumem.so.2
-OLD_LIBS+=lib/libuutil.so.2
OLD_FILES+=usr/bin/ctfconvert
OLD_FILES+=usr/bin/ctfdump
OLD_FILES+=usr/bin/ctfmerge
@@ -916,6 +884,7 @@ OLD_FILES+=usr/lib/dtrace/drti.o
OLD_FILES+=usr/lib/dtrace/errno.d
OLD_FILES+=usr/lib/dtrace/io.d
OLD_FILES+=usr/lib/dtrace/ip.d
+OLD_FILES+=usr/lib/dtrace/ipfw.d
OLD_FILES+=usr/lib/dtrace/mbuf.d
OLD_FILES+=usr/lib/dtrace/psinfo.d
.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
@@ -929,24 +898,12 @@ OLD_FILES+=usr/lib/dtrace/tcp.d
OLD_FILES+=usr/lib/dtrace/udp.d
OLD_FILES+=usr/lib/dtrace/udplite.d
OLD_FILES+=usr/lib/dtrace/unistd.d
-OLD_FILES+=usr/lib/libavl.a
-OLD_FILES+=usr/lib/libavl.so
-OLD_FILES+=usr/lib/libavl_p.a
OLD_FILES+=usr/lib/libctf.a
OLD_FILES+=usr/lib/libctf.so
OLD_FILES+=usr/lib/libctf_p.a
OLD_FILES+=usr/lib/libdtrace.a
OLD_FILES+=usr/lib/libdtrace.so
OLD_FILES+=usr/lib/libdtrace_p.a
-OLD_FILES+=usr/lib/libnvpair.a
-OLD_FILES+=usr/lib/libnvpair.so
-OLD_FILES+=usr/lib/libnvpair_p.a
-OLD_FILES+=usr/lib/libumem.a
-OLD_FILES+=usr/lib/libumem.so
-OLD_FILES+=usr/lib/libumem_p.a
-OLD_FILES+=usr/lib/libuutil.a
-OLD_FILES+=usr/lib/libuutil.so
-OLD_FILES+=usr/lib/libuutil_p.a
OLD_LIBS+=lib/libdtrace.so.2
OLD_FILES+=usr/libexec/dwatch/chmod
OLD_FILES+=usr/libexec/dwatch/errno
@@ -1080,6 +1037,10 @@ OLD_FILES+=etc/periodic/daily/404.status-zfs
OLD_FILES+=etc/periodic/daily/800.scrub-zfs
OLD_FILES+=etc/zfs/exports
OLD_DIRS+=etc/zfs
+OLD_LIBS+=lib/libavl.so.2
+OLD_LIBS+=lib/libnvpair.so.2
+OLD_LIBS+=lib/libumem.so.2
+OLD_LIBS+=lib/libuutil.so.2
OLD_LIBS+=lib/libzfs.so.2
OLD_LIBS+=lib/libzfs.so.3
OLD_LIBS+=lib/libzfs_core.so.2
@@ -1098,6 +1059,18 @@ OLD_FILES+=usr/lib/libbe.a
OLD_FILES+=usr/lib/libbe_p.a
OLD_FILES+=usr/lib/libbe.so
OLD_LIBS+=lib/libbe.so.1
+OLD_FILES+=usr/lib/libavl.a
+OLD_FILES+=usr/lib/libavl.so
+OLD_FILES+=usr/lib/libavl_p.a
+OLD_FILES+=usr/lib/libnvpair.a
+OLD_FILES+=usr/lib/libnvpair.so
+OLD_FILES+=usr/lib/libnvpair_p.a
+OLD_FILES+=usr/lib/libumem.a
+OLD_FILES+=usr/lib/libumem.so
+OLD_FILES+=usr/lib/libumem_p.a
+OLD_FILES+=usr/lib/libuutil.a
+OLD_FILES+=usr/lib/libuutil.so
+OLD_FILES+=usr/lib/libuutil_p.a
OLD_FILES+=usr/lib/libzfs.a
OLD_FILES+=usr/lib/libzfs.so
OLD_FILES+=usr/lib/libzfs_core.a
@@ -1171,6 +1144,7 @@ OLD_FILES+=usr/bin/llvm-readobj
OLD_FILES+=usr/bin/llvm-size
OLD_FILES+=usr/bin/llvm-strings
OLD_FILES+=usr/bin/llvm-symbolizer
+OLD_FILES+=usr/bin/objdump
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
@@ -1181,321 +1155,335 @@ OLD_FILES+=usr/share/man/man1/llvm-readobj.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
+OLD_FILES+=usr/share/man/man1/objdump.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/14.0.5/include/cuda_wrappers/algorithm
-OLD_FILES+=usr/lib/clang/14.0.5/include/cuda_wrappers/complex
-OLD_FILES+=usr/lib/clang/14.0.5/include/cuda_wrappers/new
-OLD_DIRS+=usr/lib/clang/14.0.5/include/cuda_wrappers
-OLD_FILES+=usr/lib/clang/14.0.5/include/fuzzer/FuzzedDataProvider.h
-OLD_DIRS+=usr/lib/clang/14.0.5/include/fuzzer
-OLD_FILES+=usr/lib/clang/14.0.5/include/openmp_wrappers/__clang_openmp_device_functions.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/openmp_wrappers/cmath
-OLD_FILES+=usr/lib/clang/14.0.5/include/openmp_wrappers/complex
-OLD_FILES+=usr/lib/clang/14.0.5/include/openmp_wrappers/complex.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/openmp_wrappers/complex_cmath.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/openmp_wrappers/math.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/openmp_wrappers/new
-OLD_DIRS+=usr/lib/clang/14.0.5/include/openmp_wrappers
-OLD_FILES+=usr/lib/clang/14.0.5/include/ppc_wrappers/emmintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/ppc_wrappers/mm_malloc.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/ppc_wrappers/mmintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/ppc_wrappers/pmmintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/ppc_wrappers/smmintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/ppc_wrappers/tmmintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/ppc_wrappers/xmmintrin.h
-OLD_DIRS+=usr/lib/clang/14.0.5/include/ppc_wrappers
-OLD_FILES+=usr/lib/clang/14.0.5/include/profile/InstrProfData.inc
-OLD_FILES+=usr/lib/clang/14.0.5/include/profile/MemProfData.inc
-OLD_DIRS+=usr/lib/clang/14.0.5/include/profile
-OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/allocator_interface.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/asan_interface.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/common_interface_defs.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/coverage_interface.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/dfsan_interface.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/hwasan_interface.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/linux_syscall_hooks.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/lsan_interface.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/memprof_interface.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/msan_interface.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/netbsd_syscall_hooks.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/scudo_interface.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/tsan_interface.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/tsan_interface_atomic.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/sanitizer/ubsan_interface.h
-OLD_DIRS+=usr/lib/clang/14.0.5/include/sanitizer
-OLD_FILES+=usr/lib/clang/14.0.5/include/xray/xray_interface.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/xray/xray_log_interface.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/xray/xray_records.h
-OLD_DIRS+=usr/lib/clang/14.0.5/include/xray
-OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_builtin_vars.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_cmath.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_complex_builtins.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_device_functions.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_intrinsics.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_libdevice_declares.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_math.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_math_forward_declares.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_runtime_wrapper.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_cuda_texture_intrinsics.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_hip_cmath.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_hip_libdevice_declares.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_hip_math.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/__clang_hip_runtime_wrapper.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/__stddef_max_align_t.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/__wmmintrin_aes.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/__wmmintrin_pclmul.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/adxintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/altivec.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/ammintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/amxintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/arm64intr.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/arm_acle.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/arm_bf16.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/arm_cde.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/arm_cmse.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/arm_fp16.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/arm_mve.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/arm_neon.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/arm_neon_sve_bridge.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/arm_sve.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/armintr.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/avx2intrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/avx512bf16intrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/avx512bitalgintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/avx512bwintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/avx512cdintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/avx512dqintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/avx512erintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/avx512fintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/avx512fp16intrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/avx512ifmaintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/avx512ifmavlintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/avx512pfintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vbmi2intrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vbmiintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vbmivlintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlbf16intrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlbitalgintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlbwintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlcdintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vldqintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlfp16intrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlvbmi2intrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlvnniintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vlvp2intersectintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vnniintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vp2intersectintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vpopcntdqintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/avx512vpopcntdqvlintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/avxintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/avxvnniintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/bmi2intrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/bmiintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/builtins.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/cet.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/cetintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/cldemoteintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/clflushoptintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/clwbintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/clzerointrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/cpuid.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/crc32intrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/emmintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/enqcmdintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/f16cintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/float.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/fma4intrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/fmaintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/fxsrintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/gfniintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/hexagon_circ_brev_intrinsics.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/hexagon_protos.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/hexagon_types.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/hresetintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/htmintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/htmxlintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/hvx_hexagon_protos.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/ia32intrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/immintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/intrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/inttypes.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/invpcidintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/iso646.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/keylockerintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/limits.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/lwpintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/lzcntintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/mm3dnow.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/mm_malloc.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/mmintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/module.modulemap
-OLD_FILES+=usr/lib/clang/14.0.5/include/movdirintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/msa.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/mwaitxintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/nmmintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/omp-tools.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/omp.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/ompt.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/opencl-c-base.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/opencl-c.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/pconfigintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/pkuintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/pmmintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/popcntintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/prfchwintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/ptwriteintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/rdseedintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/riscv_vector.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/rtmintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/s390intrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/serializeintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/sgxintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/shaintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/smmintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/stdalign.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/stdarg.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/stdatomic.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/stdbool.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/stddef.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/stdint.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/stdnoreturn.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/tbmintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/tgmath.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/tmmintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/tsxldtrkintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/uintrintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/unwind.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/vadefs.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/vaesintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/varargs.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/vecintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/vpclmulqdqintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/waitpkgintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/wasm_simd128.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/wbnoinvdintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/wmmintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/x86gprintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/x86intrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/xmmintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/xopintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/xsavecintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/xsaveintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/xsaveoptintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/xsavesintrin.h
-OLD_FILES+=usr/lib/clang/14.0.5/include/xtestintrin.h
-OLD_DIRS+=usr/lib/clang/14.0.5/include
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-aarch64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-aarch64.so
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-arm.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-arm.so
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-armhf.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-armhf.so
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-i386.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-i386.so
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-arm.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-armhf.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-i386.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-x86_64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan-x86_64.so
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-arm.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-armhf.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-i386.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_static-i386.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.asan_static-x86_64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi-aarch64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi-arm.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi-armhf.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi-i386.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi-x86_64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi_diag-arm.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi_diag-armhf.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi_diag-i386.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.dd-aarch64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.dd-x86_64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.fuzzer-aarch64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.fuzzer-x86_64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.fuzzer_interceptors-x86_64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.msan-aarch64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.msan-x86_64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-aarch64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-arm.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-armhf.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-i386.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-powerpc.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-powerpc64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-powerpc64le.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.profile-x86_64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.safestack-aarch64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.safestack-i386.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.safestack-x86_64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-aarch64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-arm.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-armhf.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-i386.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats-x86_64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-aarch64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-arm.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-armhf.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-i386.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.stats_client-x86_64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan-aarch64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan-x86_64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-aarch64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-arm.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-armhf.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-basic-aarch64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-basic-arm.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-basic-armhf.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-basic-x86_64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-fdr-arm.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-fdr-armhf.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-profiling-arm.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-profiling-armhf.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
-OLD_FILES+=usr/lib/clang/14.0.5/lib/freebsd/libclang_rt.xray-x86_64.a
-OLD_DIRS+=usr/lib/clang/14.0.5/lib/freebsd
-OLD_DIRS+=usr/lib/clang/14.0.5/lib
-OLD_FILES+=usr/lib/clang/14.0.5/share/asan_ignorelist.txt
-OLD_FILES+=usr/lib/clang/14.0.5/share/cfi_ignorelist.txt
-OLD_FILES+=usr/lib/clang/14.0.5/share/msan_ignorelist.txt
-OLD_DIRS+=usr/lib/clang/14.0.5/share
-OLD_DIRS+=usr/lib/clang/14.0.5
+OLD_FILES+=usr/lib/clang/15.0.7/include/cuda_wrappers/algorithm
+OLD_FILES+=usr/lib/clang/15.0.7/include/cuda_wrappers/complex
+OLD_FILES+=usr/lib/clang/15.0.7/include/cuda_wrappers/new
+OLD_DIRS+=usr/lib/clang/15.0.7/include/cuda_wrappers
+OLD_FILES+=usr/lib/clang/15.0.7/include/fuzzer/FuzzedDataProvider.h
+OLD_DIRS+=usr/lib/clang/15.0.7/include/fuzzer
+OLD_FILES+=usr/lib/clang/15.0.7/include/hlsl/hlsl_basic_types.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/hlsl/hlsl_intrinsics.h
+OLD_DIRS+=usr/lib/clang/15.0.7/include/hlsl
+OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/__clang_openmp_device_functions.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/cmath
+OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/complex
+OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/complex.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/complex_cmath.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/math.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/openmp_wrappers/new
+OLD_DIRS+=usr/lib/clang/15.0.7/include/openmp_wrappers
+OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/bmi2intrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/bmiintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/emmintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/immintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/mm_malloc.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/mmintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/pmmintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/smmintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/tmmintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/x86gprintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/x86intrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/ppc_wrappers/xmmintrin.h
+OLD_DIRS+=usr/lib/clang/15.0.7/include/ppc_wrappers
+OLD_FILES+=usr/lib/clang/15.0.7/include/profile/InstrProfData.inc
+OLD_FILES+=usr/lib/clang/15.0.7/include/profile/MemProfData.inc
+OLD_DIRS+=usr/lib/clang/15.0.7/include/profile
+OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/allocator_interface.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/asan_interface.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/common_interface_defs.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/coverage_interface.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/dfsan_interface.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/hwasan_interface.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/linux_syscall_hooks.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/lsan_interface.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/memprof_interface.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/msan_interface.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/netbsd_syscall_hooks.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/scudo_interface.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/tsan_interface.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/tsan_interface_atomic.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/sanitizer/ubsan_interface.h
+OLD_DIRS+=usr/lib/clang/15.0.7/include/sanitizer
+OLD_FILES+=usr/lib/clang/15.0.7/include/xray/xray_interface.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/xray/xray_log_interface.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/xray/xray_records.h
+OLD_DIRS+=usr/lib/clang/15.0.7/include/xray
+OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_builtin_vars.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_cmath.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_complex_builtins.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_device_functions.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_intrinsics.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_libdevice_declares.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_math.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_math_forward_declares.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_runtime_wrapper.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_cuda_texture_intrinsics.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_hip_cmath.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_hip_libdevice_declares.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_hip_math.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/__clang_hip_runtime_wrapper.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/__stddef_max_align_t.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/__wmmintrin_aes.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/__wmmintrin_pclmul.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/adxintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/altivec.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/ammintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/amxintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/arm64intr.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/arm_acle.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/arm_bf16.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/arm_cde.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/arm_cmse.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/arm_fp16.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/arm_mve.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/arm_neon.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/arm_neon_sve_bridge.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/arm_sve.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/armintr.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/avx2intrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/avx512bf16intrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/avx512bitalgintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/avx512bwintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/avx512cdintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/avx512dqintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/avx512erintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/avx512fintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/avx512fp16intrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/avx512ifmaintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/avx512ifmavlintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/avx512pfintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vbmi2intrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vbmiintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vbmivlintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlbf16intrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlbitalgintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlbwintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlcdintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vldqintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlfp16intrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlvbmi2intrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlvnniintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vlvp2intersectintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vnniintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vp2intersectintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vpopcntdqintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/avx512vpopcntdqvlintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/avxintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/avxvnniintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/bmi2intrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/bmiintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/builtins.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/cet.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/cetintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/cldemoteintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/clflushoptintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/clwbintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/clzerointrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/cpuid.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/crc32intrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/emmintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/enqcmdintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/f16cintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/float.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/fma4intrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/fmaintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/fxsrintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/gfniintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/hexagon_circ_brev_intrinsics.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/hexagon_protos.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/hexagon_types.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/hlsl.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/hresetintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/htmintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/htmxlintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/hvx_hexagon_protos.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/ia32intrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/immintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/intrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/inttypes.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/invpcidintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/iso646.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/keylockerintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/limits.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/lwpintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/lzcntintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/mm3dnow.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/mm_malloc.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/mmintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/module.modulemap
+OLD_FILES+=usr/lib/clang/15.0.7/include/movdirintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/msa.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/mwaitxintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/nmmintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/omp-tools.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/omp.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/ompt.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/opencl-c-base.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/opencl-c.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/pconfigintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/pkuintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/pmmintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/popcntintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/prfchwintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/ptwriteintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/rdpruintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/rdseedintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/riscv_vector.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/rtmintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/s390intrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/serializeintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/sgxintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/shaintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/smmintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/stdalign.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/stdarg.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/stdatomic.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/stdbool.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/stddef.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/stdint.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/stdnoreturn.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/tbmintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/tgmath.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/tmmintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/tsxldtrkintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/uintrintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/unwind.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/vadefs.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/vaesintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/varargs.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/vecintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/velintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/velintrin_approx.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/velintrin_gen.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/vpclmulqdqintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/waitpkgintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/wasm_simd128.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/wbnoinvdintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/wmmintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/x86gprintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/x86intrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/xmmintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/xopintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/xsavecintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/xsaveintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/xsaveoptintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/xsavesintrin.h
+OLD_FILES+=usr/lib/clang/15.0.7/include/xtestintrin.h
+OLD_DIRS+=usr/lib/clang/15.0.7/include
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-aarch64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-aarch64.so
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-arm.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-arm.so
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-armhf.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-armhf.so
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-i386.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-i386.so
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-aarch64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-arm.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-armhf.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-i386.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-preinit-x86_64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-x86_64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan-x86_64.so
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-aarch64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-arm.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-armhf.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-i386.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_cxx-x86_64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_static-i386.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.asan_static-x86_64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi-aarch64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi-arm.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi-armhf.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi-i386.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi-x86_64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi_diag-aarch64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi_diag-arm.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi_diag-armhf.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi_diag-i386.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.cfi_diag-x86_64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.dd-aarch64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.dd-x86_64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.fuzzer-aarch64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.fuzzer-x86_64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.fuzzer_interceptors-x86_64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.fuzzer_no_main-aarch64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.fuzzer_no_main-x86_64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan-aarch64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan-x86_64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan_cxx-aarch64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.msan_cxx-x86_64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-aarch64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-arm.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-armhf.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-i386.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-powerpc.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-powerpc64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-powerpc64le.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.profile-x86_64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.safestack-aarch64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.safestack-i386.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.safestack-x86_64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-aarch64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-arm.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-armhf.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-i386.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats-x86_64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-aarch64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-arm.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-armhf.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-i386.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.stats_client-x86_64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan-aarch64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan-x86_64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan_cxx-aarch64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.tsan_cxx-x86_64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-aarch64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-arm.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-armhf.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-i386.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_minimal-x86_64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-aarch64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-arm.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-armhf.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-i386.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone-x86_64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-aarch64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-arm.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-armhf.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-i386.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.ubsan_standalone_cxx-x86_64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-aarch64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-arm.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-armhf.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-basic-aarch64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-basic-arm.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-basic-armhf.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-basic-x86_64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-fdr-aarch64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-fdr-arm.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-fdr-armhf.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-fdr-x86_64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-profiling-aarch64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-profiling-arm.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-profiling-armhf.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-profiling-x86_64.a
+OLD_FILES+=usr/lib/clang/15.0.7/lib/freebsd/libclang_rt.xray-x86_64.a
+OLD_DIRS+=usr/lib/clang/15.0.7/lib/freebsd
+OLD_DIRS+=usr/lib/clang/15.0.7/lib
+OLD_FILES+=usr/lib/clang/15.0.7/share/asan_ignorelist.txt
+OLD_FILES+=usr/lib/clang/15.0.7/share/cfi_ignorelist.txt
+OLD_FILES+=usr/lib/clang/15.0.7/share/msan_ignorelist.txt
+OLD_DIRS+=usr/lib/clang/15.0.7/share
+OLD_DIRS+=usr/lib/clang/15.0.7
OLD_DIRS+=usr/lib/clang
OLD_FILES+=usr/share/doc/llvm/clang/LICENSE.TXT
OLD_DIRS+=usr/share/doc/llvm/clang
@@ -1738,7 +1726,6 @@ OLD_FILES+=usr/share/examples/etc/login.access
OLD_FILES+=usr/share/examples/etc/make.conf
OLD_FILES+=usr/share/examples/etc/rc.bsdextended
OLD_FILES+=usr/share/examples/etc/rc.firewall
-OLD_FILES+=usr/share/examples/etc/rc.sendmail
OLD_FILES+=usr/share/examples/etc/termcap.small
OLD_FILES+=usr/share/examples/etc/wpa_supplicant.conf
OLD_FILES+=usr/share/examples/find_interface/Makefile
@@ -2038,7 +2025,7 @@ OLD_FILES+=usr/share/man/man5/freebsd-update.conf.5.gz
OLD_FILES+=usr/share/man/man8/freebsd-update.8.gz
.endif
-.if ${MK_FREEBSD_UPDATE} == no && ${MK_PORTSNAP} == no
+.if ${MK_FREEBSD_UPDATE} == no
OLD_FILES+=usr/libexec/phttpget
OLD_FILES+=usr/share/man/man8/phttpget.8.gz
.endif
@@ -2088,7 +2075,7 @@ OLD_FILES+=usr/share/man/man8/strfile.8.gz
OLD_FILES+=usr/share/man/man8/unstr.8.gz
.endif
-.if ${MK_LLVM_COV} == no && !defined(WITH_PORT_BASE_GCC)
+.if ${MK_LLVM_COV} == no
OLD_FILES+=usr/bin/gcov
OLD_FILES+=usr/share/man/man1/gcov.1.gz
.endif
@@ -2455,6 +2442,52 @@ OLD_FILES+=usr/bin/mkcsmapper
OLD_FILES+=usr/bin/mkesdb
OLD_FILES+=usr/include/_libiconv_compat.h
OLD_FILES+=usr/include/iconv.h
+OLD_LIBS+=usr/lib/i18n/libBIG5.so.5
+OLD_FILES+=usr/lib/i18n/libBIG5.so
+OLD_LIBS+=usr/lib/i18n/libDECHanyu.so.5
+OLD_FILES+=usr/lib/i18n/libDECHanyu.so
+OLD_LIBS+=usr/lib/i18n/libEUC.so.5
+OLD_FILES+=usr/lib/i18n/libEUC.so
+OLD_LIBS+=usr/lib/i18n/libEUCTW.so.5
+OLD_FILES+=usr/lib/i18n/libEUCTW.so
+OLD_LIBS+=usr/lib/i18n/libGBK2K.so.5
+OLD_FILES+=usr/lib/i18n/libGBK2K.so
+OLD_LIBS+=usr/lib/i18n/libHZ.so.5
+OLD_FILES+=usr/lib/i18n/libHZ.so
+OLD_LIBS+=usr/lib/i18n/libISO2022.so.5
+OLD_FILES+=usr/lib/i18n/libISO2022.so
+OLD_LIBS+=usr/lib/i18n/libJOHAB.so.5
+OLD_FILES+=usr/lib/i18n/libJOHAB.so
+OLD_LIBS+=usr/lib/i18n/libMSKanji.so.5
+OLD_FILES+=usr/lib/i18n/libMSKanji.so
+OLD_LIBS+=usr/lib/i18n/libUES.so.5
+OLD_FILES+=usr/lib/i18n/libUES.so
+OLD_LIBS+=usr/lib/i18n/libUTF1632.so.5
+OLD_FILES+=usr/lib/i18n/libUTF1632.so
+OLD_LIBS+=usr/lib/i18n/libUTF7.so.5
+OLD_FILES+=usr/lib/i18n/libUTF7.so
+OLD_LIBS+=usr/lib/i18n/libUTF8.so.5
+OLD_FILES+=usr/lib/i18n/libUTF8.so
+OLD_LIBS+=usr/lib/i18n/libVIQR.so.5
+OLD_FILES+=usr/lib/i18n/libVIQR.so
+OLD_LIBS+=usr/lib/i18n/libZW.so.5
+OLD_FILES+=usr/lib/i18n/libZW.so
+OLD_LIBS+=usr/lib/i18n/libiconv_none.so.5
+OLD_FILES+=usr/lib/i18n/libiconv_none.so
+OLD_LIBS+=usr/lib/i18n/libiconv_std.so.5
+OLD_FILES+=usr/lib/i18n/libiconv_std.so
+OLD_LIBS+=usr/lib/i18n/libmapper_646.so.5
+OLD_FILES+=usr/lib/i18n/libmapper_646.so
+OLD_LIBS+=usr/lib/i18n/libmapper_none.so.5
+OLD_FILES+=usr/lib/i18n/libmapper_none.so
+OLD_LIBS+=usr/lib/i18n/libmapper_parallel.so.5
+OLD_FILES+=usr/lib/i18n/libmapper_parallel.so
+OLD_LIBS+=usr/lib/i18n/libmapper_serial.so.5
+OLD_FILES+=usr/lib/i18n/libmapper_serial.so
+OLD_LIBS+=usr/lib/i18n/libmapper_std.so.5
+OLD_FILES+=usr/lib/i18n/libmapper_std.so
+OLD_LIBS+=usr/lib/i18n/libmapper_zone.so.5
+OLD_FILES+=usr/lib/i18n/libmapper_zone.so
OLD_FILES+=usr/share/man/man1/iconv.1.gz
OLD_FILES+=usr/share/man/man1/mkcsmapper.1.gz
OLD_FILES+=usr/share/man/man1/mkesdb.1.gz
@@ -2468,6 +2501,7 @@ OLD_FILES+=usr/share/man/man3/iconv_open.3.gz
OLD_FILES+=usr/share/man/man3/iconv_open_into.3.gz
OLD_FILES+=usr/share/man/man3/iconvctl.3.gz
OLD_FILES+=usr/share/man/man3/iconvlist.3.gz
+OLD_DIRS+=usr/lib/i18n
OLD_DIRS+=usr/share/i18n
OLD_DIRS+=usr/share/i18n/esdb
OLD_DIRS+=usr/share/i18n/esdb/ISO-2022
@@ -3660,560 +3694,6 @@ OLD_LIBS+=${DEBUG_LIB32_LIBS}
. endif
.endif
-.if ${MK_CXX} == no
-OLD_LIBS+=lib/libcxxrt.so.1
-OLD_FILES+=usr/lib/libc++.a
-OLD_FILES+=usr/lib/libc++_p.a
-OLD_FILES+=usr/lib/libc++experimental.a
-OLD_FILES+=usr/lib/libc++.so
-OLD_LIBS+=usr/lib/libc++.so.1
-OLD_FILES+=usr/lib/libcxxrt.a
-OLD_FILES+=usr/lib/libcxxrt.so
-OLD_FILES+=usr/lib/libcxxrt_p.a
-OLD_FILES+=usr/include/c++/v1/__algorithm/adjacent_find.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/all_of.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/any_of.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/binary_search.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/clamp.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/comp.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/comp_ref_type.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/copy.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/copy_backward.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/copy_if.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/copy_n.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/count.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/count_if.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/equal.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/equal_range.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/fill.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/fill_n.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/find.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/find_end.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/find_first_of.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/find_if.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/find_if_not.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/for_each.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/for_each_n.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/generate.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/generate_n.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/half_positive.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/in_in_out_result.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/in_in_result.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/in_out_result.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/includes.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/inplace_merge.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/is_heap.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/is_heap_until.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/is_partitioned.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/is_permutation.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/is_sorted.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/is_sorted_until.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/iter_swap.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/lexicographical_compare.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/lower_bound.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/make_heap.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/max.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/max_element.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/merge.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/min.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/min_element.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/minmax.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/minmax_element.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/mismatch.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/move.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/move_backward.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/next_permutation.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/none_of.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/nth_element.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/partial_sort.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/partial_sort_copy.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/partition.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/partition_copy.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/partition_point.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/pop_heap.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/prev_permutation.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/push_heap.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/remove.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/remove_copy.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/remove_copy_if.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/remove_if.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/replace.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/replace_copy.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/replace_copy_if.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/replace_if.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/reverse.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/reverse_copy.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/rotate.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/rotate_copy.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/sample.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/search.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/search_n.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/set_difference.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/set_intersection.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/set_symmetric_difference.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/set_union.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/shift_left.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/shift_right.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/shuffle.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/sift_down.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/sort.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/sort_heap.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/stable_partition.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/stable_sort.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/swap_ranges.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/transform.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/unique.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/unique_copy.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/unwrap_iter.h
-OLD_FILES+=usr/include/c++/v1/__algorithm/upper_bound.h
-OLD_DIRS+=usr/include/c++/v1/__algorithm
-OLD_FILES+=usr/include/c++/v1/__availability
-OLD_FILES+=usr/include/c++/v1/__bit/bit_cast.h
-OLD_FILES+=usr/include/c++/v1/__bit/byteswap.h
-OLD_DIRS+=usr/include/c++/v1/__bit
-OLD_FILES+=usr/include/c++/v1/__bit_reference
-OLD_FILES+=usr/include/c++/v1/__bits
-OLD_FILES+=usr/include/c++/v1/__bsd_locale_defaults.h
-OLD_FILES+=usr/include/c++/v1/__bsd_locale_fallbacks.h
-OLD_FILES+=usr/include/c++/v1/__charconv/chars_format.h
-OLD_FILES+=usr/include/c++/v1/__charconv/from_chars_result.h
-OLD_FILES+=usr/include/c++/v1/__charconv/to_chars_result.h
-OLD_DIRS+=usr/include/c++/v1/__charconv
-OLD_FILES+=usr/include/c++/v1/__chrono/calendar.h
-OLD_FILES+=usr/include/c++/v1/__chrono/convert_to_timespec.h
-OLD_FILES+=usr/include/c++/v1/__chrono/duration.h
-OLD_FILES+=usr/include/c++/v1/__chrono/file_clock.h
-OLD_FILES+=usr/include/c++/v1/__chrono/high_resolution_clock.h
-OLD_FILES+=usr/include/c++/v1/__chrono/steady_clock.h
-OLD_FILES+=usr/include/c++/v1/__chrono/system_clock.h
-OLD_FILES+=usr/include/c++/v1/__chrono/time_point.h
-OLD_DIRS+=usr/include/c++/v1/__chrono
-OLD_FILES+=usr/include/c++/v1/__compare/common_comparison_category.h
-OLD_FILES+=usr/include/c++/v1/__compare/compare_partial_order_fallback.h
-OLD_FILES+=usr/include/c++/v1/__compare/compare_strong_order_fallback.h
-OLD_FILES+=usr/include/c++/v1/__compare/compare_three_way.h
-OLD_FILES+=usr/include/c++/v1/__compare/compare_three_way_result.h
-OLD_FILES+=usr/include/c++/v1/__compare/compare_weak_order_fallback.h
-OLD_FILES+=usr/include/c++/v1/__compare/is_eq.h
-OLD_FILES+=usr/include/c++/v1/__compare/ordering.h
-OLD_FILES+=usr/include/c++/v1/__compare/partial_order.h
-OLD_FILES+=usr/include/c++/v1/__compare/strong_order.h
-OLD_FILES+=usr/include/c++/v1/__compare/synth_three_way.h
-OLD_FILES+=usr/include/c++/v1/__compare/three_way_comparable.h
-OLD_FILES+=usr/include/c++/v1/__compare/weak_order.h
-OLD_DIRS+=usr/include/c++/v1/__compare
-OLD_FILES+=usr/include/c++/v1/__concepts/arithmetic.h
-OLD_FILES+=usr/include/c++/v1/__concepts/assignable.h
-OLD_FILES+=usr/include/c++/v1/__concepts/boolean_testable.h
-OLD_FILES+=usr/include/c++/v1/__concepts/class_or_enum.h
-OLD_FILES+=usr/include/c++/v1/__concepts/common_reference_with.h
-OLD_FILES+=usr/include/c++/v1/__concepts/common_with.h
-OLD_FILES+=usr/include/c++/v1/__concepts/constructible.h
-OLD_FILES+=usr/include/c++/v1/__concepts/convertible_to.h
-OLD_FILES+=usr/include/c++/v1/__concepts/copyable.h
-OLD_FILES+=usr/include/c++/v1/__concepts/derived_from.h
-OLD_FILES+=usr/include/c++/v1/__concepts/destructible.h
-OLD_FILES+=usr/include/c++/v1/__concepts/different_from.h
-OLD_FILES+=usr/include/c++/v1/__concepts/equality_comparable.h
-OLD_FILES+=usr/include/c++/v1/__concepts/invocable.h
-OLD_FILES+=usr/include/c++/v1/__concepts/movable.h
-OLD_FILES+=usr/include/c++/v1/__concepts/predicate.h
-OLD_FILES+=usr/include/c++/v1/__concepts/regular.h
-OLD_FILES+=usr/include/c++/v1/__concepts/relation.h
-OLD_FILES+=usr/include/c++/v1/__concepts/same_as.h
-OLD_FILES+=usr/include/c++/v1/__concepts/semiregular.h
-OLD_FILES+=usr/include/c++/v1/__concepts/swappable.h
-OLD_FILES+=usr/include/c++/v1/__concepts/totally_ordered.h
-OLD_DIRS+=usr/include/c++/v1/__concepts
-OLD_FILES+=usr/include/c++/v1/__config
-OLD_FILES+=usr/include/c++/v1/__config_site
-OLD_FILES+=usr/include/c++/v1/__coroutine/coroutine_handle.h
-OLD_FILES+=usr/include/c++/v1/__coroutine/coroutine_traits.h
-OLD_FILES+=usr/include/c++/v1/__coroutine/noop_coroutine_handle.h
-OLD_FILES+=usr/include/c++/v1/__coroutine/trivial_awaitables.h
-OLD_DIRS+=usr/include/c++/v1/__coroutine
-OLD_FILES+=usr/include/c++/v1/__debug
-OLD_FILES+=usr/include/c++/v1/__errc
-OLD_FILES+=usr/include/c++/v1/__filesystem/copy_options.h
-OLD_FILES+=usr/include/c++/v1/__filesystem/directory_entry.h
-OLD_FILES+=usr/include/c++/v1/__filesystem/directory_iterator.h
-OLD_FILES+=usr/include/c++/v1/__filesystem/directory_options.h
-OLD_FILES+=usr/include/c++/v1/__filesystem/file_status.h
-OLD_FILES+=usr/include/c++/v1/__filesystem/file_time_type.h
-OLD_FILES+=usr/include/c++/v1/__filesystem/file_type.h
-OLD_FILES+=usr/include/c++/v1/__filesystem/filesystem_error.h
-OLD_FILES+=usr/include/c++/v1/__filesystem/operations.h
-OLD_FILES+=usr/include/c++/v1/__filesystem/path.h
-OLD_FILES+=usr/include/c++/v1/__filesystem/path_iterator.h
-OLD_FILES+=usr/include/c++/v1/__filesystem/perm_options.h
-OLD_FILES+=usr/include/c++/v1/__filesystem/perms.h
-OLD_FILES+=usr/include/c++/v1/__filesystem/recursive_directory_iterator.h
-OLD_FILES+=usr/include/c++/v1/__filesystem/space_info.h
-OLD_FILES+=usr/include/c++/v1/__filesystem/u8path.h
-OLD_DIRS+=usr/include/c++/v1/__filesystem
-OLD_FILES+=usr/include/c++/v1/__format/format_arg.h
-OLD_FILES+=usr/include/c++/v1/__format/format_args.h
-OLD_FILES+=usr/include/c++/v1/__format/format_context.h
-OLD_FILES+=usr/include/c++/v1/__format/format_error.h
-OLD_FILES+=usr/include/c++/v1/__format/format_fwd.h
-OLD_FILES+=usr/include/c++/v1/__format/format_parse_context.h
-OLD_FILES+=usr/include/c++/v1/__format/format_string.h
-OLD_FILES+=usr/include/c++/v1/__format/format_to_n_result.h
-OLD_FILES+=usr/include/c++/v1/__format/formatter.h
-OLD_FILES+=usr/include/c++/v1/__format/formatter_bool.h
-OLD_FILES+=usr/include/c++/v1/__format/formatter_char.h
-OLD_FILES+=usr/include/c++/v1/__format/formatter_floating_point.h
-OLD_FILES+=usr/include/c++/v1/__format/formatter_integer.h
-OLD_FILES+=usr/include/c++/v1/__format/formatter_integral.h
-OLD_FILES+=usr/include/c++/v1/__format/formatter_pointer.h
-OLD_FILES+=usr/include/c++/v1/__format/formatter_string.h
-OLD_FILES+=usr/include/c++/v1/__format/parser_std_format_spec.h
-OLD_DIRS+=usr/include/c++/v1/__format
-OLD_FILES+=usr/include/c++/v1/__functional/binary_function.h
-OLD_FILES+=usr/include/c++/v1/__functional/binary_negate.h
-OLD_FILES+=usr/include/c++/v1/__functional/bind.h
-OLD_FILES+=usr/include/c++/v1/__functional/bind_back.h
-OLD_FILES+=usr/include/c++/v1/__functional/bind_front.h
-OLD_FILES+=usr/include/c++/v1/__functional/binder1st.h
-OLD_FILES+=usr/include/c++/v1/__functional/binder2nd.h
-OLD_FILES+=usr/include/c++/v1/__functional/compose.h
-OLD_FILES+=usr/include/c++/v1/__functional/default_searcher.h
-OLD_FILES+=usr/include/c++/v1/__functional/function.h
-OLD_FILES+=usr/include/c++/v1/__functional/hash.h
-OLD_FILES+=usr/include/c++/v1/__functional/identity.h
-OLD_FILES+=usr/include/c++/v1/__functional/invoke.h
-OLD_FILES+=usr/include/c++/v1/__functional/is_transparent.h
-OLD_FILES+=usr/include/c++/v1/__functional/mem_fn.h
-OLD_FILES+=usr/include/c++/v1/__functional/mem_fun_ref.h
-OLD_FILES+=usr/include/c++/v1/__functional/not_fn.h
-OLD_FILES+=usr/include/c++/v1/__functional/operations.h
-OLD_FILES+=usr/include/c++/v1/__functional/perfect_forward.h
-OLD_FILES+=usr/include/c++/v1/__functional/pointer_to_binary_function.h
-OLD_FILES+=usr/include/c++/v1/__functional/pointer_to_unary_function.h
-OLD_FILES+=usr/include/c++/v1/__functional/ranges_operations.h
-OLD_FILES+=usr/include/c++/v1/__functional/reference_wrapper.h
-OLD_FILES+=usr/include/c++/v1/__functional/unary_function.h
-OLD_FILES+=usr/include/c++/v1/__functional/unary_negate.h
-OLD_FILES+=usr/include/c++/v1/__functional/unwrap_ref.h
-OLD_FILES+=usr/include/c++/v1/__functional/weak_result_type.h
-OLD_DIRS+=usr/include/c++/v1/__functional
-OLD_FILES+=usr/include/c++/v1/__functional_base
-OLD_FILES+=usr/include/c++/v1/__hash_table
-OLD_FILES+=usr/include/c++/v1/__iterator/access.h
-OLD_FILES+=usr/include/c++/v1/__iterator/advance.h
-OLD_FILES+=usr/include/c++/v1/__iterator/back_insert_iterator.h
-OLD_FILES+=usr/include/c++/v1/__iterator/common_iterator.h
-OLD_FILES+=usr/include/c++/v1/__iterator/concepts.h
-OLD_FILES+=usr/include/c++/v1/__iterator/counted_iterator.h
-OLD_FILES+=usr/include/c++/v1/__iterator/data.h
-OLD_FILES+=usr/include/c++/v1/__iterator/default_sentinel.h
-OLD_FILES+=usr/include/c++/v1/__iterator/distance.h
-OLD_FILES+=usr/include/c++/v1/__iterator/empty.h
-OLD_FILES+=usr/include/c++/v1/__iterator/erase_if_container.h
-OLD_FILES+=usr/include/c++/v1/__iterator/front_insert_iterator.h
-OLD_FILES+=usr/include/c++/v1/__iterator/incrementable_traits.h
-OLD_FILES+=usr/include/c++/v1/__iterator/indirectly_comparable.h
-OLD_FILES+=usr/include/c++/v1/__iterator/insert_iterator.h
-OLD_FILES+=usr/include/c++/v1/__iterator/istream_iterator.h
-OLD_FILES+=usr/include/c++/v1/__iterator/istreambuf_iterator.h
-OLD_FILES+=usr/include/c++/v1/__iterator/iter_move.h
-OLD_FILES+=usr/include/c++/v1/__iterator/iter_swap.h
-OLD_FILES+=usr/include/c++/v1/__iterator/iterator.h
-OLD_FILES+=usr/include/c++/v1/__iterator/iterator_traits.h
-OLD_FILES+=usr/include/c++/v1/__iterator/move_iterator.h
-OLD_FILES+=usr/include/c++/v1/__iterator/next.h
-OLD_FILES+=usr/include/c++/v1/__iterator/ostream_iterator.h
-OLD_FILES+=usr/include/c++/v1/__iterator/ostreambuf_iterator.h
-OLD_FILES+=usr/include/c++/v1/__iterator/prev.h
-OLD_FILES+=usr/include/c++/v1/__iterator/projected.h
-OLD_FILES+=usr/include/c++/v1/__iterator/readable_traits.h
-OLD_FILES+=usr/include/c++/v1/__iterator/reverse_access.h
-OLD_FILES+=usr/include/c++/v1/__iterator/reverse_iterator.h
-OLD_FILES+=usr/include/c++/v1/__iterator/size.h
-OLD_FILES+=usr/include/c++/v1/__iterator/unreachable_sentinel.h
-OLD_FILES+=usr/include/c++/v1/__iterator/wrap_iter.h
-OLD_DIRS+=usr/include/c++/v1/__iterator
-OLD_FILES+=usr/include/c++/v1/__libcpp_version
-OLD_FILES+=usr/include/c++/v1/__locale
-OLD_FILES+=usr/include/c++/v1/__mbstate_t.h
-OLD_FILES+=usr/include/c++/v1/__memory/addressof.h
-OLD_FILES+=usr/include/c++/v1/__memory/allocation_guard.h
-OLD_FILES+=usr/include/c++/v1/__memory/allocator.h
-OLD_FILES+=usr/include/c++/v1/__memory/allocator_arg_t.h
-OLD_FILES+=usr/include/c++/v1/__memory/allocator_traits.h
-OLD_FILES+=usr/include/c++/v1/__memory/auto_ptr.h
-OLD_FILES+=usr/include/c++/v1/__memory/compressed_pair.h
-OLD_FILES+=usr/include/c++/v1/__memory/concepts.h
-OLD_FILES+=usr/include/c++/v1/__memory/construct_at.h
-OLD_FILES+=usr/include/c++/v1/__memory/pointer_traits.h
-OLD_FILES+=usr/include/c++/v1/__memory/ranges_construct_at.h
-OLD_FILES+=usr/include/c++/v1/__memory/ranges_uninitialized_algorithms.h
-OLD_FILES+=usr/include/c++/v1/__memory/raw_storage_iterator.h
-OLD_FILES+=usr/include/c++/v1/__memory/shared_ptr.h
-OLD_FILES+=usr/include/c++/v1/__memory/temporary_buffer.h
-OLD_FILES+=usr/include/c++/v1/__memory/uninitialized_algorithms.h
-OLD_FILES+=usr/include/c++/v1/__memory/unique_ptr.h
-OLD_FILES+=usr/include/c++/v1/__memory/uses_allocator.h
-OLD_FILES+=usr/include/c++/v1/__memory/voidify.h
-OLD_DIRS+=usr/include/c++/v1/__memory
-OLD_FILES+=usr/include/c++/v1/__mutex_base
-OLD_FILES+=usr/include/c++/v1/__node_handle
-OLD_FILES+=usr/include/c++/v1/__nullptr
-OLD_FILES+=usr/include/c++/v1/__numeric/accumulate.h
-OLD_FILES+=usr/include/c++/v1/__numeric/adjacent_difference.h
-OLD_FILES+=usr/include/c++/v1/__numeric/exclusive_scan.h
-OLD_FILES+=usr/include/c++/v1/__numeric/gcd_lcm.h
-OLD_FILES+=usr/include/c++/v1/__numeric/inclusive_scan.h
-OLD_FILES+=usr/include/c++/v1/__numeric/inner_product.h
-OLD_FILES+=usr/include/c++/v1/__numeric/iota.h
-OLD_FILES+=usr/include/c++/v1/__numeric/midpoint.h
-OLD_FILES+=usr/include/c++/v1/__numeric/partial_sum.h
-OLD_FILES+=usr/include/c++/v1/__numeric/reduce.h
-OLD_FILES+=usr/include/c++/v1/__numeric/transform_exclusive_scan.h
-OLD_FILES+=usr/include/c++/v1/__numeric/transform_inclusive_scan.h
-OLD_FILES+=usr/include/c++/v1/__numeric/transform_reduce.h
-OLD_DIRS+=usr/include/c++/v1/__numeric
-OLD_FILES+=usr/include/c++/v1/__random/bernoulli_distribution.h
-OLD_FILES+=usr/include/c++/v1/__random/binomial_distribution.h
-OLD_FILES+=usr/include/c++/v1/__random/cauchy_distribution.h
-OLD_FILES+=usr/include/c++/v1/__random/chi_squared_distribution.h
-OLD_FILES+=usr/include/c++/v1/__random/clamp_to_integral.h
-OLD_FILES+=usr/include/c++/v1/__random/default_random_engine.h
-OLD_FILES+=usr/include/c++/v1/__random/discard_block_engine.h
-OLD_FILES+=usr/include/c++/v1/__random/discrete_distribution.h
-OLD_FILES+=usr/include/c++/v1/__random/exponential_distribution.h
-OLD_FILES+=usr/include/c++/v1/__random/extreme_value_distribution.h
-OLD_FILES+=usr/include/c++/v1/__random/fisher_f_distribution.h
-OLD_FILES+=usr/include/c++/v1/__random/gamma_distribution.h
-OLD_FILES+=usr/include/c++/v1/__random/generate_canonical.h
-OLD_FILES+=usr/include/c++/v1/__random/geometric_distribution.h
-OLD_FILES+=usr/include/c++/v1/__random/independent_bits_engine.h
-OLD_FILES+=usr/include/c++/v1/__random/is_seed_sequence.h
-OLD_FILES+=usr/include/c++/v1/__random/knuth_b.h
-OLD_FILES+=usr/include/c++/v1/__random/linear_congruential_engine.h
-OLD_FILES+=usr/include/c++/v1/__random/log2.h
-OLD_FILES+=usr/include/c++/v1/__random/lognormal_distribution.h
-OLD_FILES+=usr/include/c++/v1/__random/mersenne_twister_engine.h
-OLD_FILES+=usr/include/c++/v1/__random/negative_binomial_distribution.h
-OLD_FILES+=usr/include/c++/v1/__random/normal_distribution.h
-OLD_FILES+=usr/include/c++/v1/__random/piecewise_constant_distribution.h
-OLD_FILES+=usr/include/c++/v1/__random/piecewise_linear_distribution.h
-OLD_FILES+=usr/include/c++/v1/__random/poisson_distribution.h
-OLD_FILES+=usr/include/c++/v1/__random/random_device.h
-OLD_FILES+=usr/include/c++/v1/__random/ranlux.h
-OLD_FILES+=usr/include/c++/v1/__random/seed_seq.h
-OLD_FILES+=usr/include/c++/v1/__random/shuffle_order_engine.h
-OLD_FILES+=usr/include/c++/v1/__random/student_t_distribution.h
-OLD_FILES+=usr/include/c++/v1/__random/subtract_with_carry_engine.h
-OLD_FILES+=usr/include/c++/v1/__random/uniform_int_distribution.h
-OLD_FILES+=usr/include/c++/v1/__random/uniform_random_bit_generator.h
-OLD_FILES+=usr/include/c++/v1/__random/uniform_real_distribution.h
-OLD_FILES+=usr/include/c++/v1/__random/weibull_distribution.h
-OLD_DIRS+=usr/include/c++/v1/__random
-OLD_FILES+=usr/include/c++/v1/__ranges/access.h
-OLD_FILES+=usr/include/c++/v1/__ranges/all.h
-OLD_FILES+=usr/include/c++/v1/__ranges/common_view.h
-OLD_FILES+=usr/include/c++/v1/__ranges/concepts.h
-OLD_FILES+=usr/include/c++/v1/__ranges/copyable_box.h
-OLD_FILES+=usr/include/c++/v1/__ranges/counted.h
-OLD_FILES+=usr/include/c++/v1/__ranges/dangling.h
-OLD_FILES+=usr/include/c++/v1/__ranges/data.h
-OLD_FILES+=usr/include/c++/v1/__ranges/drop_view.h
-OLD_FILES+=usr/include/c++/v1/__ranges/empty.h
-OLD_FILES+=usr/include/c++/v1/__ranges/empty_view.h
-OLD_FILES+=usr/include/c++/v1/__ranges/enable_borrowed_range.h
-OLD_FILES+=usr/include/c++/v1/__ranges/enable_view.h
-OLD_FILES+=usr/include/c++/v1/__ranges/iota_view.h
-OLD_FILES+=usr/include/c++/v1/__ranges/join_view.h
-OLD_FILES+=usr/include/c++/v1/__ranges/non_propagating_cache.h
-OLD_FILES+=usr/include/c++/v1/__ranges/owning_view.h
-OLD_FILES+=usr/include/c++/v1/__ranges/range_adaptor.h
-OLD_FILES+=usr/include/c++/v1/__ranges/ref_view.h
-OLD_FILES+=usr/include/c++/v1/__ranges/reverse_view.h
-OLD_FILES+=usr/include/c++/v1/__ranges/single_view.h
-OLD_FILES+=usr/include/c++/v1/__ranges/size.h
-OLD_FILES+=usr/include/c++/v1/__ranges/subrange.h
-OLD_FILES+=usr/include/c++/v1/__ranges/take_view.h
-OLD_FILES+=usr/include/c++/v1/__ranges/transform_view.h
-OLD_FILES+=usr/include/c++/v1/__ranges/view_interface.h
-OLD_DIRS+=usr/include/c++/v1/__ranges
-OLD_FILES+=usr/include/c++/v1/__split_buffer
-OLD_FILES+=usr/include/c++/v1/__std_stream
-OLD_FILES+=usr/include/c++/v1/__string
-OLD_FILES+=usr/include/c++/v1/__thread/poll_with_backoff.h
-OLD_FILES+=usr/include/c++/v1/__thread/timed_backoff_policy.h
-OLD_DIRS+=usr/include/c++/v1/__thread
-OLD_FILES+=usr/include/c++/v1/__threading_support
-OLD_FILES+=usr/include/c++/v1/__tree
-OLD_FILES+=usr/include/c++/v1/__tuple
-OLD_FILES+=usr/include/c++/v1/__undef_macros
-OLD_FILES+=usr/include/c++/v1/__utility/as_const.h
-OLD_FILES+=usr/include/c++/v1/__utility/auto_cast.h
-OLD_FILES+=usr/include/c++/v1/__utility/cmp.h
-OLD_FILES+=usr/include/c++/v1/__utility/declval.h
-OLD_FILES+=usr/include/c++/v1/__utility/exchange.h
-OLD_FILES+=usr/include/c++/v1/__utility/forward.h
-OLD_FILES+=usr/include/c++/v1/__utility/in_place.h
-OLD_FILES+=usr/include/c++/v1/__utility/integer_sequence.h
-OLD_FILES+=usr/include/c++/v1/__utility/move.h
-OLD_FILES+=usr/include/c++/v1/__utility/pair.h
-OLD_FILES+=usr/include/c++/v1/__utility/piecewise_construct.h
-OLD_FILES+=usr/include/c++/v1/__utility/priority_tag.h
-OLD_FILES+=usr/include/c++/v1/__utility/rel_ops.h
-OLD_FILES+=usr/include/c++/v1/__utility/swap.h
-OLD_FILES+=usr/include/c++/v1/__utility/to_underlying.h
-OLD_FILES+=usr/include/c++/v1/__utility/transaction.h
-OLD_DIRS+=usr/include/c++/v1/__utility
-OLD_FILES+=usr/include/c++/v1/__variant/monostate.h
-OLD_DIRS+=usr/include/c++/v1/__variant
-OLD_FILES+=usr/include/c++/v1/algorithm
-OLD_FILES+=usr/include/c++/v1/any
-OLD_FILES+=usr/include/c++/v1/array
-OLD_FILES+=usr/include/c++/v1/atomic
-OLD_FILES+=usr/include/c++/v1/barrier
-OLD_FILES+=usr/include/c++/v1/bit
-OLD_FILES+=usr/include/c++/v1/bitset
-OLD_FILES+=usr/include/c++/v1/cassert
-OLD_FILES+=usr/include/c++/v1/ccomplex
-OLD_FILES+=usr/include/c++/v1/cctype
-OLD_FILES+=usr/include/c++/v1/cerrno
-OLD_FILES+=usr/include/c++/v1/cfenv
-OLD_FILES+=usr/include/c++/v1/cfloat
-OLD_FILES+=usr/include/c++/v1/charconv
-OLD_FILES+=usr/include/c++/v1/chrono
-OLD_FILES+=usr/include/c++/v1/cinttypes
-OLD_FILES+=usr/include/c++/v1/ciso646
-OLD_FILES+=usr/include/c++/v1/climits
-OLD_FILES+=usr/include/c++/v1/clocale
-OLD_FILES+=usr/include/c++/v1/cmath
-OLD_FILES+=usr/include/c++/v1/codecvt
-OLD_FILES+=usr/include/c++/v1/compare
-OLD_FILES+=usr/include/c++/v1/complex
-OLD_FILES+=usr/include/c++/v1/complex.h
-OLD_FILES+=usr/include/c++/v1/concepts
-OLD_FILES+=usr/include/c++/v1/condition_variable
-OLD_FILES+=usr/include/c++/v1/coroutine
-OLD_FILES+=usr/include/c++/v1/csetjmp
-OLD_FILES+=usr/include/c++/v1/csignal
-OLD_FILES+=usr/include/c++/v1/cstdarg
-OLD_FILES+=usr/include/c++/v1/cstdbool
-OLD_FILES+=usr/include/c++/v1/cstddef
-OLD_FILES+=usr/include/c++/v1/cstdint
-OLD_FILES+=usr/include/c++/v1/cstdio
-OLD_FILES+=usr/include/c++/v1/cstdlib
-OLD_FILES+=usr/include/c++/v1/cstring
-OLD_FILES+=usr/include/c++/v1/ctgmath
-OLD_FILES+=usr/include/c++/v1/ctime
-OLD_FILES+=usr/include/c++/v1/ctype.h
-OLD_FILES+=usr/include/c++/v1/cwchar
-OLD_FILES+=usr/include/c++/v1/cwctype
-OLD_FILES+=usr/include/c++/v1/cxxabi.h
-OLD_FILES+=usr/include/c++/v1/deque
-OLD_FILES+=usr/include/c++/v1/errno.h
-OLD_FILES+=usr/include/c++/v1/exception
-OLD_FILES+=usr/include/c++/v1/execution
-OLD_FILES+=usr/include/c++/v1/experimental/__config
-OLD_FILES+=usr/include/c++/v1/experimental/__memory
-OLD_FILES+=usr/include/c++/v1/experimental/algorithm
-OLD_FILES+=usr/include/c++/v1/experimental/coroutine
-OLD_FILES+=usr/include/c++/v1/experimental/deque
-OLD_FILES+=usr/include/c++/v1/experimental/filesystem
-OLD_FILES+=usr/include/c++/v1/experimental/forward_list
-OLD_FILES+=usr/include/c++/v1/experimental/functional
-OLD_FILES+=usr/include/c++/v1/experimental/iterator
-OLD_FILES+=usr/include/c++/v1/experimental/list
-OLD_FILES+=usr/include/c++/v1/experimental/map
-OLD_FILES+=usr/include/c++/v1/experimental/memory_resource
-OLD_FILES+=usr/include/c++/v1/experimental/propagate_const
-OLD_FILES+=usr/include/c++/v1/experimental/regex
-OLD_FILES+=usr/include/c++/v1/experimental/set
-OLD_FILES+=usr/include/c++/v1/experimental/simd
-OLD_FILES+=usr/include/c++/v1/experimental/string
-OLD_FILES+=usr/include/c++/v1/experimental/type_traits
-OLD_FILES+=usr/include/c++/v1/experimental/unordered_map
-OLD_FILES+=usr/include/c++/v1/experimental/unordered_set
-OLD_FILES+=usr/include/c++/v1/experimental/utility
-OLD_FILES+=usr/include/c++/v1/experimental/vector
-OLD_DIRS+=usr/include/c++/v1/experimental
-OLD_FILES+=usr/include/c++/v1/ext/__hash
-OLD_FILES+=usr/include/c++/v1/ext/hash_map
-OLD_FILES+=usr/include/c++/v1/ext/hash_set
-OLD_DIRS+=usr/include/c++/v1/ext
-OLD_FILES+=usr/include/c++/v1/fenv.h
-OLD_FILES+=usr/include/c++/v1/filesystem
-OLD_FILES+=usr/include/c++/v1/float.h
-OLD_FILES+=usr/include/c++/v1/format
-OLD_FILES+=usr/include/c++/v1/forward_list
-OLD_FILES+=usr/include/c++/v1/fstream
-OLD_FILES+=usr/include/c++/v1/functional
-OLD_FILES+=usr/include/c++/v1/future
-OLD_FILES+=usr/include/c++/v1/initializer_list
-OLD_FILES+=usr/include/c++/v1/inttypes.h
-OLD_FILES+=usr/include/c++/v1/iomanip
-OLD_FILES+=usr/include/c++/v1/ios
-OLD_FILES+=usr/include/c++/v1/iosfwd
-OLD_FILES+=usr/include/c++/v1/iostream
-OLD_FILES+=usr/include/c++/v1/istream
-OLD_FILES+=usr/include/c++/v1/iterator
-OLD_FILES+=usr/include/c++/v1/latch
-OLD_FILES+=usr/include/c++/v1/limits
-OLD_FILES+=usr/include/c++/v1/limits.h
-OLD_FILES+=usr/include/c++/v1/list
-OLD_FILES+=usr/include/c++/v1/locale
-OLD_FILES+=usr/include/c++/v1/locale.h
-OLD_FILES+=usr/include/c++/v1/map
-OLD_FILES+=usr/include/c++/v1/math.h
-OLD_FILES+=usr/include/c++/v1/memory
-OLD_FILES+=usr/include/c++/v1/module.modulemap
-OLD_FILES+=usr/include/c++/v1/mutex
-OLD_FILES+=usr/include/c++/v1/new
-OLD_FILES+=usr/include/c++/v1/numbers
-OLD_FILES+=usr/include/c++/v1/numeric
-OLD_FILES+=usr/include/c++/v1/optional
-OLD_FILES+=usr/include/c++/v1/ostream
-OLD_FILES+=usr/include/c++/v1/queue
-OLD_FILES+=usr/include/c++/v1/random
-OLD_FILES+=usr/include/c++/v1/ranges
-OLD_FILES+=usr/include/c++/v1/ratio
-OLD_FILES+=usr/include/c++/v1/regex
-OLD_FILES+=usr/include/c++/v1/scoped_allocator
-OLD_FILES+=usr/include/c++/v1/semaphore
-OLD_FILES+=usr/include/c++/v1/set
-OLD_FILES+=usr/include/c++/v1/setjmp.h
-OLD_FILES+=usr/include/c++/v1/shared_mutex
-OLD_FILES+=usr/include/c++/v1/span
-OLD_FILES+=usr/include/c++/v1/sstream
-OLD_FILES+=usr/include/c++/v1/stack
-OLD_FILES+=usr/include/c++/v1/stdbool.h
-OLD_FILES+=usr/include/c++/v1/stddef.h
-OLD_FILES+=usr/include/c++/v1/stdexcept
-OLD_FILES+=usr/include/c++/v1/stdint.h
-OLD_FILES+=usr/include/c++/v1/stdio.h
-OLD_FILES+=usr/include/c++/v1/stdlib.h
-OLD_FILES+=usr/include/c++/v1/streambuf
-OLD_FILES+=usr/include/c++/v1/string
-OLD_FILES+=usr/include/c++/v1/string.h
-OLD_FILES+=usr/include/c++/v1/string_view
-OLD_FILES+=usr/include/c++/v1/strstream
-OLD_FILES+=usr/include/c++/v1/system_error
-OLD_FILES+=usr/include/c++/v1/tgmath.h
-OLD_FILES+=usr/include/c++/v1/thread
-OLD_FILES+=usr/include/c++/v1/tuple
-OLD_FILES+=usr/include/c++/v1/type_traits
-OLD_FILES+=usr/include/c++/v1/typeindex
-OLD_FILES+=usr/include/c++/v1/typeinfo
-OLD_FILES+=usr/include/c++/v1/unordered_map
-OLD_FILES+=usr/include/c++/v1/unordered_set
-OLD_FILES+=usr/include/c++/v1/utility
-OLD_FILES+=usr/include/c++/v1/valarray
-OLD_FILES+=usr/include/c++/v1/variant
-OLD_FILES+=usr/include/c++/v1/vector
-OLD_FILES+=usr/include/c++/v1/version
-OLD_FILES+=usr/include/c++/v1/wchar.h
-OLD_FILES+=usr/include/c++/v1/wctype.h
-OLD_DIRS+=usr/include/c++/v1
-.endif
-
.if ${MK_LLD} == no
OLD_FILES+=usr/bin/ld.lld
.endif
@@ -5622,7 +5102,6 @@ OLD_FILES+=etc/mail.rc
OLD_FILES+=etc/mail/aliases
OLD_FILES+=etc/mail/mailer.conf
OLD_FILES+=etc/periodic/daily/130.clean-msgs
-OLD_FILES+=etc/rc.d/othermta
OLD_FILES+=usr/bin/Mail
OLD_FILES+=usr/bin/biff
OLD_FILES+=usr/bin/from
@@ -6160,6 +5639,11 @@ OLD_FILES+=var/yp/Makefile.dist
OLD_DIRS+=var/yp
.endif
+.if ${MK_NETLINK} == no
+OLD_FILES+=usr.bin/genl
+OLD_FILES+=usr/share/man/man1/genl.1.gz
+.endif
+
.if ${MK_NLS} == no
OLD_DIRS+=usr/share/nls/
OLD_DIRS+=usr/share/nls/C
@@ -6237,7 +5721,6 @@ OLD_DIRS+=usr/share/nls/en_US.ISO8859-15
OLD_FILES+=usr/share/nls/en_US.ISO8859-15/ee.cat
OLD_DIRS+=usr/share/nls/en_US.UTF-8
OLD_DIRS+=usr/share/nls/es_ES.UTF-8
-OLD_FILES+=usr/share/nls/es_ES.ISO8859-1/grep.cat
OLD_FILES+=usr/share/nls/es_ES.ISO8859-1/libc.cat
OLD_FILES+=usr/share/nls/es_ES.ISO8859-1/tcsh.cat
OLD_DIRS+=usr/share/nls/es_ES.ISO8859-1
@@ -6289,16 +5772,13 @@ OLD_FILES+=usr/share/nls/fr_FR.ISO8859-15/tcsh.cat
OLD_DIRS+=usr/share/nls/fr_FR.UTF-8
OLD_FILES+=usr/share/nls/fr_FR.UTF-8/tcsh.cat
OLD_DIRS+=usr/share/nls/gl_ES.ISO8859-1
-OLD_FILES+=usr/share/nls/gl_ES.ISO8859-1/grep.cat
OLD_FILES+=usr/share/nls/gl_ES.ISO8859-1/libc.cat
OLD_DIRS+=usr/share/nls/he_IL.UTF-8
OLD_DIRS+=usr/share/nls/hi_IN.ISCII-DEV
OLD_DIRS+=usr/share/nls/hr_HR.ISO8859-2
OLD_DIRS+=usr/share/nls/hu_HU.ISO8859-2
OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/ee.cat
-OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/grep.cat
OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/libc.cat
-OLD_FILES+=usr/share/nls/hu_HU.ISO8859-2/sort.cat
OLD_DIRS+=usr/share/nls/hr_HR.UTF-8
OLD_DIRS+=usr/share/nls/hu_HU.UTF-8
OLD_DIRS+=usr/share/nls/hy_AM.ARMSCII-8
@@ -6320,14 +5800,11 @@ OLD_FILES+=usr/share/nls/it_IT.ISO8859-15/tcsh.cat
OLD_DIRS+=usr/share/nls/it_IT.UTF-8
OLD_FILES+=usr/share/nls/it_IT.UTF-8/tcsh.cat
OLD_DIRS+=usr/share/nls/ja_JP.SJIS
-OLD_FILES+=usr/share/nls/ja_JP.SJIS/grep.cat
OLD_FILES+=usr/share/nls/ja_JP.SJIS/tcsh.cat
OLD_DIRS+=usr/share/nls/ja_JP.UTF-8
-OLD_FILES+=usr/share/nls/ja_JP.UTF-8/grep.cat
OLD_FILES+=usr/share/nls/ja_JP.UTF-8/libc.cat
OLD_FILES+=usr/share/nls/ja_JP.UTF-8/tcsh.cat
OLD_DIRS+=usr/share/nls/ja_JP.eucJP
-OLD_FILES+=usr/share/nls/ja_JP.eucJP/grep.cat
OLD_FILES+=usr/share/nls/ja_JP.eucJP/libc.cat
OLD_FILES+=usr/share/nls/ja_JP.eucJP/tcsh.cat
OLD_DIRS+=usr/share/nls/kk_KZ.PT154
@@ -6362,7 +5839,6 @@ OLD_DIRS+=usr/share/nls/pt_BR.ISO8859-1
OLD_DIRS+=usr/share/nls/pt_BR.UTF-8
OLD_DIRS+=usr/share/nls/pt_PT.ISO8859-1
OLD_FILES+=usr/share/nls/pt_BR.ISO8859-1/ee.cat
-OLD_FILES+=usr/share/nls/pt_BR.ISO8859-1/grep.cat
OLD_FILES+=usr/share/nls/pt_BR.ISO8859-1/libc.cat
OLD_FILES+=usr/share/nls/pt_PT.ISO8859-1/ee.cat
OLD_DIRS+=usr/share/nls/pt_PT.ISO8859-15
@@ -6377,7 +5853,6 @@ OLD_DIRS+=usr/share/nls/ru_RU.ISO8859-5
OLD_FILES+=usr/share/nls/ru_RU.ISO8859-5/tcsh.cat
OLD_DIRS+=usr/share/nls/ru_RU.KOI8-R
OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/ee.cat
-OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/grep.cat
OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/libc.cat
OLD_FILES+=usr/share/nls/ru_RU.KOI8-R/tcsh.cat
OLD_DIRS+=usr/share/nls/ru_RU.UTF-8
@@ -6402,7 +5877,6 @@ OLD_DIRS+=usr/share/nls/uk_UA.KOI8-U
OLD_FILES+=usr/share/nls/uk_UA.KOI8-U/ee.cat
OLD_FILES+=usr/share/nls/uk_UA.KOI8-U/tcsh.cat
OLD_DIRS+=usr/share/nls/uk_UA.UTF-8
-OLD_FILES+=usr/share/nls/uk_UA.UTF-8/grep.cat
OLD_FILES+=usr/share/nls/uk_UA.UTF-8/libc.cat
OLD_FILES+=usr/share/nls/uk_UA.UTF-8/tcsh.cat
OLD_DIRS+=usr/share/nls/zh_CN.GB18030
@@ -6411,7 +5885,6 @@ OLD_DIRS+=usr/share/nls/zh_CN.GBK
OLD_DIRS+=usr/share/nls/zh_CN.GB2312
OLD_FILES+=usr/share/nls/zh_CN.GB2312/libc.cat
OLD_DIRS+=usr/share/nls/zh_CN.UTF-8
-OLD_FILES+=usr/share/nls/zh_CN.UTF-8/grep.cat
OLD_FILES+=usr/share/nls/zh_CN.UTF-8/libc.cat
OLD_DIRS+=usr/share/nls/zh_CN.eucCN
OLD_DIRS+=usr/share/nls/zh_HK.UTF-8
@@ -7320,8 +6793,6 @@ OLD_FILES+=usr/share/man/man3/pmc.ivybridge.3.gz
OLD_FILES+=usr/share/man/man3/pmc.ivybridgexeon.3.gz
OLD_FILES+=usr/share/man/man3/pmc.k7.3.gz
OLD_FILES+=usr/share/man/man3/pmc.k8.3.gz
-OLD_FILES+=usr/share/man/man3/pmc.mips24k.3.gz
-OLD_FILES+=usr/share/man/man3/pmc.octeon.3.gz
OLD_FILES+=usr/share/man/man3/pmc.p4.3.gz
OLD_FILES+=usr/share/man/man3/pmc.p5.3.gz
OLD_FILES+=usr/share/man/man3/pmc.p6.3.gz
@@ -7377,14 +6848,6 @@ OLD_FILES+=usr/share/man/man8/pmcstat.8.gz
OLD_FILES+=usr/share/man/man8/pmcstudy.8.gz
.endif
-.if ${MK_PORTSNAP} == no
-OLD_FILES+=etc/portsnap.conf
-OLD_FILES+=usr/libexec/make_index
-OLD_FILES+=usr/sbin/portsnap
-OLD_FILES+=usr/share/examples/etc/portsnap.conf
-OLD_FILES+=usr/share/man/man8/portsnap.8.gz
-.endif
-
.if ${MK_PPP} == no
OLD_FILES+=etc/newsyslog.conf.d/ppp.conf
OLD_FILES+=etc/ppp/ppp.conf
@@ -7493,7 +6956,6 @@ OLD_FILES+=usr/lib/libncurses_p.a
OLD_FILES+=usr/lib/libncursesw_p.a
OLD_FILES+=usr/lib/libnetgraph_p.a
OLD_FILES+=usr/lib/libnetmap_p.a
-OLD_FILES+=usr/lib/libngatm_p.a
OLD_FILES+=usr/lib/libnv_p.a
OLD_FILES+=usr/lib/libnvpair_p.a
OLD_FILES+=usr/lib/libopencsd_p.a
@@ -7673,7 +7135,9 @@ OLD_FILES+=etc/periodic/daily/440.status-mailq
OLD_FILES+=etc/periodic/daily/460.status-mail-rejects
OLD_FILES+=etc/periodic/daily/500.queuerun
OLD_FILES+=etc/rc.d/sendmail
+.if ${MK_MAILWRAPPER} == no
OLD_FILES+=bin/rmail
+.endif
OLD_FILES+=usr/bin/vacation
OLD_FILES+=usr/include/libmilter/mfapi.h
OLD_FILES+=usr/include/libmilter/mfdef.h
@@ -7756,12 +7220,14 @@ OLD_FILES+=usr/share/sendmail/cf/feature/access_db.m4
OLD_FILES+=usr/share/sendmail/cf/feature/allmasquerade.m4
OLD_FILES+=usr/share/sendmail/cf/feature/always_add_domain.m4
OLD_FILES+=usr/share/sendmail/cf/feature/authinfo.m4
+OLD_FILES+=usr/share/sendmail/cf/feature/blocklist_recipients.m4
OLD_FILES+=usr/share/sendmail/cf/feature/badmx.m4
OLD_FILES+=usr/share/sendmail/cf/feature/bcc.m4
OLD_FILES+=usr/share/sendmail/cf/feature/bestmx_is_local.m4
OLD_FILES+=usr/share/sendmail/cf/feature/bitdomain.m4
OLD_FILES+=usr/share/sendmail/cf/feature/blacklist_recipients.m4
OLD_FILES+=usr/share/sendmail/cf/feature/block_bad_helo.m4
+OLD_FILES+=usr/share/sendmail/cf/feature/check_cert_altnames.m4
OLD_FILES+=usr/share/sendmail/cf/feature/compat_check.m4
OLD_FILES+=usr/share/sendmail/cf/feature/conncontrol.m4
OLD_FILES+=usr/share/sendmail/cf/feature/delay_checks.m4
@@ -7804,6 +7270,7 @@ OLD_FILES+=usr/share/sendmail/cf/feature/relay_mail_from.m4
OLD_FILES+=usr/share/sendmail/cf/feature/require_rdns.m4
OLD_FILES+=usr/share/sendmail/cf/feature/smrsh.m4
OLD_FILES+=usr/share/sendmail/cf/feature/stickyhost.m4
+OLD_FILES+=usr/share/sendmail/cf/feature/tls_failures.m4
OLD_FILES+=usr/share/sendmail/cf/feature/tls_session_features.m4
OLD_FILES+=usr/share/sendmail/cf/feature/use_client_ptr.m4
OLD_FILES+=usr/share/sendmail/cf/feature/use_ct_file.m4
@@ -8176,11 +7643,8 @@ OLD_FILES+=usr/share/nls/uk_UA.UTF-8/tcsh.cat
.endif
.if ${MK_TELNET} == no
-OLD_FILES+=etc/pam.d/telnetd
OLD_FILES+=usr/bin/telnet
-OLD_FILES+=usr/libexec/telnetd
OLD_FILES+=usr/share/man/man1/telnet.1.gz
-OLD_FILES+=usr/share/man/man8/telnetd.8.gz
.endif
.if ${MK_TESTS} == yes
@@ -9607,6 +9071,14 @@ OLD_FILES+=usr/share/man/man8/lastlogin.8.gz
OLD_FILES+=usr/share/man/man8/utx.8.gz
.endif
+.if ${MK_VERIEXEC} == no
+OLD_FILES+=sbin/veriexec
+OLD_FILES+=usr/share/man/man8/veriexec.8.gz
+OLD_FILES+=usr/lib/libveriexec.a
+OLD_FILES+=usr/lib/libveriexec.so
+OLD_LIBS+=usr/lib/libveriexec.so.5
+.endif
+
.if ${MK_VI} == no
OLD_FILES+=etc/rc.d/virecover
OLD_FILES+=rescue/ex
@@ -9769,6 +9241,7 @@ OLD_FILES+=usr/share/zoneinfo/America/Cayenne
OLD_FILES+=usr/share/zoneinfo/America/Cayman
OLD_FILES+=usr/share/zoneinfo/America/Chicago
OLD_FILES+=usr/share/zoneinfo/America/Chihuahua
+OLD_FILES+=usr/share/zoneinfo/America/Ciudad_Juarez
OLD_FILES+=usr/share/zoneinfo/America/Costa_Rica
OLD_FILES+=usr/share/zoneinfo/America/Creston
OLD_FILES+=usr/share/zoneinfo/America/Cuiaba
diff --git a/tools/build/options/WITHOUT_ATM b/tools/build/options/WITHOUT_ATM
deleted file mode 100644
index 345663fb3ccd..000000000000
--- a/tools/build/options/WITHOUT_ATM
+++ /dev/null
@@ -1,3 +0,0 @@
-.\" $FreeBSD$
-Do not build
-programs and libraries related to ATM networking.
diff --git a/tools/build/options/WITHOUT_CLANG_IS_CC b/tools/build/options/WITHOUT_CLANG_IS_CC
deleted file mode 100644
index 85d80ad476a5..000000000000
--- a/tools/build/options/WITHOUT_CLANG_IS_CC
+++ /dev/null
@@ -1,6 +0,0 @@
-.\" $FreeBSD$
-Do not install links to the Clang C/C++ compiler as
-.Pa /usr/bin/cc ,
-.Pa /usr/bin/c++
-and
-.Pa /usr/bin/cpp .
diff --git a/tools/build/options/WITHOUT_CXX b/tools/build/options/WITHOUT_CXX
deleted file mode 100644
index a600bb03df27..000000000000
--- a/tools/build/options/WITHOUT_CXX
+++ /dev/null
@@ -1,4 +0,0 @@
-.\" $FreeBSD$
-Do not build C++ headers and runtime libraries.
-It also prevents building binaries and libraries written in C++, including
-.Xr devd 8 .
diff --git a/tools/build/options/WITHOUT_DTRACE b/tools/build/options/WITHOUT_DTRACE
new file mode 100644
index 000000000000..7a246ee5ee3d
--- /dev/null
+++ b/tools/build/options/WITHOUT_DTRACE
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Do not build DTrace framework kernel modules, libraries, and user commands.
diff --git a/tools/build/options/WITHOUT_KERBEROS_SUPPORT b/tools/build/options/WITHOUT_KERBEROS_SUPPORT
index 1a50b28678bc..07516bb272e8 100644
--- a/tools/build/options/WITHOUT_KERBEROS_SUPPORT
+++ b/tools/build/options/WITHOUT_KERBEROS_SUPPORT
@@ -2,6 +2,5 @@
Build some programs without Kerberos support, like
.Xr ssh 1 ,
.Xr telnet 1 ,
-.Xr sshd 8 ,
and
-.Xr telnetd 8 .
+.Xr sshd 8 .
diff --git a/tools/build/options/WITHOUT_MACHDEP_OPTIMIZATIONS b/tools/build/options/WITHOUT_MACHDEP_OPTIMIZATIONS
new file mode 100644
index 000000000000..1c596c998504
--- /dev/null
+++ b/tools/build/options/WITHOUT_MACHDEP_OPTIMIZATIONS
@@ -0,0 +1 @@
+Prefer machine-independent non-assembler code in libc and libm.
diff --git a/tools/build/options/WITHOUT_NETLINK b/tools/build/options/WITHOUT_NETLINK
new file mode 100644
index 000000000000..3ff4b66f1900
--- /dev/null
+++ b/tools/build/options/WITHOUT_NETLINK
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Do not build
+.Xr genl 1
+utility.
diff --git a/tools/build/options/WITHOUT_NETLINK_SUPPORT b/tools/build/options/WITHOUT_NETLINK_SUPPORT
new file mode 100644
index 000000000000..4a72d3f1e4d1
--- /dev/null
+++ b/tools/build/options/WITHOUT_NETLINK_SUPPORT
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Make libraries and programs use rtsock and
+.Xr sysctl 3
+interfaces instead of
+.Xr snl 3 .
diff --git a/tools/build/options/WITHOUT_OFED b/tools/build/options/WITHOUT_OFED
index 63cb5b94eb28..8c38242cb1b8 100644
--- a/tools/build/options/WITHOUT_OFED
+++ b/tools/build/options/WITHOUT_OFED
@@ -1,4 +1,3 @@
-.\" $FreeBSD$
-Disable the build of the
+Do not build the
.Dq "OpenFabrics Enterprise Distribution"
-Infiniband software stack, including kernel modules and userspace libraries.
+InfiniBand software stack, including kernel modules and userspace libraries.
diff --git a/tools/build/options/WITHOUT_PORTSNAP b/tools/build/options/WITHOUT_PORTSNAP
deleted file mode 100644
index 8b023fd65251..000000000000
--- a/tools/build/options/WITHOUT_PORTSNAP
+++ /dev/null
@@ -1,4 +0,0 @@
-.\" $FreeBSD$
-Do not build or install
-.Xr portsnap 8
-and related files.
diff --git a/tools/build/options/WITHOUT_SCTP_SUPPORT b/tools/build/options/WITHOUT_SCTP_SUPPORT
new file mode 100644
index 000000000000..0829dbeca49d
--- /dev/null
+++ b/tools/build/options/WITHOUT_SCTP_SUPPORT
@@ -0,0 +1,4 @@
+Disable support in the kernel for the
+.Xr sctp 4
+Stream Control Transmission Protocol
+loadable kernel module.
diff --git a/tools/build/options/WITHOUT_TOOLCHAIN b/tools/build/options/WITHOUT_TOOLCHAIN
index 57deb32a51f7..9568c0affa4f 100644
--- a/tools/build/options/WITHOUT_TOOLCHAIN
+++ b/tools/build/options/WITHOUT_TOOLCHAIN
@@ -1,4 +1,4 @@
.\" $FreeBSD$
-Do not install header or
+Do not install
programs used for program development,
compilers, debuggers etc.
diff --git a/tools/build/options/WITH_CLANG_IS_CC b/tools/build/options/WITH_CLANG_IS_CC
deleted file mode 100644
index 9ab78c569dd2..000000000000
--- a/tools/build/options/WITH_CLANG_IS_CC
+++ /dev/null
@@ -1,6 +0,0 @@
-.\" $FreeBSD$
-Install links to the Clang C/C++ compiler as
-.Pa /usr/bin/cc ,
-.Pa /usr/bin/c++
-and
-.Pa /usr/bin/cpp .
diff --git a/tools/build/options/WITH_DIRDEPS_BUILD b/tools/build/options/WITH_DIRDEPS_BUILD
index 3086d136b580..b4e13b78493a 100644
--- a/tools/build/options/WITH_DIRDEPS_BUILD
+++ b/tools/build/options/WITH_DIRDEPS_BUILD
@@ -1,5 +1,5 @@
.\" $FreeBSD$
-This is an experimental build system.
+This is an alternate build system.
For details see
https://www.crufty.net/sjg/docs/freebsd-meta-mode.htm.
Build commands can be seen from the top-level with:
@@ -33,4 +33,11 @@ The build hides commands executed unless
is defined.
.Pp
Note that there is currently no mass install feature for this.
+This build is designed for producing packages, that can then be installed
+on a target system.
.Pp
+The implementation in
+.Fx
+is incomplete.
+Completion would require leaf directories for building each kernel
+and package so that their dependencies can be tracked.
diff --git a/tools/build/options/WITH_DISK_IMAGE_TOOLS_BOOTSTRAP b/tools/build/options/WITH_DISK_IMAGE_TOOLS_BOOTSTRAP
new file mode 100644
index 000000000000..5f5fba2ea0a2
--- /dev/null
+++ b/tools/build/options/WITH_DISK_IMAGE_TOOLS_BOOTSTRAP
@@ -0,0 +1,6 @@
+Build
+.Xr etdump 1 ,
+.Xr makefs 8
+and
+.Xr mkimg 1
+as bootstrap tools.
diff --git a/tools/build/options/WITH_LIB32 b/tools/build/options/WITH_LIB32
new file mode 100644
index 000000000000..3c621483a60d
--- /dev/null
+++ b/tools/build/options/WITH_LIB32
@@ -0,0 +1,3 @@
+On 64-bit platforms, build the 32-bit library set and a
+.Nm ld-elf32.so.1
+runtime linker.
diff --git a/tools/build/options/WITH_LLVM_BINUTILS b/tools/build/options/WITH_LLVM_BINUTILS
index 8fa2c55f31a9..f60b1ebac0e4 100644
--- a/tools/build/options/WITH_LLVM_BINUTILS
+++ b/tools/build/options/WITH_LLVM_BINUTILS
@@ -1,2 +1,19 @@
.\" $FreeBSD$
-Install LLVM's binutils (ar, addr2line, nm, etc.) instead of ELF Tool Chain's.
+Install LLVM's binutils (without an llvm- prefix),
+instead of ELF Tool Chain's tools.
+This includes
+.Xr addr2line 1 ,
+.Xr ar 1 ,
+.Xr nm 1 ,
+.Xr objcopy 1 ,
+.Xr ranlib 1 ,
+.Xr readelf 1 ,
+.Xr size 1 ,
+and
+.Xr strip 1 .
+Regardless of this setting, LLVM tools are used for
+.Xr c++filt 1
+and
+.Xr objdump 1 .
+.Xr strings 1
+is always provided by ELF Tool Chain.
diff --git a/tools/build/options/WITH_LOADER_FIREWIRE b/tools/build/options/WITH_LOADER_FIREWIRE
deleted file mode 100644
index 0204357f4345..000000000000
--- a/tools/build/options/WITH_LOADER_FIREWIRE
+++ /dev/null
@@ -1,3 +0,0 @@
-.\" $FreeBSD$
-Enable firewire support in /boot/loader on x86.
-This option is a nop on all other platforms.
diff --git a/tools/build/options/WITH_LOADER_VERIEXEC_VECTX b/tools/build/options/WITH_LOADER_VERIEXEC_VECTX
new file mode 100644
index 000000000000..b1fc6c815ed8
--- /dev/null
+++ b/tools/build/options/WITH_LOADER_VERIEXEC_VECTX
@@ -0,0 +1,7 @@
+Enable building
+.Xr loader 8
+with support for hashing and verifying kernel and modules as a side effect
+of loading.
+.Pp
+Depends on
+.Va WITH_LOADER_VERIEXEC .
diff --git a/tools/build/options/WITH_META_ERROR_TARGET b/tools/build/options/WITH_META_ERROR_TARGET
new file mode 100644
index 000000000000..069000a423cd
--- /dev/null
+++ b/tools/build/options/WITH_META_ERROR_TARGET
@@ -0,0 +1,14 @@
+.\" $FreeBSD$
+Enable the META_MODE .ERROR target.
+.Pp
+This target will copy the meta file of a failed target
+to
+.Va ERROR_LOGDIR
+(default is
+.Ql ${SRCTOP:H}/error )
+to help with failure analysis.
+Depends on
+.Va WITH_META_MODE .
+This default when
+.Va WITH_DIRDEPS_BUILD
+is set.
diff --git a/tools/build/options/WITH_NETLINK b/tools/build/options/WITH_NETLINK
new file mode 100644
index 000000000000..321e9856b2b5
--- /dev/null
+++ b/tools/build/options/WITH_NETLINK
@@ -0,0 +1,4 @@
+.\" $FreeBSD$
+Build the
+.Xr genl 1
+utility.
diff --git a/tools/build/options/WITH_NETLINK_SUPPORT b/tools/build/options/WITH_NETLINK_SUPPORT
new file mode 100644
index 000000000000..0f0f8f8b9799
--- /dev/null
+++ b/tools/build/options/WITH_NETLINK_SUPPORT
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Make libraries and programs use
+.Xr snl 3
+interfaces instead of rtsock and
+.Xr sysctl 3 .
diff --git a/tools/build/options/WITH_OFED b/tools/build/options/WITH_OFED
new file mode 100644
index 000000000000..5c978418f001
--- /dev/null
+++ b/tools/build/options/WITH_OFED
@@ -0,0 +1,3 @@
+Build the
+.Dq "OpenFabrics Enterprise Distribution"
+InfiniBand software stack, including kernel modules and userspace libraries.
diff --git a/tools/build/options/WITH_TOOLCHAIN b/tools/build/options/WITH_TOOLCHAIN
new file mode 100644
index 000000000000..62624bf9e28b
--- /dev/null
+++ b/tools/build/options/WITH_TOOLCHAIN
@@ -0,0 +1,2 @@
+Install programs used for software development such as
+compilers, debuggers, linkers etc.
diff --git a/tools/build/options/WITH_ZFS b/tools/build/options/WITH_ZFS
new file mode 100644
index 000000000000..4b1aea6df534
--- /dev/null
+++ b/tools/build/options/WITH_ZFS
@@ -0,0 +1,3 @@
+Build the ZFS file system kernel module, libraries, and user commands.
+Also enable ZFS support in utilities and libraries which implement
+ZFS-specific functionality.
diff --git a/tools/build/options/makeman b/tools/build/options/makeman
index 328b9faed881..5a8b207b228a 100755
--- a/tools/build/options/makeman
+++ b/tools/build/options/makeman
@@ -140,11 +140,9 @@ main()
{
echo "building src.conf.5 man page from files in ${PWD}" >&2
- fbsdid='$'FreeBSD'$'
- generated='@'generated
+ generated='@'generated
cat <<EOF
.\" DO NOT EDIT-- this file is $generated by tools/build/options/makeman.
-.\" ${fbsdid}
.Dd $(echo $(LC_TIME=C date +'%B %e, %Y'))
.Dt SRC.CONF 5
.Os
@@ -319,8 +317,9 @@ EOF
;;
esac
- twiddle >&2
+ printf "." >&2
done
+ printf "\n" >&2
cat <<EOF
.El
.Sh FILES
@@ -345,13 +344,4 @@ This manual page was autogenerated by
EOF
}
-twiddle_pos=0
-twiddle()
-{
- local c0='|' c1='/' c2='-' c3='\'
-
- eval printf '%c\\b' '$c'${twiddle_pos}
- twiddle_pos=$(((twiddle_pos+1)%4))
-}
-
main