[illumos-gate merge]release-20211216

commit 532883ab3269bdf14c55e45838bc9ae275d70ed5
    14285 check_rtime should recommend -fpic not -Kpic
commit 0910f6b57d8ca5550c60180007b9cdeaabc88f1b
    14284 check_rtime should check kernel modules
commit 82d0151a507442720a3aea34c8925041894ab173
    14268 kernel modules should be linked -ztype=kmod

Conflicts:
    usr/src/uts/intel/bpf/Makefile
    usr/src/uts/intel/dld/Makefile
    usr/src/uts/intel/dls/Makefile
    usr/src/uts/intel/ipf/Makefile
    usr/src/uts/intel/iptun/Makefile
    usr/src/uts/intel/mac/Makefile
    usr/src/uts/intel/mac_ether/Makefile
    usr/src/uts/intel/mac_ib/Makefile
    usr/src/uts/intel/mac_wifi/Makefile
    usr/src/uts/sparc/bpf/Makefile
    usr/src/uts/sparc/dld/Makefile
    usr/src/uts/sparc/dls/Makefile
    usr/src/uts/sparc/mac/Makefile
    usr/src/uts/sparc/mac_ether/Makefile
    usr/src/uts/sparc/mac_ib/Makefile
    usr/src/uts/sparc/mac_wifi/Makefile
    usr/src/uts/intel/datafilt/Makefile
    usr/src/uts/intel/gsqueue/Makefile
    usr/src/uts/intel/inotify/Makefile
    usr/src/uts/intel/lx_brand/Makefile
    usr/src/uts/intel/lx_cgroup/Makefile
    usr/src/uts/intel/lx_devfs/Makefile
    usr/src/uts/intel/lx_netlink/Makefile
    usr/src/uts/intel/lx_proc/Makefile
    usr/src/uts/intel/lx_sysfs/Makefile
    usr/src/uts/intel/lx_systrace/Makefile
    usr/src/uts/intel/lxautofs/Makefile
    usr/src/uts/intel/lxprocfs/Makefile
    usr/src/uts/intel/nfp/Makefile
    usr/src/uts/intel/overlay/Makefile
    usr/src/uts/intel/smrt/Makefile
    usr/src/uts/intel/vmxnet/Makefile
    usr/src/uts/intel/vnd/Makefile
    usr/src/uts/intel/vxlan/Makefile
    usr/src/uts/sparc/datafilt/Makefile
    usr/src/uts/sparc/inotify/Makefile

1 files changed, 5 insertions, 7 deletions

diff --git a/usr/src/tools/scripts/find_elf.1onbld b/usr/src/tools/scripts/find_elf.1onbld
index a2d3b205ee..ac578ea9df 100644
--- a/usr/src/tools/scripts/find_elf.1onbld
+++ b/usr/src/tools/scripts/find_elf.1onbld
@@ -19,18 +19,17 @@
 .\"
 .\" CDDL HEADER END
 .\"
-.TH FIND_ELF 1ONBLD "Mar 25, 2010"
+.TH FIND_ELF 1ONBLD "December 3, 2021"
 .SH NAME
-find_elf \- Locate ELF shared objects and executables
+find_elf \- Locate ELF objects
 .SH SYNOPSIS
 \fBfind_elf [-afrs] path\fP
 .SH DESCRIPTION
 The
 .I find_elf
 command descends a directory hierarchy and produces one line
-of output on stdout for each ELF executable or shared object found.
+of output on stdout for each ELF object found.
 .SH OPTIONS
-.LP
 The following options are supported:
 .TP 4
 .B \-a
@@ -54,7 +53,6 @@ instead of fully qualified.
 .B \-s
 Only report shared objects.
 .SH OUTPUT
-.LP
 .I find_elf
 produces a series of PREFIX, OBJECT, and ALIAS lines, which collectively
 describe the ELF objects located. Whitespace is used within each
@@ -76,14 +74,14 @@ For each object found, an OBJECT line is produced to describe it:
 .sp
 .in +4
 .nf
-OBJECT [32 | 64] [DYN | EXEC] [VERDEF | NOVERDEF] object-path
+OBJECT [32 | 64] [DYN | EXEC | REL] [VERDEF | NOVERDEF] object-path
 .fi
 .in -4
 .sp
 The first field provides the ELF class of the object, and will be
 either 32 or 64.
 The second field provides the type of object, either
-a shared object (DYN) or executable (EXEC).
+a shared object (DYN), an executable (EXEC), or a relocatable object (REL).
 The third field will be VERDEF if the object contains ELF
 version definitions, and NOVERDEF if the object is not versioned.
 The final field gives the path to the object.