9 files changed, 39 insertions, 32 deletions

diff --git a/contrib/ofed/Makefile b/contrib/ofed/Makefile
index 3e987ab499b7..c4760f8ed248 100644
--- a/contrib/ofed/Makefile
+++ b/contrib/ofed/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SUBDIR_A_DEPEND=
+SUBDIR_A_DEPEND= ${_libthr}
 SUBDIR_A= \
 include
 
diff --git a/contrib/ofed/libibcm/Makefile b/contrib/ofed/libibcm/Makefile
index df21677e2b73..c40e8202987a 100644
--- a/contrib/ofed/libibcm/Makefile
+++ b/contrib/ofed/libibcm/Makefile
@@ -7,7 +7,7 @@ LIB=		ibcm
 SHLIB_MAJOR=	1
 MK_PROFILE=	no
 SRCS=		cm.c
-LDADD=		ibverbs
+LIBADD=		ibverbs
 CFLAGS+=	-I${.CURDIR}
 MAN=
 VERSION_MAP=	${.CURDIR}/libibcm.map
diff --git a/contrib/ofed/libmlx4/Makefile b/contrib/ofed/libmlx4/Makefile
index 4867cc67fa77..d460cc2b6709 100644
--- a/contrib/ofed/libmlx4/Makefile
+++ b/contrib/ofed/libmlx4/Makefile
@@ -16,7 +16,7 @@ qp.c \
 srq.c \
 verbs.c
 
-LDADD=		ibverbs pthread
+LIBADD=		ibverbs pthread
 CFLAGS+=	-I${.CURDIR}
 
 .include <bsd.lib.mk>
diff --git a/contrib/ofed/libmlx5/Makefile b/contrib/ofed/libmlx5/Makefile
index 180b67ac6813..5e54172ca49b 100644
--- a/contrib/ofed/libmlx5/Makefile
+++ b/contrib/ofed/libmlx5/Makefile
@@ -16,7 +16,7 @@ qp.c \
 srq.c \
 verbs.c
 
-LDADD=		ibverbs pthread
+LIBADD=		ibverbs pthread
 CFLAGS+=	-I${.CURDIR}
 VERSION_MAP=	${.CURDIR}/libmlx5.map
 
diff --git a/contrib/ofed/librdmacm/Makefile b/contrib/ofed/librdmacm/Makefile
index 6bc272431636..593315dd6118 100644
--- a/contrib/ofed/librdmacm/Makefile
+++ b/contrib/ofed/librdmacm/Makefile
@@ -65,7 +65,7 @@ rdma_resolve_addr.3 \
 rdma_resolve_route.3 \
 rdma_set_option.3
 
-LDADD=		ibverbs
+LIBADD=		ibverbs
 VERSION_MAP=	${.CURDIR}/librdmacm.map
 
 .include <bsd.lib.mk>
diff --git a/contrib/ofed/opensm/complib/Makefile b/contrib/ofed/opensm/complib/Makefile
index 77398268652d..b45d6ea73624 100644
--- a/contrib/ofed/opensm/complib/Makefile
+++ b/contrib/ofed/opensm/complib/Makefile
@@ -28,7 +28,7 @@ ib_statustext.c
 
 CFLAGS+=	-I${.CURDIR}/.. -DHAVE_CONFIG_H=1
 CFLAGS+=	-I${INCLUDEDIR}/infiniband
-LDADD=		pthread
+LIBADD=		pthread
 VERSION_MAP=	${.CURDIR}/libosmcomp.map
 
 .include <bsd.lib.mk>
diff --git a/contrib/ofed/opensm/opensm/Makefile b/contrib/ofed/opensm/opensm/Makefile
index de0c3ba3c40f..3702f7bd258d 100644
--- a/contrib/ofed/opensm/opensm/Makefile
+++ b/contrib/ofed/opensm/opensm/Makefile
@@ -96,6 +96,6 @@ st.c
 MAN=		opensm.8
 CFLAGS+=	-I${.CURDIR}/.. -DHAVE_CONFIG_H=1
 CFLAGS+=	-I${INCLUDEDIR}/infiniband
