Index: contrib/ofed/include/udma_barrier.h
===================================================================
--- contrib/ofed/include/udma_barrier.h
+++ contrib/ofed/include/udma_barrier.h
@@ -96,6 +96,14 @@
 #define udma_to_device_barrier() asm volatile("dsb st" ::: "memory");
 #elif defined(__sparc__) || defined(__s390x__)
 #define udma_to_device_barrier() asm volatile("" ::: "memory")
+#elif defined(__mips__)
+#include <sys/types.h>
+#include <machine/atomic.h>
+#define udma_to_device_barrier() mips_sync()
+#elif defined(__arm__)
+#include <sys/types.h>
+#include <machine/atomic.h>
+#define udma_to_device_barrier() dmb()
 #else
 #error No architecture specific memory barrier defines found!
 #endif
@@ -128,6 +136,10 @@
 #define udma_from_device_barrier() asm volatile("dsb ld" ::: "memory");
 #elif defined(__sparc__) || defined(__s390x__)
 #define udma_from_device_barrier() asm volatile("" ::: "memory")
+#elif defined(__mips__)
+#define udma_from_device_barrier() mips_sync()
+#elif defined(__arm__)
+#define udma_from_device_barrier() dmb()
 #else
 #error No architecture specific memory barrier defines found!
 #endif
@@ -192,6 +204,10 @@
 #define mmio_flush_writes() asm volatile("dsb st" ::: "memory");
 #elif defined(__sparc__) || defined(__s390x__)
 #define mmio_flush_writes() asm volatile("" ::: "memory")
+#elif defined(__mips__)
+#define mmio_flush_writes() mips_sync()
+#elif defined(__arm__)
+#define mmio_flush_writes() dmb()
 #else
 #error No architecture specific memory barrier defines found!
 #endif
Index: contrib/ofed/infiniband-diags/build/Makefile.inc
===================================================================
--- contrib/ofed/infiniband-diags/build/Makefile.inc
+++ contrib/ofed/infiniband-diags/build/Makefile.inc
@@ -8,5 +8,6 @@
 CFLAGS+= -DHAVE_CONFIG_H=1
 CFLAGS+= -I${.CURDIR}/../../
 CFLAGS+= -I${.CURDIR}/../../src
+CFLAGS+=-I${.CURDIR}/../../../opensm/include
 LIBADD+= osmcomp ibmad ibumad
 
Index: contrib/ofed/libibnetdisc/Makefile
===================================================================
--- contrib/ofed/libibnetdisc/Makefile
+++ contrib/ofed/libibnetdisc/Makefile
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 .PATH: ${.CURDIR} ${.CURDIR}/man
 
 SHLIBDIR?=	/usr/lib
@@ -26,8 +28,11 @@
 
 LIBADD=		osmcomp ibmad ibumad
 CFLAGS+=	-DHAVE_CONFIG_H=1
-CFLAGS+=	-I${.CURDIR}
+CFLAGS+=	-I${.CURDIR} -I${.CURDIR}/../opensm/include
 CFLAGS+=	-I${INCLUDEDIR}/infiniband
+.if ${COMPILER_FEATURES:Mc++11}
+CXXFLAGS+=	-std=c++11
+.endif
 VERSION_MAP=	${.CURDIR}/libibnetdisc.map
 
 .include <bsd.lib.mk>
Index: contrib/ofed/libibnetdisc/g_hash_table.cpp
===================================================================
--- contrib/ofed/libibnetdisc/g_hash_table.cpp
+++ contrib/ofed/libibnetdisc/g_hash_table.cpp
@@ -31,17 +31,17 @@
  *
  */
 
-#if defined(__clang__)
+#if __cplusplus >= 201103L
 #include <unordered_map>
-#define	HASH_TABLE_UNORDERED_MAP std::unordered_map
+#define	UM_NAMESPACE std
 #else
 #include <tr1/unordered_map>
-#define	HASH_TABLE_UNORDERED_MAP std::tr1::unordered_map
+#define	UM_NAMESPACE std::tr1
 #endif
 
 class HashTable {
 public:
-	HASH_TABLE_UNORDERED_MAP<void *, void *> map;
+	UM_NAMESPACE::unordered_map<void *, void *> map;
 	HashTable() { };
 	~HashTable() { };
 };
Index: contrib/ofed/librdmacm/librdmacm.map
===================================================================
--- contrib/ofed/librdmacm/librdmacm.map
+++ contrib/ofed/librdmacm/librdmacm.map
@@ -60,10 +60,6 @@
 		rsetsockopt;
 		rgetsockopt;
 		rfcntl;
-		rpoll;
-		rselect;
-		rdma_get_src_port;
-		rdma_get_dst_port;
 		riomap;
 		riounmap;
 		riowrite;
Index: contrib/ofed/opensm/complib/Makefile
===================================================================
--- contrib/ofed/opensm/complib/Makefile
+++ contrib/ofed/opensm/complib/Makefile
@@ -26,7 +26,7 @@
 cl_vector.c \
 ib_statustext.c
 
-CFLAGS+=	-I${.CURDIR}/.. -DHAVE_CONFIG_H=1
+CFLAGS+=	-I${.CURDIR}/.. -I${.CURDIR}/../include -DHAVE_CONFIG_H=1
 CFLAGS+=	-I${INCLUDEDIR}/infiniband
 LIBADD=		pthread
 VERSION_MAP=	${.CURDIR}/libosmcomp.map
Index: contrib/ofed/opensm/libopensm/Makefile
===================================================================
--- contrib/ofed/opensm/libopensm/Makefile
+++ contrib/ofed/opensm/libopensm/Makefile
@@ -13,7 +13,7 @@
 osm_helper.c
 
 LIBADD=		pthread
-CFLAGS+=	-I${.CURDIR}/.. -DHAVE_CONFIG_H=1
+CFLAGS+=	-I${.CURDIR}/.. -I${.CURDIR}/../include -DHAVE_CONFIG_H=1
 CFLAGS+=	-I${INCLUDEDIR}/infiniband
 VERSION_MAP=	${.CURDIR}/../opensm/libopensm.map
 
Index: contrib/ofed/opensm/libvendor/Makefile
===================================================================
--- contrib/ofed/opensm/libvendor/Makefile
+++ contrib/ofed/opensm/libvendor/Makefile
@@ -12,7 +12,7 @@
 osm_vendor_ibumad_sa.c
 
 LIBADD=		ibumad pthread
-CFLAGS+=	-I${.CURDIR}/.. -DHAVE_CONFIG_H=1
+CFLAGS+=	-I${.CURDIR}/.. -I${.CURDIR}/../include -DHAVE_CONFIG_H=1
 CFLAGS+=	-I${INCLUDEDIR}/infiniband
 VERSION_MAP=	${.CURDIR}/libosmvendor.map
 
Index: contrib/ofed/opensm/opensm/Makefile
===================================================================
--- contrib/ofed/opensm/opensm/Makefile
+++ contrib/ofed/opensm/opensm/Makefile
@@ -94,7 +94,7 @@
 st.c
 
 MAN=		opensm.8
-CFLAGS+=	-I${.CURDIR}/.. -DHAVE_CONFIG_H=1
+CFLAGS+=	-I${.CURDIR}/.. -I${.CURDIR}/../include -DHAVE_CONFIG_H=1
 CFLAGS+=	-I${INCLUDEDIR}/infiniband
 LIBADD=		opensm osmvendor osmcomp wrap pthread