diff options
| author | Dan McDonald <danmcd@joyent.com> | 2021-12-14 14:54:23 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2021-12-14 14:54:23 -0500 |
| commit | 248c05d8ed6486018047f51692e61e14f4f0a82a (patch) | |
| tree | c11e3e9071c904556b89e5cd50214f16a4a765ae /usr/src/tools/scripts/find_elf.pl | |
| parent | 35aece5ce85515ca75710d81cfdb091130e87e5c (diff) | |
| parent | 532883ab3269bdf14c55e45838bc9ae275d70ed5 (diff) | |
| download | illumos-joyent-release-20211216.tar.gz | |
[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
Diffstat (limited to 'usr/src/tools/scripts/find_elf.pl')
| -rw-r--r-- | usr/src/tools/scripts/find_elf.pl | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/usr/src/tools/scripts/find_elf.pl b/usr/src/tools/scripts/find_elf.pl index 96d5b24c7a..a1e0afa1f0 100644 --- a/usr/src/tools/scripts/find_elf.pl +++ b/usr/src/tools/scripts/find_elf.pl @@ -228,11 +228,13 @@ sub ProcFile { # Obtain the ELF information for this object. @Elf = GetObjectInfo($FullPath); - # Return quietly if: - # - Not an executable or sharable object - # - An executable, but the -s option was used. - if ((($Elf[1] ne 'EXEC') && ($Elf[1] ne 'DYN')) || - (($Elf[1] eq 'EXEC') && $opt{s})) { + if ($Elf[1] eq 'NONE') { + return; + } + + # Return quietly if object is executable or relocatable but the -s + # option was used. + if ((($Elf[1] eq 'EXEC') || ($Elf[1] eq 'REL')) && $opt{s}) { return; } |