-LDADD=		opensm osmvendor osmcomp wrap pthread
+LIBADD=		opensm osmvendor osmcomp wrap pthread
 
 .include <bsd.prog.mk>
diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk
index 003edfa5f0eb..b3cb375e277e 100644
--- a/share/mk/bsd.libnames.mk
+++ b/share/mk/bsd.libnames.mk
@@ -81,9 +81,8 @@ LIBHEIMNTLM?=	${LIBDESTDIR}${LIBDIR_BASE}/libheimntlm.a
 LIBHEIMSQLITE?=	${LIBDESTDIR}${LIBDIR_BASE}/libheimsqlite.a
 LIBHX509?=	${LIBDESTDIR}${LIBDIR_BASE}/libhx509.a
 LIBIBCM?=	${LIBDESTDIR}${LIBDIR_BASE}/libibcm.a
-LIBIBCOMMON?=	${LIBDESTDIR}${LIBDIR_BASE}/libibcommon.a
 LIBIBMAD?=	${LIBDESTDIR}${LIBDIR_BASE}/libibmad.a
-LIBIBSDP?=	${LIBDESTDIR}${LIBDIR_BASE}/libibsdp.a
+LIBIBNETDISC?=	${LIBDESTDIR}${LIBDIR_BASE}/libibnetdisc.a
 LIBIBUMAD?=	${LIBDESTDIR}${LIBDIR_BASE}/libibumad.a
 LIBIBVERBS?=	${LIBDESTDIR}${LIBDIR_BASE}/libibverbs.a
 LIBIFCONFIG?=	${LIBDESTDIR}${LIBDIR_BASE}/libifconfig.a
@@ -107,6 +106,7 @@ LIBMEMSTAT?=	${LIBDESTDIR}${LIBDIR_BASE}/libmemstat.a
 LIBMENU?=	${LIBDESTDIR}${LIBDIR_BASE}/libmenu.a
 LIBMILTER?=	${LIBDESTDIR}${LIBDIR_BASE}/libmilter.a
 LIBMLX4?=	${LIBDESTDIR}${LIBDIR_BASE}/libmlx4.a
+LIBMLX5?=	${LIBDESTDIR}${LIBDIR_BASE}/libmlx5.a
 LIBMP?=		${LIBDESTDIR}${LIBDIR_BASE}/libmp.a
 LIBMT?=		${LIBDESTDIR}${LIBDIR_BASE}/libmt.a
 LIBNANDFS?=	${LIBDESTDIR}${LIBDIR_BASE}/libnandfs.a
diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk
index 2639f6bdf253..f3c5f246d992 100644
--- a/share/mk/src.libnames.mk
+++ b/share/mk/src.libnames.mk
@@ -193,17 +193,16 @@ _LIBRARIES+= \
 _LIBRARIES+= \
 		cxgb4 \
 		ibcm \
-		ibcommon \
 		ibmad \
-		ibsdp \
+		ibnetdisc \
 		ibumad \
 		ibverbs \
 		mlx4 \
-		opensm \
-		osmcomp \
-		osmvendor \
+		mlx5 \
 		rdmacm \
-
+		osmcomp \
+		opensm \
+		osmvendor
 .endif
 
 # Each library's LIBADD needs to be duplicated here for static linkage of
@@ -329,16 +328,21 @@ _DP_zfs=	md pthread umem util uutil m nvpair avl bsdxml geom nvpair z \
 		zfs_core
 _DP_zfs_core=	nvpair
 _DP_zpool=	md pthread z nvpair avl umem
+
+# OFED support
 .if ${MK_OFED} != "no"
 _DP_cxgb4=	ibverbs pthread
 _DP_ibcm=	ibverbs
