From owner-svn-src-projects@FreeBSD.ORG Thu Jul 15 22:15:45 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3C9CC1065673; Thu, 15 Jul 2010 22:15:45 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2B33F8FC16; Thu, 15 Jul 2010 22:15:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6FMFjZD016895; Thu, 15 Jul 2010 22:15:45 GMT (envelope-from jeff@svn.freebsd.org) Received: (from jeff@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6FMFj22016892; Thu, 15 Jul 2010 22:15:45 GMT (envelope-from jeff@svn.freebsd.org) Message-Id: <201007152215.o6FMFj22016892@svn.freebsd.org> From: Jeff Roberson Date: Thu, 15 Jul 2010 22:15:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210143 - projects/ofed/head/sys/conf X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jul 2010 22:15:45 -0000 Author: jeff Date: Thu Jul 15 22:15:44 2010 New Revision: 210143 URL: http://svn.freebsd.org/changeset/base/210143 Log: - Fix the files definitions for mlx4 and add mthca. - Correct the OFED_C_NOIMP target and add the set of errors to be omitted when building linux code. Sponsored by: Isilon Systems, iX Systems, and Panasas. Modified: projects/ofed/head/sys/conf/files projects/ofed/head/sys/conf/kern.pre.mk Modified: projects/ofed/head/sys/conf/files ============================================================================== --- projects/ofed/head/sys/conf/files Thu Jul 15 21:56:45 2010 (r210142) +++ projects/ofed/head/sys/conf/files Thu Jul 15 22:15:44 2010 (r210143) @@ -2663,6 +2663,8 @@ ofed/include/linux/linux_compat.c optio no-depend compile-with "${OFED_C}" ofed/include/linux/linux_idr.c optional infiniband \ no-depend compile-with "${OFED_C}" +ofed/include/linux/linux_radix.c optional infiniband \ + no-depend compile-with "${OFED_C}" ofed/drivers/infiniband/core/addr.c optional infiniband \ compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" ofed/drivers/infiniband/core/agent.c optional infiniband \ @@ -2742,32 +2744,126 @@ ofed/drivers/infiniband/core/verbs.c op compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/core/" ofed/drivers/infiniband/hw/mlx4/ah.c optional mlx4 \ - no-depend obj-prefix "mlx4_" \ + no-depend obj-prefix "mlx4ib_" \ compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/infiniband/hw/mlx4/" ofed/drivers/infiniband/hw/mlx4/cq.c optional mlx4 \ - no-depend obj-prefix "mlx4_" \ + no-depend obj-prefix "mlx4ib_" \ compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/infiniband/hw/mlx4/" ofed/drivers/infiniband/hw/mlx4/doorbell.c optional mlx4 \ - no-depend obj-prefix "mlx4_" \ + no-depend obj-prefix "mlx4ib_" \ compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/infiniband/hw/mlx4/" ofed/drivers/infiniband/hw/mlx4/mad.c optional mlx4 \ - no-depend obj-prefix "mlx4_" \ + no-depend obj-prefix "mlx4ib_" \ compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/infiniband/hw/mlx4/" ofed/drivers/infiniband/hw/mlx4/main.c optional mlx4 \ - no-depend obj-prefix "mlx4_" \ + no-depend obj-prefix "mlx4ib_" \ compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/infiniband/hw/mlx4/" ofed/drivers/infiniband/hw/mlx4/mr.c optional mlx4 \ - no-depend obj-prefix "mlx4_" \ + no-depend obj-prefix "mlx4ib_" \ compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/infiniband/hw/mlx4/" ofed/drivers/infiniband/hw/mlx4/qp.c optional mlx4 \ - no-depend obj-prefix "mlx4_" \ + no-depend obj-prefix "mlx4ib_" \ compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/infiniband/hw/mlx4/" ofed/drivers/infiniband/hw/mlx4/srq.c optional mlx4 \ - no-depend obj-prefix "mlx4_" \ + no-depend obj-prefix "mlx4ib_" \ compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/infiniband/hw/mlx4/" #ofed/drivers/infiniband/hw/mlx4/wc.c optional mlx4 \ -# no-depend obj-prefix "mlx4_" \ +# no-depend obj-prefix "mlx4ib_" \ # compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/infiniband/hw/mlx4/" +ofed/drivers/net/mlx4/alloc.c optional mlx4 \ + no-depend obj-prefix "mlx4_" \ + compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/net/mlx4/" +ofed/drivers/net/mlx4/catas.c optional mlx4 \ + no-depend obj-prefix "mlx4_" \ + compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/net/mlx4/" +ofed/drivers/net/mlx4/cmd.c optional mlx4 \ + no-depend obj-prefix "mlx4_" \ + compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/net/mlx4/" +ofed/drivers/net/mlx4/cq.c optional mlx4 \ + no-depend obj-prefix "mlx4_" \ + compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/net/mlx4/" +ofed/drivers/net/mlx4/eq.c optional mlx4 \ + no-depend obj-prefix "mlx4_" \ + compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/net/mlx4/" +ofed/drivers/net/mlx4/fw.c optional mlx4 \ + no-depend obj-prefix "mlx4_" \ + compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/net/mlx4/" +ofed/drivers/net/mlx4/icm.c optional mlx4 \ + no-depend obj-prefix "mlx4_" \ + compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/net/mlx4/" +ofed/drivers/net/mlx4/intf.c optional mlx4 \ + no-depend obj-prefix "mlx4_" \ + compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/net/mlx4/" +ofed/drivers/net/mlx4/main.c optional mlx4 \ + no-depend obj-prefix "mlx4_" \ + compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/net/mlx4/" +ofed/drivers/net/mlx4/mcg.c optional mlx4 \ + no-depend obj-prefix "mlx4_" \ + compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/net/mlx4/" +ofed/drivers/net/mlx4/mr.c optional mlx4 \ + no-depend obj-prefix "mlx4_" \ + compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/net/mlx4/" +ofed/drivers/net/mlx4/pd.c optional mlx4 \ + no-depend obj-prefix "mlx4_" \ + compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/net/mlx4/" +ofed/drivers/net/mlx4/port.c optional mlx4 \ + no-depend obj-prefix "mlx4_" \ + compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/net/mlx4/" +ofed/drivers/net/mlx4/profile.c optional mlx4 \ + no-depend obj-prefix "mlx4_" \ + compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/net/mlx4/" +ofed/drivers/net/mlx4/qp.c optional mlx4 \ + no-depend obj-prefix "mlx4_" \ + compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/net/mlx4/" +ofed/drivers/net/mlx4/reset.c optional mlx4 \ + no-depend obj-prefix "mlx4_" \ + compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/net/mlx4/" +ofed/drivers/net/mlx4/sense.c optional mlx4 \ + no-depend obj-prefix "mlx4_" \ + compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/net/mlx4/" +ofed/drivers/net/mlx4/srq.c optional mlx4 \ + no-depend obj-prefix "mlx4_" \ + compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/net/mlx4/" +ofed/drivers/net/mlx4/xrcd.c optional mlx4 \ + no-depend obj-prefix "mlx4_" \ + compile-with "${OFED_C_NOIMP} -I$S/ofed/drivers/net/mlx4/" + +ofed/drivers/infiniband/hw/mthca/mthca_allocator.c optional mthca \ + no-depend compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/mthca/" +ofed/drivers/infiniband/hw/mthca/mthca_av.c optional mthca \ + no-depend compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/mthca/" +ofed/drivers/infiniband/hw/mthca/mthca_catas.c optional mthca \ + no-depend compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/mthca/" +ofed/drivers/infiniband/hw/mthca/mthca_cmd.c optional mthca \ + no-depend compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/mthca/" +ofed/drivers/infiniband/hw/mthca/mthca_cq.c optional mthca \ + no-depend compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/mthca/" +ofed/drivers/infiniband/hw/mthca/mthca_eq.c optional mthca \ + no-depend compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/mthca/" +ofed/drivers/infiniband/hw/mthca/mthca_mad.c optional mthca \ + no-depend compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/mthca/" +ofed/drivers/infiniband/hw/mthca/mthca_main.c optional mthca \ + no-depend compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/mthca/" +ofed/drivers/infiniband/hw/mthca/mthca_mcg.c optional mthca \ + no-depend compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/mthca/" +ofed/drivers/infiniband/hw/mthca/mthca_memfree.c optional mthca \ + no-depend compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/mthca/" +ofed/drivers/infiniband/hw/mthca/mthca_mr.c optional mthca \ + no-depend compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/mthca/" +ofed/drivers/infiniband/hw/mthca/mthca_pd.c optional mthca \ + no-depend compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/mthca/" +ofed/drivers/infiniband/hw/mthca/mthca_profile.c optional mthca \ + no-depend compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/mthca/" +ofed/drivers/infiniband/hw/mthca/mthca_provider.c optional mthca \ + no-depend compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/mthca/" +ofed/drivers/infiniband/hw/mthca/mthca_qp.c optional mthca \ + no-depend compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/mthca/" +ofed/drivers/infiniband/hw/mthca/mthca_reset.c optional mthca \ + no-depend compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/mthca/" +ofed/drivers/infiniband/hw/mthca/mthca_srq.c optional mthca \ + no-depend compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/mthca/" +ofed/drivers/infiniband/hw/mthca/mthca_uar.c optional mthca \ + no-depend compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/mthca/" # crypto support opencrypto/cast.c optional crypto | ipsec Modified: projects/ofed/head/sys/conf/kern.pre.mk ============================================================================== --- projects/ofed/head/sys/conf/kern.pre.mk Thu Jul 15 21:56:45 2010 (r210142) +++ projects/ofed/head/sys/conf/kern.pre.mk Thu Jul 15 22:15:44 2010 (r210143) @@ -137,8 +137,8 @@ NORMAL_LINT= ${LINT} ${LINTFLAGS} ${CFLA # does not honor. OFEDINCLUDES= -I$S/ofed/include/ OFEDNOERR= -Wno-cast-qual -Wno-pointer-arith -OFEDCFLAGS= ${CFLAGS:N-I*} ${OFEDINCLUDES} ${CFLAGS:M-I*} -OFED_C_NOIMP= ${CC} -c ${OFEDCFLAGS} ${WERROR} ${OFEDNOERR} ${PROF} +OFEDCFLAGS= ${CFLAGS:N-I*} ${OFEDINCLUDES} ${CFLAGS:M-I*} ${OFEDNOERR} +OFED_C_NOIMP= ${CC} -c -o ${.TARGET} ${OFEDCFLAGS} ${WERROR} ${PROF} OFED_C= ${OFED_C_NOIMP} ${.IMPSRC} GEN_CFILES= $S/$M/$M/genassym.c ${MFILES:T:S/.m$/.c/}