--- a/components/open-fabrics/ibutils/Makefile	Fri Jan 22 12:36:49 2016 -0800
+++ b/components/open-fabrics/ibutils/Makefile	Tue Jan 26 12:07:50 2016 -0600
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 # OFED only builds with GCC
@@ -47,7 +47,7 @@
 
 CONFIGURE_ENV +=	INSTALL_DATA="$(INSTALL) -m 644"
 
-CONFIGURE_OPTIONS +=	CXXFLAGS="$(CXXFLAGS)"
+CONFIGURE_OPTIONS +=	CXXFLAGS="$(CC_BITS)"
 CONFIGURE_OPTIONS +=	--with-osm=$(PROTO_DIR)/usr
 CONFIGURE_OPTIONS +=	--bindir=$(USRSBINDIR)
 

--- a/components/open-fabrics/perftest/Makefile	Fri Jan 22 12:36:49 2016 -0800
+++ b/components/open-fabrics/perftest/Makefile	Tue Jan 26 12:07:50 2016 -0600
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 # OFED only builds with GCC
@@ -49,7 +49,7 @@
 LIBS +=         -lsocket -lnsl -lkstat -lrdmacm -libverbs -libumad -libmad
 
 LDFLAGS +=	-L$(PROTO_DIR)/$(CONFIGURE_LIBDIR.$(BITS))
-CFLAGS +=	$(SHARED_INCLUDES)
+CFLAGS +=	$(SHARED_INCLUDES) -fgnu89-inline
 
 CONFIGURE_OPTIONS +=	--bindir=$(USRBINDIR)