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/uts/intel/cxgbe | |
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/uts/intel/cxgbe')
-rw-r--r-- | usr/src/uts/intel/cxgbe/cxgbe/Makefile | 2 | ||||
-rw-r--r-- | usr/src/uts/intel/cxgbe/t4nex/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/uts/intel/cxgbe/cxgbe/Makefile b/usr/src/uts/intel/cxgbe/cxgbe/Makefile index 25c5c8ab10..e47abf752d 100644 --- a/usr/src/uts/intel/cxgbe/cxgbe/Makefile +++ b/usr/src/uts/intel/cxgbe/cxgbe/Makefile @@ -47,7 +47,7 @@ CFLAGS += -I$(UTSBASE)/common/io/cxgbe -I$(UTSBASE)/common/io/cxgbe/common \ # # Driver depends # -LDFLAGS += -dy -N misc/mac -N drv/ip +LDFLAGS += -N misc/mac -N drv/ip # # Default build targets. diff --git a/usr/src/uts/intel/cxgbe/t4nex/Makefile b/usr/src/uts/intel/cxgbe/t4nex/Makefile index cae1449725..b1784f1f60 100644 --- a/usr/src/uts/intel/cxgbe/t4nex/Makefile +++ b/usr/src/uts/intel/cxgbe/t4nex/Makefile @@ -51,7 +51,7 @@ CFLAGS += -I$(UTSBASE)/common/io/cxgbe -I$(UTSBASE)/common/io/cxgbe/common \ # # Driver depends # -LDFLAGS += -dy -N misc/mac -N drv/ip +LDFLAGS += -N misc/mac -N drv/ip # needs work SMOFF += all_func_returns,snprintf_overflow |