-_DP_ibmad=	ibcommon ibumad
-_DP_ibumad=	ibcommon
+_DP_ibmad=	ibumad
+_DP_ibnetdisc=	osmcomp ibmad ibumad
+_DP_ibumad=	
+_DP_ibverbs=
 _DP_mlx4=	ibverbs pthread
-_DP_opensm=	pthread
-_DP_osmcomp=	pthread
-_DP_osmvendor=	ibumad opensm osmcomp pthread
+_DP_mlx5=	ibverbs pthread
 _DP_rdmacm=	ibverbs
+_DP_osmcomp=	pthread
+_DP_opensm=	pthread
+_DP_osmvendor=	ibumad pthread
 .endif
 
 # Define special cases
@@ -479,18 +483,21 @@ LIBUUTILDIR=	${OBJTOP}/cddl/lib/libuutil
 LIBZFSDIR=	${OBJTOP}/cddl/lib/libzfs
 LIBZFS_COREDIR=	${OBJTOP}/cddl/lib/libzfs_core
 LIBZPOOLDIR=	${OBJTOP}/cddl/lib/libzpool
-LIBCXGB4DIR=	${OBJTOP}/contrib/ofed/usr.lib/libcxgb4
-LIBIBCMDIR=	${OBJTOP}/contrib/ofed/usr.lib/libibcm
-LIBIBCOMMONDIR=	${OBJTOP}/contrib/ofed/usr.lib/libibcommon
-LIBIBMADDIR=	${OBJTOP}/contrib/ofed/usr.lib/libibmad
-LIBIBUMADDIR=	${OBJTOP}/contrib/ofed/usr.lib/libibumad
-LIBIBVERBSDIR=	${OBJTOP}/contrib/ofed/usr.lib/libibverbs
-LIBMLX4DIR=	${OBJTOP}/contrib/ofed/usr.lib/libmlx4
-LIBOPENSMDIR=	${OBJTOP}/contrib/ofed/usr.lib/libopensm
-LIBOSMCOMPDIR=	${OBJTOP}/contrib/ofed/usr.lib/libosmcomp
-LIBOSMVENDORDIR=	${OBJTOP}/contrib/ofed/usr.lib/libosmvendor
-LIBRDMACMDIR=	${OBJTOP}/contrib/ofed/usr.lib/librdmacm
-LIBIBSDPDIR=	${OBJTOP}/contrib/ofed/usr.lib/libsdp
+
+# OFED support
+LIBCXGB4DIR=	${OBJTOP}/contrib/ofed/libcxgb4
+LIBIBCMDIR=	${OBJTOP}/contrib/ofed/libibcm
+LIBIBMADDIR=	${OBJTOP}/contrib/ofed/libibmad
+LIBIBNETDISCDIR=${OBJTOP}/contrib/ofed/libibnetdisc
+LIBIBUMADDIR=	${OBJTOP}/contrib/ofed/libibumad
+LIBIBVERBSDIR=	${OBJTOP}/contrib/ofed/libibverbs
+LIBMLX4DIR=	${OBJTOP}/contrib/ofed/libmlx4
+LIBMLX5DIR=	${OBJTOP}/contrib/ofed/libmlx5
+LIBRDMACMDIR=	${OBJTOP}/contrib/ofed/librdmacm
+LIBOSMCOMPDIR=	${OBJTOP}/contrib/ofed/opensm/complib
+LIBOPENSMDIR=	${OBJTOP}/contrib/ofed/opensm/libopensm
+LIBOSMVENDORDIR=${OBJTOP}/contrib/ofed/opensm/libvendor
+
 LIBDIALOGDIR=	${OBJTOP}/gnu/lib/libdialog
 LIBGCOVDIR=	${OBJTOP}/gnu/lib/libgcov
 LIBGOMPDIR=	${OBJTOP}/gnu/lib/libgomp