[Pkg-ofed-commits] r542 - in /branches/ofed-1.5lenny/libibverbs/trunk: ./ config...
gmpc-guest at alioth.debian.org
gmpc-guest at alioth.debian.org
Fri Jan 15 11:38:55 UTC 2010
Author: gmpc-guest
Date: Fri Jan 15 11:38:55 2010
New Revision: 542
URL: http://svn.debian.org/wsvn/pkg-ofed/?sc=1&rev=542
Log:
Import OFED 1.5 ibverbs
Modified:
branches/ofed-1.5lenny/libibverbs/trunk/aclocal.m4
branches/ofed-1.5lenny/libibverbs/trunk/config/config.guess
branches/ofed-1.5lenny/libibverbs/trunk/config/config.sub
branches/ofed-1.5lenny/libibverbs/trunk/config/ltmain.sh
branches/ofed-1.5lenny/libibverbs/trunk/configure
branches/ofed-1.5lenny/libibverbs/trunk/debian/changelog
branches/ofed-1.5lenny/libibverbs/trunk/examples/asyncwatch.c
branches/ofed-1.5lenny/libibverbs/trunk/examples/device_list.c
branches/ofed-1.5lenny/libibverbs/trunk/examples/devinfo.c
branches/ofed-1.5lenny/libibverbs/trunk/examples/rc_pingpong.c
branches/ofed-1.5lenny/libibverbs/trunk/examples/srq_pingpong.c
branches/ofed-1.5lenny/libibverbs/trunk/examples/uc_pingpong.c
branches/ofed-1.5lenny/libibverbs/trunk/examples/ud_pingpong.c
branches/ofed-1.5lenny/libibverbs/trunk/fixes/XRC_RCV_QP.patch
branches/ofed-1.5lenny/libibverbs/trunk/fixes/XRC_base_implementation.patch
branches/ofed-1.5lenny/libibverbs/trunk/fixes/pthread_cond_t_fields.patch
branches/ofed-1.5lenny/libibverbs/trunk/include/infiniband/driver.h
branches/ofed-1.5lenny/libibverbs/trunk/include/infiniband/verbs.h
branches/ofed-1.5lenny/libibverbs/trunk/libibverbs.spec
branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_attach_mcast.3
branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_get_device_list.3
branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_modify_qp.3
branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_modify_srq.3
branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_poll_cq.3
branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_post_send.3
branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_query_qp.3
branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_reg_mr.3
branches/ofed-1.5lenny/libibverbs/trunk/src/cmd.c
branches/ofed-1.5lenny/libibverbs/trunk/src/compat-1_0.c
branches/ofed-1.5lenny/libibverbs/trunk/src/device.c
branches/ofed-1.5lenny/libibverbs/trunk/src/init.c
branches/ofed-1.5lenny/libibverbs/trunk/src/verbs.c
Modified: branches/ofed-1.5lenny/libibverbs/trunk/aclocal.m4
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/aclocal.m4?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/aclocal.m4 (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/aclocal.m4 Fri Jan 15 11:38:55 2010
@@ -13,7 +13,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 48 Debian 1.5.22-2 AC_PROG_LIBTOOL
+# serial 48 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -1593,18 +1593,6 @@
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
knetbsd*-gnu)
version_type=linux
need_lib_prefix=no
@@ -2380,7 +2368,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
@@ -3389,7 +3377,7 @@
;;
esac
;;
- netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
@@ -5013,7 +5001,7 @@
;;
esac
;;
- netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+ netbsd*)
;;
osf3* | osf4* | osf5*)
case $cc_basename in
@@ -5364,12 +5352,6 @@
;;
cygwin* | mingw*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
- kfreebsd*-gnu)
- _LT_AC_TAGVAR(link_all_deplibs, $1)=no
- ;;
- linux*)
- _LT_AC_TAGVAR(link_all_deplibs, $1)=no
;;
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -5567,13 +5549,12 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
- _LT_AC_TAGVAR(link_all_deplibs, $1)=no
else
_LT_AC_TAGVAR(ld_shlibs, $1)=no
fi
;;
- netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -5903,20 +5884,11 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly*)
+ freebsd* | kfreebsd*-gnu | dragonfly*)
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- ;;
-
- # GNU/kFreeBSD uses gcc -shared to do shared libraries.
- kfreebsd*-gnu)
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_AC_TAGVAR(link_all_deplibs, $1)=no
;;
hpux9*)
@@ -6014,7 +5986,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
- netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
Modified: branches/ofed-1.5lenny/libibverbs/trunk/config/config.guess
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/config/config.guess?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/config/config.guess (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/config/config.guess Fri Jan 15 11:38:55 2010
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2005-08-03'
+timestamp='2005-12-13'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -779,7 +779,7 @@
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- x86:Interix*:[34]*)
+ x86:Interix*:[345]*)
echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
exit ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@@ -851,7 +851,7 @@
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
mips64:Linux:*:*)
@@ -870,7 +870,7 @@
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
or32:Linux:*:*)
@@ -918,6 +918,9 @@
exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ vax:Linux:*:*)
+ echo ${UNAME_MACHINE}-dec-linux-gnu
exit ;;
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
@@ -964,7 +967,7 @@
LIBC=gnulibc1
# endif
#else
- #ifdef __INTEL_COMPILER
+ #if defined(__INTEL_COMPILER) || defined(__PGI)
LIBC=gnu
#else
LIBC=gnuaout
@@ -974,7 +977,7 @@
LIBC=dietlibc
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`"
test x"${LIBC}" != x && {
echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
exit
@@ -1185,7 +1188,6 @@
*:Darwin:*:*)
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
case $UNAME_PROCESSOR in
- *86) UNAME_PROCESSOR=i686 ;;
unknown) UNAME_PROCESSOR=powerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1263,6 +1265,9 @@
exit ;;
i*86:skyos:*:*)
echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+ exit ;;
+ i*86:rdos:*:*)
+ echo ${UNAME_MACHINE}-pc-rdos
exit ;;
esac
Modified: branches/ofed-1.5lenny/libibverbs/trunk/config/config.sub
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/config/config.sub?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/config/config.sub (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/config/config.sub Fri Jan 15 11:38:55 2010
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-timestamp='2005-07-08'
+timestamp='2005-12-11'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -119,8 +119,9 @@
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
- kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+ storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
@@ -171,6 +172,10 @@
-hiux*)
os=-hiuxwe2
;;
+ -sco6)
+ os=-sco5v6
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
-sco5)
os=-sco3.2v5
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -184,6 +189,10 @@
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-sco3.2v[4-9]*)
+ # Don't forget version if it is 3.2v4 or newer.
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco5v6*)
# Don't forget version if it is 3.2v4 or newer.
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
@@ -257,7 +266,7 @@
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
- | ms1 \
+ | mt \
| msp430 \
| ns16k | ns32k \
| or32 \
@@ -285,6 +294,9 @@
os=-none
;;
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+ ;;
+ ms1)
+ basic_machine=mt-unknown
;;
# We use `pc' rather than `unknown'
@@ -336,7 +348,7 @@
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipstx39-* | mipstx39el-* \
| mmix-* \
- | ms1-* \
+ | mt-* \
| msp430-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
@@ -696,6 +708,9 @@
basic_machine=i386-pc
os=-msdos
;;
+ ms1-*)
+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+ ;;
mvs)
basic_machine=i370-ibm
os=-mvs
@@ -858,6 +873,10 @@
pw32)
basic_machine=i586-unknown
os=-pw32
+ ;;
+ rdos)
+ basic_machine=i386-pc
+ os=-rdos
;;
rom68k)
basic_machine=m68k-rom68k
@@ -1181,14 +1200,15 @@
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku*)
+ | -skyos* | -haiku* | -rdos*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
Modified: branches/ofed-1.5lenny/libibverbs/trunk/config/ltmain.sh
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/config/ltmain.sh?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/config/ltmain.sh (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/config/ltmain.sh Fri Jan 15 11:38:55 2010
@@ -43,7 +43,7 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION="1.5.22 Debian 1.5.22-2"
+VERSION=1.5.22
TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
# See if we are running on zsh, and set the options which allow our
@@ -2082,10 +2082,7 @@
case $pass in
dlopen) libs="$dlfiles" ;;
dlpreopen) libs="$dlprefiles" ;;
- link)
- libs="$deplibs %DEPLIBS%"
- test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
- ;;
+ link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
esac
fi
if test "$pass" = dlopen; then
@@ -3203,11 +3200,6 @@
current=`expr $number_major + $number_minor - 1`
age="$number_minor"
revision="$number_minor"
- ;;
- *)
- $echo "$modename: unknown library version type \`$version_type'" 1>&2
- $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
- exit $EXIT_FAILURE
;;
esac
;;
Modified: branches/ofed-1.5lenny/libibverbs/trunk/configure
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/configure?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/configure (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/configure Fri Jan 15 11:38:55 2010
@@ -1154,7 +1154,7 @@
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi
- cd "$ac_popdir"
+ cd $ac_popdir
done
fi
@@ -2711,7 +2711,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2769,7 +2770,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2885,7 +2887,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2939,7 +2942,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -2984,7 +2988,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3028,7 +3033,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -3553,7 +3559,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
@@ -3670,7 +3676,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 3673 "configure"' > conftest.$ac_ext
+ echo '#line 3679 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -3790,7 +3796,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4119,7 +4126,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4289,7 +4297,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4356,7 +4365,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4616,7 +4626,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4674,7 +4685,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4745,7 +4757,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -4789,7 +4802,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5261,7 +5275,7 @@
# Provide some information about the compiler.
-echo "$as_me:5264:" \
+echo "$as_me:5278:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -5307,7 +5321,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_f77_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -5356,7 +5371,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_f77_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -6322,11 +6338,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6325: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6341: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6329: \$? = $ac_status" >&5
+ echo "$as_me:6345: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6590,11 +6606,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6593: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6609: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6597: \$? = $ac_status" >&5
+ echo "$as_me:6613: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6694,11 +6710,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6697: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6713: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6701: \$? = $ac_status" >&5
+ echo "$as_me:6717: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -6949,13 +6965,12 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
- link_all_deplibs=no
else
ld_shlibs=no
fi
;;
- netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -7171,7 +7186,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -7231,7 +7247,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -7385,20 +7402,11 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly*)
+ freebsd* | kfreebsd*-gnu | dragonfly*)
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
- ;;
-
- # GNU/kFreeBSD uses gcc -shared to do shared libraries.
- kfreebsd*-gnu)
- archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec='-R$libdir'
- hardcode_direct=yes
- hardcode_shlibpath_var=no
- link_all_deplibs=no
;;
hpux9*)
@@ -7496,7 +7504,7 @@
link_all_deplibs=yes
;;
- netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -8182,18 +8190,6 @@
dynamic_linker='GNU/Linux ld.so'
;;
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
- ;;
-
knetbsd*-gnu)
version_type=linux
need_lib_prefix=no
@@ -8519,7 +8515,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -8622,7 +8619,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -8687,7 +8685,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -8780,7 +8779,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -8845,7 +8845,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -8911,7 +8912,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -8977,7 +8979,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -9052,7 +9055,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9055 "configure"
+#line 9058 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9152,7 +9155,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9155 "configure"
+#line 9158 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10235,7 +10238,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -10296,7 +10300,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_cxx_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -10728,7 +10733,7 @@
;;
esac
;;
- netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
@@ -11381,7 +11386,7 @@
;;
esac
;;
- netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+ netbsd*)
;;
osf3* | osf4* | osf5*)
case $cc_basename in
@@ -11490,11 +11495,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11493: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11498: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11497: \$? = $ac_status" >&5
+ echo "$as_me:11502: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11594,11 +11599,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11597: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11602: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11601: \$? = $ac_status" >&5
+ echo "$as_me:11606: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11665,12 +11670,6 @@
;;
cygwin* | mingw*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
- ;;
- kfreebsd*-gnu)
- link_all_deplibs_CXX=no
- ;;
- linux*)
- link_all_deplibs_CXX=no
;;
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
@@ -12145,18 +12144,6 @@
# people can always --disable-shared, the test was removed, and we
# assume the GNU/Linux dynamic linker is in use.
dynamic_linker='GNU/Linux ld.so'
- ;;
-
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
;;
knetbsd*-gnu)
@@ -13182,11 +13169,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13185: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13172: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13189: \$? = $ac_status" >&5
+ echo "$as_me:13176: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13286,11 +13273,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13289: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13276: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13293: \$? = $ac_status" >&5
+ echo "$as_me:13280: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13541,13 +13528,12 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
- link_all_deplibs_F77=no
else
ld_shlibs_F77=no
fi
;;
- netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -13753,7 +13739,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_f77_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -13803,7 +13790,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_f77_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -13957,20 +13945,11 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly*)
+ freebsd* | kfreebsd*-gnu | dragonfly*)
archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_F77='-R$libdir'
hardcode_direct_F77=yes
hardcode_shlibpath_var_F77=no
- ;;
-
- # GNU/kFreeBSD uses gcc -shared to do shared libraries.
- kfreebsd*-gnu)
- archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec_F77='-R$libdir'
- hardcode_direct_F77=yes
- hardcode_shlibpath_var_F77=no
- link_all_deplibs_F77=no
;;
hpux9*)
@@ -14068,7 +14047,7 @@
link_all_deplibs_F77=yes
;;
- netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -14752,18 +14731,6 @@
# people can always --disable-shared, the test was removed, and we
# assume the GNU/Linux dynamic linker is in use.
dynamic_linker='GNU/Linux ld.so'
- ;;
-
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
;;
knetbsd*-gnu)
@@ -15509,11 +15476,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15512: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15479: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15516: \$? = $ac_status" >&5
+ echo "$as_me:15483: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15777,11 +15744,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15780: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15747: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15784: \$? = $ac_status" >&5
+ echo "$as_me:15751: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -15881,11 +15848,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15884: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15851: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15888: \$? = $ac_status" >&5
+ echo "$as_me:15855: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16136,13 +16103,12 @@
$echo "local: *; };" >> $output_objdir/$libname.ver~
$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
fi
- link_all_deplibs_GCJ=no
else
ld_shlibs_GCJ=no
fi
;;
- netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
@@ -16358,7 +16324,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -16418,7 +16385,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -16572,20 +16540,11 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
- freebsd* | dragonfly*)
+ freebsd* | kfreebsd*-gnu | dragonfly*)
archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec_GCJ='-R$libdir'
hardcode_direct_GCJ=yes
hardcode_shlibpath_var_GCJ=no
- ;;
-
- # GNU/kFreeBSD uses gcc -shared to do shared libraries.
- kfreebsd*-gnu)
- archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
- hardcode_libdir_flag_spec_GCJ='-R$libdir'
- hardcode_direct_GCJ=yes
- hardcode_shlibpath_var_GCJ=no
- link_all_deplibs_GCJ=no
;;
hpux9*)
@@ -16683,7 +16642,7 @@
link_all_deplibs_GCJ=yes
;;
- netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
+ netbsd*)
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
@@ -17367,18 +17326,6 @@
# people can always --disable-shared, the test was removed, and we
# assume the GNU/Linux dynamic linker is in use.
dynamic_linker='GNU/Linux ld.so'
- ;;
-
-netbsdelf*-gnu)
- version_type=linux
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- dynamic_linker='NetBSD ld.elf_so'
;;
knetbsd*-gnu)
@@ -18956,7 +18903,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -19014,7 +18962,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -19130,7 +19079,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -19184,7 +19134,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -19229,7 +19180,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -19273,7 +19225,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -19472,7 +19425,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -19549,7 +19503,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -19621,7 +19576,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -19783,7 +19739,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -19980,7 +19937,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -20062,7 +20020,8 @@
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
@@ -20981,6 +20940,11 @@
*) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
+ if test x"$ac_file" != x-; then
+ { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
@@ -21019,12 +20983,6 @@
fi;;
esac
done` || { (exit 1); exit 1; }
-
- if test x"$ac_file" != x-; then
- { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
- rm -f "$ac_file"
- fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
Modified: branches/ofed-1.5lenny/libibverbs/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/debian/changelog?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/debian/changelog (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/debian/changelog Fri Jan 15 11:38:55 2010
@@ -1,3 +1,9 @@
+libibverbs (1.1.2-0.2.g81705cb-1) unstable; urgency=low
+
+ * New upstream release from OFED 1.5
+
+ -- Guy Coates <gmpc at sanger.ac.uk> Fri, 15 Jan 2010 11:36:48 +0000
+
libibverbs (1.1.2-1+OFED) unstable; urgency=low
* OFED 1.4.1 version of libibverbs 1.1.2.
Modified: branches/ofed-1.5lenny/libibverbs/trunk/examples/asyncwatch.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/examples/asyncwatch.c?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/examples/asyncwatch.c (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/examples/asyncwatch.c Fri Jan 15 11:38:55 2010
@@ -82,7 +82,7 @@
dev_list = ibv_get_device_list(NULL);
if (!dev_list) {
- fprintf(stderr, "No IB devices found\n");
+ perror("Failed to get IB devices list");
return 1;
}
Modified: branches/ofed-1.5lenny/libibverbs/trunk/examples/device_list.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/examples/device_list.c?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/examples/device_list.c (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/examples/device_list.c Fri Jan 15 11:38:55 2010
@@ -49,7 +49,7 @@
dev_list = ibv_get_device_list(&num_devices);
if (!dev_list) {
- fprintf(stderr, "No IB devices found\n");
+ perror("Failed to get IB devices list");
return 1;
}
Modified: branches/ofed-1.5lenny/libibverbs/trunk/examples/devinfo.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/examples/devinfo.c?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/examples/devinfo.c (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/examples/devinfo.c Fri Jan 15 11:38:55 2010
@@ -67,6 +67,15 @@
return str;
}
+static const char *transport_str(enum ibv_transport_type transport)
+{
+ switch (transport) {
+ case IBV_TRANSPORT_IB: return "InfiniBand";
+ case IBV_TRANSPORT_IWARP: return "iWARP";
+ default: return "invalid transport";
+ }
+}
+
static const char *port_state_str(enum ibv_port_state pstate)
{
switch (pstate) {
@@ -161,16 +170,16 @@
return rc;
}
if (!null_gid(&gid))
- printf("\t\t\tGID[%3d]:\t\t%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+ printf("\t\t\tGID[%3d]:\t\t%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x\n",
i,
- ntohs(*((uint16_t *) gid.raw + 0)),
- ntohs(*((uint16_t *) gid.raw + 1)),
- ntohs(*((uint16_t *) gid.raw + 2)),
- ntohs(*((uint16_t *) gid.raw + 3)),
- ntohs(*((uint16_t *) gid.raw + 4)),
- ntohs(*((uint16_t *) gid.raw + 5)),
- ntohs(*((uint16_t *) gid.raw + 6)),
- ntohs(*((uint16_t *) gid.raw + 7)));
+ gid.raw[ 0], gid.raw[ 1],
+ gid.raw[ 2], gid.raw[ 3],
+ gid.raw[ 4], gid.raw[ 5],
+ gid.raw[ 6], gid.raw[ 7],
+ gid.raw[ 8], gid.raw[ 9],
+ gid.raw[10], gid.raw[11],
+ gid.raw[12], gid.raw[13],
+ gid.raw[14], gid.raw[15]);
}
return rc;
}
@@ -197,6 +206,8 @@
}
printf("hca_id:\t%s\n", ibv_get_device_name(ib_dev));
+ printf("\ttransport:\t\t\t%s (%d)\n",
+ transport_str(ib_dev->transport_type), ib_dev->transport_type);
if (strlen(device_attr.fw_ver))
printf("\tfw_ver:\t\t\t\t%s\n", device_attr.fw_ver);
printf("\tnode_guid:\t\t\t%s\n", guid_str(device_attr.node_guid, buf));
@@ -361,7 +372,7 @@
case 'l':
dev_list = orig_dev_list = ibv_get_device_list(&num_of_hcas);
if (!dev_list) {
- fprintf(stderr, "Failed to get IB devices list");
+ perror("Failed to get IB devices list");
return -1;
}
@@ -387,7 +398,7 @@
dev_list = orig_dev_list = ibv_get_device_list(NULL);
if (!dev_list) {
- fprintf(stderr, "Failed to get IB device list\n");
+ perror("Failed to get IB devices list");
return -1;
}
Modified: branches/ofed-1.5lenny/libibverbs/trunk/examples/rc_pingpong.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/examples/rc_pingpong.c?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/examples/rc_pingpong.c (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/examples/rc_pingpong.c Fri Jan 15 11:38:55 2010
@@ -558,6 +558,7 @@
usage(argv[0]);
return 1;
}
+ break;
case 'r':
rx_depth = strtol(optarg, NULL, 0);
@@ -592,7 +593,7 @@
dev_list = ibv_get_device_list(NULL);
if (!dev_list) {
- fprintf(stderr, "No IB devices found\n");
+ perror("Failed to get IB devices list");
return 1;
}
Modified: branches/ofed-1.5lenny/libibverbs/trunk/examples/srq_pingpong.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/examples/srq_pingpong.c?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/examples/srq_pingpong.c (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/examples/srq_pingpong.c Fri Jan 15 11:38:55 2010
@@ -682,7 +682,7 @@
dev_list = ibv_get_device_list(NULL);
if (!dev_list) {
- fprintf(stderr, "No IB devices found\n");
+ perror("Failed to get IB devices list");
return 1;
}
Modified: branches/ofed-1.5lenny/libibverbs/trunk/examples/uc_pingpong.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/examples/uc_pingpong.c?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/examples/uc_pingpong.c (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/examples/uc_pingpong.c Fri Jan 15 11:38:55 2010
@@ -546,6 +546,7 @@
usage(argv[0]);
return 1;
}
+ break;
case 'r':
rx_depth = strtol(optarg, NULL, 0);
@@ -580,7 +581,7 @@
dev_list = ibv_get_device_list(NULL);
if (!dev_list) {
- fprintf(stderr, "No IB devices found\n");
+ perror("Failed to get IB devices list");
return 1;
}
Modified: branches/ofed-1.5lenny/libibverbs/trunk/examples/ud_pingpong.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/examples/ud_pingpong.c?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/examples/ud_pingpong.c (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/examples/ud_pingpong.c Fri Jan 15 11:38:55 2010
@@ -580,7 +580,7 @@
dev_list = ibv_get_device_list(NULL);
if (!dev_list) {
- fprintf(stderr, "No IB devices found\n");
+ perror("Failed to get IB devices list");
return 1;
}
Modified: branches/ofed-1.5lenny/libibverbs/trunk/fixes/XRC_RCV_QP.patch
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/fixes/XRC_RCV_QP.patch?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/fixes/XRC_RCV_QP.patch (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/fixes/XRC_RCV_QP.patch Fri Jan 15 11:38:55 2010
@@ -18,11 +18,11 @@
src/verbs.c | 59 +++++++++++
7 files changed, 543 insertions(+), 27 deletions(-)
-diff --git a/include/infiniband/driver.h b/include/infiniband/driver.h
-index 30ba79f..f8138ef 100644
---- a/include/infiniband/driver.h
-+++ b/include/infiniband/driver.h
-@@ -144,7 +144,17 @@ int ibv_cmd_open_xrc_domain(struct ibv_context *context, int fd, int oflag,
+Index: libibverbs/include/infiniband/driver.h
+===================================================================
+--- libibverbs.orig/include/infiniband/driver.h 2009-11-01 15:18:20.624171000 +0200
++++ libibverbs/include/infiniband/driver.h 2009-11-01 15:18:24.572283000 +0200
+@@ -144,7 +144,17 @@ int ibv_cmd_open_xrc_domain(struct ibv_c
struct ibv_open_xrc_domain_resp *resp,
size_t resp_size);
int ibv_cmd_close_xrc_domain(struct ibv_xrc_domain *d);
@@ -41,10 +41,10 @@
/*
* sysfs helper functions
-diff --git a/include/infiniband/kern-abi.h b/include/infiniband/kern-abi.h
-index 94cf3f2..8b5cd9a 100644
---- a/include/infiniband/kern-abi.h
-+++ b/include/infiniband/kern-abi.h
+Index: libibverbs/include/infiniband/kern-abi.h
+===================================================================
+--- libibverbs.orig/include/infiniband/kern-abi.h 2009-11-01 15:18:20.629168000 +0200
++++ libibverbs/include/infiniband/kern-abi.h 2009-11-01 15:18:24.577283000 +0200
@@ -88,7 +88,12 @@ enum {
IB_USER_VERBS_CMD_POST_SRQ_RECV,
IB_USER_VERBS_CMD_CREATE_XRC_SRQ,
@@ -165,10 +165,10 @@
};
struct ibv_destroy_cq_v1 {
-diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h
-index 6c9a3b3..036a0c5 100644
---- a/include/infiniband/verbs.h
-+++ b/include/infiniband/verbs.h
+Index: libibverbs/include/infiniband/verbs.h
+===================================================================
+--- libibverbs.orig/include/infiniband/verbs.h 2009-11-01 15:18:20.635171000 +0200
++++ libibverbs/include/infiniband/verbs.h 2009-11-01 15:18:24.585280000 +0200
@@ -205,12 +205,17 @@ enum ibv_event_type {
IBV_EVENT_CLIENT_REREGISTER
};
@@ -210,7 +210,7 @@
};
struct ibv_context_ops {
-@@ -1174,6 +1195,108 @@ struct ibv_xrc_domain *ibv_open_xrc_domain(struct ibv_context *context,
+@@ -1174,6 +1195,108 @@ struct ibv_xrc_domain *ibv_open_xrc_doma
*/
int ibv_close_xrc_domain(struct ibv_xrc_domain *d);
@@ -319,11 +319,11 @@
END_C_DECLS
# undef __attribute_const
-diff --git a/src/cmd.c b/src/cmd.c
-index 66e3f2d..cedf55e 100644
---- a/src/cmd.c
-+++ b/src/cmd.c
-@@ -828,6 +828,188 @@ int ibv_cmd_modify_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
+Index: libibverbs/src/cmd.c
+===================================================================
+--- libibverbs.orig/src/cmd.c 2009-11-01 15:18:20.643167000 +0200
++++ libibverbs/src/cmd.c 2009-11-01 15:18:24.592284000 +0200
+@@ -828,6 +828,188 @@ int ibv_cmd_modify_qp(struct ibv_qp *qp,
return 0;
}
@@ -512,7 +512,7 @@
static int ibv_cmd_destroy_qp_v1(struct ibv_qp *qp)
{
struct ibv_destroy_qp_v1 cmd;
-@@ -1192,3 +1374,36 @@ int ibv_cmd_close_xrc_domain(struct ibv_xrc_domain *d)
+@@ -1192,3 +1374,36 @@ int ibv_cmd_close_xrc_domain(struct ibv_
return 0;
}
@@ -549,11 +549,11 @@
+}
+
+
-diff --git a/src/device.c b/src/device.c
-index 3abc1eb..55ed3d7 100644
---- a/src/device.c
-+++ b/src/device.c
-@@ -182,31 +182,33 @@ int __ibv_get_async_event(struct ibv_context *context,
+Index: libibverbs/src/device.c
+===================================================================
+--- libibverbs.orig/src/device.c 2009-11-01 15:18:17.794116000 +0200
++++ libibverbs/src/device.c 2009-11-01 15:18:24.597279000 +0200
+@@ -191,31 +191,33 @@ int __ibv_get_async_event(struct ibv_con
event->event_type = ev.event_type;
@@ -612,10 +612,10 @@
if (context->ops.async_event)
context->ops.async_event(event);
-diff --git a/src/libibverbs.map b/src/libibverbs.map
-index d1a6a47..fce6965 100644
---- a/src/libibverbs.map
-+++ b/src/libibverbs.map
+Index: libibverbs/src/libibverbs.map
+===================================================================
+--- libibverbs.orig/src/libibverbs.map 2009-11-01 15:18:20.646169000 +0200
++++ libibverbs/src/libibverbs.map 2009-11-01 15:18:24.600279000 +0200
@@ -97,6 +97,16 @@ IBVERBS_1.1 {
ibv_cmd_open_xrc_domain;
ibv_close_xrc_domain;
@@ -633,11 +633,11 @@
ibv_node_type_str;
ibv_port_state_str;
-diff --git a/src/verbs.c b/src/verbs.c
-index f09542f..bfc6805 100644
---- a/src/verbs.c
-+++ b/src/verbs.c
-@@ -597,3 +597,62 @@ int ibv_close_xrc_domain(struct ibv_xrc_domain *d)
+Index: libibverbs/src/verbs.c
+===================================================================
+--- libibverbs.orig/src/verbs.c 2009-11-01 15:18:20.650169000 +0200
++++ libibverbs/src/verbs.c 2009-11-01 15:18:24.604279000 +0200
+@@ -597,3 +597,62 @@ int ibv_close_xrc_domain(struct ibv_xrc_
return d->context->more_ops->close_xrc_domain(d);
}
@@ -700,7 +700,3 @@
+ return d->context->more_ops->unreg_xrc_rcv_qp(d, xrc_rcv_qpn);
+}
+
---
-1.5.1.6
-
-
Modified: branches/ofed-1.5lenny/libibverbs/trunk/fixes/XRC_base_implementation.patch
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/fixes/XRC_base_implementation.patch?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/fixes/XRC_base_implementation.patch (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/fixes/XRC_base_implementation.patch Fri Jan 15 11:38:55 2010
@@ -19,11 +19,11 @@
src/verbs.c | 54 ++++++++++++++++++++++++++
6 files changed, 271 insertions(+), 4 deletions(-)
-diff --git a/include/infiniband/driver.h b/include/infiniband/driver.h
-index 67a3bf8..30ba79f 100644
---- a/include/infiniband/driver.h
-+++ b/include/infiniband/driver.h
-@@ -99,6 +99,11 @@ int ibv_cmd_create_srq(struct ibv_pd *pd,
+Index: libibverbs/include/infiniband/driver.h
+===================================================================
+--- libibverbs.orig/include/infiniband/driver.h 2009-11-01 15:18:17.920111000 +0200
++++ libibverbs/include/infiniband/driver.h 2009-11-01 15:18:20.624171000 +0200
+@@ -99,6 +99,11 @@ int ibv_cmd_create_srq(struct ibv_pd *pd
struct ibv_srq *srq, struct ibv_srq_init_attr *attr,
struct ibv_create_srq *cmd, size_t cmd_size,
struct ibv_create_srq_resp *resp, size_t resp_size);
@@ -34,8 +34,8 @@
+ struct ibv_create_srq_resp *resp, size_t resp_size);
int ibv_cmd_modify_srq(struct ibv_srq *srq,
struct ibv_srq_attr *srq_attr,
- enum ibv_srq_attr_mask srq_attr_mask,
-@@ -134,6 +139,12 @@ int ibv_cmd_detach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid);
+ int srq_attr_mask,
+@@ -134,6 +139,12 @@ int ibv_cmd_detach_mcast(struct ibv_qp *
int ibv_dontfork_range(void *base, size_t size);
int ibv_dofork_range(void *base, size_t size);
@@ -48,10 +48,10 @@
/*
* sysfs helper functions
-diff --git a/include/infiniband/kern-abi.h b/include/infiniband/kern-abi.h
-index 0db083a..94cf3f2 100644
---- a/include/infiniband/kern-abi.h
-+++ b/include/infiniband/kern-abi.h
+Index: libibverbs/include/infiniband/kern-abi.h
+===================================================================
+--- libibverbs.orig/include/infiniband/kern-abi.h 2009-11-01 15:18:17.921121000 +0200
++++ libibverbs/include/infiniband/kern-abi.h 2009-11-01 15:18:20.629168000 +0200
@@ -85,7 +85,10 @@ enum {
IB_USER_VERBS_CMD_MODIFY_SRQ,
IB_USER_VERBS_CMD_QUERY_SRQ,
@@ -127,10 +127,10 @@
};
struct ibv_destroy_cq_v1 {
-diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h
-index a04cc62..6c9a3b3 100644
---- a/include/infiniband/verbs.h
-+++ b/include/infiniband/verbs.h
+Index: libibverbs/include/infiniband/verbs.h
+===================================================================
+--- libibverbs.orig/include/infiniband/verbs.h 2009-11-01 15:18:17.924118000 +0200
++++ libibverbs/include/infiniband/verbs.h 2009-11-01 15:18:20.635171000 +0200
@@ -92,7 +92,8 @@ enum ibv_device_cap_flags {
IBV_DEVICE_SYS_IMAGE_GUID = 1 << 11,
IBV_DEVICE_RC_RNR_NAK_GEN = 1 << 12,
@@ -224,7 +224,7 @@
};
/**
-@@ -913,6 +939,25 @@ struct ibv_srq *ibv_create_srq(struct ibv_pd *pd,
+@@ -913,6 +939,25 @@ struct ibv_srq *ibv_create_srq(struct ib
struct ibv_srq_init_attr *srq_init_attr);
/**
@@ -250,7 +250,7 @@
* ibv_modify_srq - Modifies the attributes for the specified SRQ.
* @srq: The SRQ to modify.
* @srq_attr: On input, specifies the SRQ attributes to modify. On output,
-@@ -1093,6 +1138,42 @@ const char *ibv_port_state_str(enum ibv_port_state port_state);
+@@ -1093,6 +1138,42 @@ const char *ibv_port_state_str(enum ibv_
*/
const char *ibv_event_type_str(enum ibv_event_type event);
@@ -293,11 +293,11 @@
END_C_DECLS
# undef __attribute_const
-diff --git a/src/cmd.c b/src/cmd.c
-index 66d7134..66e3f2d 100644
---- a/src/cmd.c
-+++ b/src/cmd.c
-@@ -483,6 +483,34 @@ int ibv_cmd_create_srq(struct ibv_pd *pd,
+Index: libibverbs/src/cmd.c
+===================================================================
+--- libibverbs.orig/src/cmd.c 2009-11-01 15:18:17.927111000 +0200
++++ libibverbs/src/cmd.c 2009-11-01 15:18:20.643167000 +0200
+@@ -483,6 +483,34 @@ int ibv_cmd_create_srq(struct ibv_pd *pd
return 0;
}
@@ -331,7 +331,7 @@
+
static int ibv_cmd_modify_srq_v3(struct ibv_srq *srq,
struct ibv_srq_attr *srq_attr,
- enum ibv_srq_attr_mask srq_attr_mask,
+ int srq_attr_mask,
@@ -603,7 +631,6 @@ int ibv_cmd_create_qp(struct ibv_pd *pd,
cmd->pd_handle = pd->handle;
cmd->send_cq_handle = attr->send_cq->handle;
@@ -350,7 +350,7 @@
cmd->reserved = 0;
if (write(pd->context->cmd_fd, cmd, cmd_size) != cmd_size)
-@@ -722,6 +752,8 @@ int ibv_cmd_query_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
+@@ -722,6 +752,8 @@ int ibv_cmd_query_qp(struct ibv_qp *qp,
init_attr->recv_cq = qp->recv_cq;
init_attr->srq = qp->srq;
init_attr->qp_type = qp->qp_type;
@@ -359,7 +359,7 @@
init_attr->cap.max_send_wr = resp.max_send_wr;
init_attr->cap.max_recv_wr = resp.max_recv_wr;
init_attr->cap.max_send_sge = resp.max_send_sge;
-@@ -1122,3 +1154,41 @@ int ibv_cmd_detach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid)
+@@ -1122,3 +1154,41 @@ int ibv_cmd_detach_mcast(struct ibv_qp *
return 0;
}
@@ -401,10 +401,10 @@
+ return 0;
+}
+
-diff --git a/src/libibverbs.map b/src/libibverbs.map
-index 1827da0..d1a6a47 100644
---- a/src/libibverbs.map
-+++ b/src/libibverbs.map
+Index: libibverbs/src/libibverbs.map
+===================================================================
+--- libibverbs.orig/src/libibverbs.map 2009-11-01 15:18:17.928115000 +0200
++++ libibverbs/src/libibverbs.map 2009-11-01 15:18:20.646169000 +0200
@@ -91,6 +91,12 @@ IBVERBS_1.1 {
ibv_dontfork_range;
ibv_dofork_range;
@@ -418,11 +418,11 @@
ibv_node_type_str;
ibv_port_state_str;
-diff --git a/src/verbs.c b/src/verbs.c
-index 9e370ce..f09542f 100644
---- a/src/verbs.c
-+++ b/src/verbs.c
-@@ -366,6 +366,9 @@ struct ibv_srq *__ibv_create_srq(struct ibv_pd *pd,
+Index: libibverbs/src/verbs.c
+===================================================================
+--- libibverbs.orig/src/verbs.c 2009-11-01 15:18:17.931119000 +0200
++++ libibverbs/src/verbs.c 2009-11-01 15:18:20.650169000 +0200
+@@ -366,6 +366,9 @@ struct ibv_srq *__ibv_create_srq(struct
srq->context = pd->context;
srq->srq_context = srq_init_attr->srq_context;
srq->pd = pd;
@@ -432,7 +432,7 @@
srq->events_completed = 0;
pthread_mutex_init(&srq->mutex, NULL);
pthread_cond_init(&srq->cond, NULL);
-@@ -375,6 +378,32 @@ struct ibv_srq *__ibv_create_srq(struct ibv_pd *pd,
+@@ -375,6 +378,32 @@ struct ibv_srq *__ibv_create_srq(struct
}
default_symver(__ibv_create_srq, ibv_create_srq);
@@ -464,8 +464,8 @@
+
int __ibv_modify_srq(struct ibv_srq *srq,
struct ibv_srq_attr *srq_attr,
- enum ibv_srq_attr_mask srq_attr_mask)
-@@ -410,6 +439,8 @@ struct ibv_qp *__ibv_create_qp(struct ibv_pd *pd,
+ int srq_attr_mask)
+@@ -410,6 +439,8 @@ struct ibv_qp *__ibv_create_qp(struct ib
qp->qp_type = qp_init_attr->qp_type;
qp->state = IBV_QPS_RESET;
qp->events_completed = 0;
@@ -474,7 +474,7 @@
pthread_mutex_init(&qp->mutex, NULL);
pthread_cond_init(&qp->cond, NULL);
}
-@@ -543,3 +574,26 @@ int __ibv_detach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid)
+@@ -543,3 +574,26 @@ int __ibv_detach_mcast(struct ibv_qp *qp
return qp->context->ops.detach_mcast(qp, gid, lid);
}
default_symver(__ibv_detach_mcast, ibv_detach_mcast);
@@ -501,7 +501,3 @@
+
+ return d->context->more_ops->close_xrc_domain(d);
+}
---
-1.5.1.6
-
-
Modified: branches/ofed-1.5lenny/libibverbs/trunk/fixes/pthread_cond_t_fields.patch
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/fixes/pthread_cond_t_fields.patch?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/fixes/pthread_cond_t_fields.patch (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/fixes/pthread_cond_t_fields.patch Fri Jan 15 11:38:55 2010
@@ -10,12 +10,10 @@
Signed-off-by: Jack Morgenstein <jackm at dev.mellanox.co.il>
-diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h
-index a032a67..7ce5e65 100644
Index: libibverbs/include/infiniband/verbs.h
===================================================================
---- libibverbs.orig/include/infiniband/verbs.h 2008-06-05 15:36:03.000000000 +0300
-+++ libibverbs/include/infiniband/verbs.h 2008-06-05 15:36:33.000000000 +0300
+--- libibverbs.orig/include/infiniband/verbs.h 2009-11-01 15:18:24.585280000 +0200
++++ libibverbs/include/infiniband/verbs.h 2009-11-01 15:18:28.759417000 +0200
@@ -565,13 +565,14 @@ struct ibv_srq {
struct ibv_pd *pd;
uint32_t handle;
Modified: branches/ofed-1.5lenny/libibverbs/trunk/include/infiniband/driver.h
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/include/infiniband/driver.h?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/include/infiniband/driver.h (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/include/infiniband/driver.h Fri Jan 15 11:38:55 2010
@@ -77,7 +77,7 @@
int ibv_cmd_dealloc_pd(struct ibv_pd *pd);
#define IBV_CMD_REG_MR_HAS_RESP_PARAMS
int ibv_cmd_reg_mr(struct ibv_pd *pd, void *addr, size_t length,
- uint64_t hca_va, enum ibv_access_flags access,
+ uint64_t hca_va, int access,
struct ibv_mr *mr, struct ibv_reg_mr *cmd,
size_t cmd_size,
struct ibv_reg_mr_resp *resp, size_t resp_size);
@@ -106,7 +106,7 @@
struct ibv_create_srq_resp *resp, size_t resp_size);
int ibv_cmd_modify_srq(struct ibv_srq *srq,
struct ibv_srq_attr *srq_attr,
- enum ibv_srq_attr_mask srq_attr_mask,
+ int srq_attr_mask,
struct ibv_modify_srq *cmd, size_t cmd_size);
int ibv_cmd_query_srq(struct ibv_srq *srq,
struct ibv_srq_attr *srq_attr,
@@ -118,11 +118,11 @@
struct ibv_create_qp *cmd, size_t cmd_size,
struct ibv_create_qp_resp *resp, size_t resp_size);
int ibv_cmd_query_qp(struct ibv_qp *qp, struct ibv_qp_attr *qp_attr,
- enum ibv_qp_attr_mask attr_mask,
+ int attr_mask,
struct ibv_qp_init_attr *qp_init_attr,
struct ibv_query_qp *cmd, size_t cmd_size);
int ibv_cmd_modify_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
- enum ibv_qp_attr_mask attr_mask,
+ int attr_mask,
struct ibv_modify_qp *cmd, size_t cmd_size);
int ibv_cmd_destroy_qp(struct ibv_qp *qp);
int ibv_cmd_post_send(struct ibv_qp *ibqp, struct ibv_send_wr *wr,
@@ -134,8 +134,8 @@
int ibv_cmd_create_ah(struct ibv_pd *pd, struct ibv_ah *ah,
struct ibv_ah_attr *attr);
int ibv_cmd_destroy_ah(struct ibv_ah *ah);
-int ibv_cmd_attach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid);
-int ibv_cmd_detach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid);
+int ibv_cmd_attach_mcast(struct ibv_qp *qp, const union ibv_gid *gid, uint16_t lid);
+int ibv_cmd_detach_mcast(struct ibv_qp *qp, const union ibv_gid *gid, uint16_t lid);
int ibv_dontfork_range(void *base, size_t size);
int ibv_dofork_range(void *base, size_t size);
Modified: branches/ofed-1.5lenny/libibverbs/trunk/include/infiniband/verbs.h
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/include/infiniband/verbs.h?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/include/infiniband/verbs.h (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/include/infiniband/verbs.h Fri Jan 15 11:38:55 2010
@@ -275,7 +275,7 @@
uint32_t imm_data; /* in network byte order */
uint32_t qp_num;
uint32_t src_qp;
- enum ibv_wc_flags wc_flags;
+ int wc_flags;
uint16_t pkey_index;
uint16_t slid;
uint8_t sl;
@@ -521,7 +521,7 @@
struct ibv_sge *sg_list;
int num_sge;
enum ibv_wr_opcode opcode;
- enum ibv_send_flags send_flags;
+ int send_flags;
uint32_t imm_data; /* in network byte order */
union {
struct {
@@ -555,8 +555,8 @@
struct ibv_mr *mr;
void *addr;
size_t length;
- enum ibv_send_flags send_flags;
- enum ibv_access_flags mw_access_flags;
+ int send_flags;
+ int mw_access_flags;
};
struct ibv_srq {
@@ -682,12 +682,12 @@
struct ibv_pd * (*alloc_pd)(struct ibv_context *context);
int (*dealloc_pd)(struct ibv_pd *pd);
struct ibv_mr * (*reg_mr)(struct ibv_pd *pd, void *addr, size_t length,
- enum ibv_access_flags access);
+ int access);
struct ibv_mr * (*rereg_mr)(struct ibv_mr *mr,
- enum ibv_rereg_mr_flags flags,
+ int flags,
struct ibv_pd *pd, void *addr,
size_t length,
- enum ibv_access_flags access);
+ int access);
int (*dereg_mr)(struct ibv_mr *mr);
struct ibv_mw * (*alloc_mw)(struct ibv_pd *pd, enum ibv_mw_type type);
int (*bind_mw)(struct ibv_qp *qp, struct ibv_mw *mw,
@@ -705,7 +705,7 @@
struct ibv_srq_init_attr *srq_init_attr);
int (*modify_srq)(struct ibv_srq *srq,
struct ibv_srq_attr *srq_attr,
- enum ibv_srq_attr_mask srq_attr_mask);
+ int srq_attr_mask);
int (*query_srq)(struct ibv_srq *srq,
struct ibv_srq_attr *srq_attr);
int (*destroy_srq)(struct ibv_srq *srq);
@@ -714,10 +714,10 @@
struct ibv_recv_wr **bad_recv_wr);
struct ibv_qp * (*create_qp)(struct ibv_pd *pd, struct ibv_qp_init_attr *attr);
int (*query_qp)(struct ibv_qp *qp, struct ibv_qp_attr *attr,
- enum ibv_qp_attr_mask attr_mask,
+ int attr_mask,
struct ibv_qp_init_attr *init_attr);
int (*modify_qp)(struct ibv_qp *qp, struct ibv_qp_attr *attr,
- enum ibv_qp_attr_mask attr_mask);
+ int attr_mask);
int (*destroy_qp)(struct ibv_qp *qp);
int (*post_send)(struct ibv_qp *qp, struct ibv_send_wr *wr,
struct ibv_send_wr **bad_wr);
@@ -725,9 +725,9 @@
struct ibv_recv_wr **bad_wr);
struct ibv_ah * (*create_ah)(struct ibv_pd *pd, struct ibv_ah_attr *attr);
int (*destroy_ah)(struct ibv_ah *ah);
- int (*attach_mcast)(struct ibv_qp *qp, union ibv_gid *gid,
+ int (*attach_mcast)(struct ibv_qp *qp, const union ibv_gid *gid,
uint16_t lid);
- int (*detach_mcast)(struct ibv_qp *qp, union ibv_gid *gid,
+ int (*detach_mcast)(struct ibv_qp *qp, const union ibv_gid *gid,
uint16_t lid);
void (*async_event)(struct ibv_async_event *event);
};
@@ -843,7 +843,7 @@
* ibv_reg_mr - Register a memory region
*/
struct ibv_mr *ibv_reg_mr(struct ibv_pd *pd, void *addr,
- size_t length, enum ibv_access_flags access);
+ size_t length, int access);
/**
* ibv_dereg_mr - Deregister a memory region
@@ -995,7 +995,7 @@
*/
int ibv_modify_srq(struct ibv_srq *srq,
struct ibv_srq_attr *srq_attr,
- enum ibv_srq_attr_mask srq_attr_mask);
+ int srq_attr_mask);
/**
* ibv_query_srq - Returns the attribute list and current values for the
@@ -1035,7 +1035,7 @@
* ibv_modify_qp - Modify a queue pair.
*/
int ibv_modify_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
- enum ibv_qp_attr_mask attr_mask);
+ int attr_mask);
/**
* ibv_query_qp - Returns the attribute list and current values for the
@@ -1049,7 +1049,7 @@
* selected attributes.
*/
int ibv_query_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
- enum ibv_qp_attr_mask attr_mask,
+ int attr_mask,
struct ibv_qp_init_attr *init_attr);
/**
@@ -1129,7 +1129,7 @@
* the fabric appropriately. The port associated with the specified
* QP must also be a member of the multicast group.
*/
-int ibv_attach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid);
+int ibv_attach_mcast(struct ibv_qp *qp, const union ibv_gid *gid, uint16_t lid);
/**
* ibv_detach_mcast - Detaches the specified QP from a multicast group.
@@ -1137,7 +1137,7 @@
* @gid: Multicast group GID.
* @lid: Multicast group LID in host byte order.
*/
-int ibv_detach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid);
+int ibv_detach_mcast(struct ibv_qp *qp, const union ibv_gid *gid, uint16_t lid);
/**
* ibv_fork_init - Prepare data structures so that fork() may be used
Modified: branches/ofed-1.5lenny/libibverbs/trunk/libibverbs.spec
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/libibverbs.spec?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/libibverbs.spec (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/libibverbs.spec Fri Jan 15 11:38:55 2010
@@ -1,12 +1,12 @@
Name: libibverbs
Version: 1.1.2
-Release: 1.ofed1.4.1
+Release: 0.2.g81705cb
Summary: A library for direct userspace use of RDMA (InfiniBand/iWARP) hardware
Group: System Environment/Libraries
License: GPLv2 or BSD
Url: http://openfabrics.org/
-Source: http://www.openfabrics.org/downloads/libibverbs-1.1.2.tar.gz
+Source: http://www.openfabrics.org/downloads/libibverbs-1.1.2-0.2.g81705cb.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Modified: branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_attach_mcast.3
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_attach_mcast.3?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_attach_mcast.3 (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_attach_mcast.3 Fri Jan 15 11:38:55 2010
@@ -8,10 +8,10 @@
.nf
.B #include <infiniband/verbs.h>
.sp
-.BI "int ibv_attach_mcast(struct ibv_qp " "*qp" ", union ibv_gid " "*gid" ",
+.BI "int ibv_attach_mcast(struct ibv_qp " "*qp" ", const union ibv_gid " "*gid" ",
.BI " uint16_t " "lid" ");
.sp
-.BI "int ibv_detach_mcast(struct ibv_qp " "*qp" ", union ibv_gid " "*gid" ",
+.BI "int ibv_detach_mcast(struct ibv_qp " "*qp" ", const union ibv_gid " "*gid" ",
.BI " uint16_t " "lid" ");
.fi
.SH "DESCRIPTION"
Modified: branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_get_device_list.3
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_get_device_list.3?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_get_device_list.3 (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_get_device_list.3 Fri Jan 15 11:38:55 2010
@@ -25,10 +25,24 @@
.B ibv_get_device_list()\fR.
.SH "RETURN VALUE"
.B ibv_get_device_list()
-returns the array of available RDMA devices, or NULL if the request fails.
+returns the array of available RDMA devices, or sets
+.I errno
+and returns NULL if the request fails. If no devices are found then
+.I num_devices
+is set to 0, and non-NULL is returned.
.PP
.B ibv_free_device_list()
returns no value.
+.SH "ERRORS"
+.TP
+.B EPERM
+Permission denied.
+.TP
+.B ENOSYS
+No kernel support for RDMA.
+.TP
+.B ENOMEM
+Insufficient memory to complete the operation.
.SH "NOTES"
Client code should open all the devices it intends to use with
.B ibv_open_device()\fR before calling
Modified: branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_modify_qp.3
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_modify_qp.3?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_modify_qp.3 (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_modify_qp.3 Fri Jan 15 11:38:55 2010
@@ -8,7 +8,7 @@
.B #include <infiniband/verbs.h>
.sp
.BI "int ibv_modify_qp(struct ibv_qp " "*qp" ", struct ibv_qp_attr " "*attr" ,
-.BI " enum ibv_qp_attr_mask " "attr_mask" );
+.BI " int " "attr_mask" );
.fi
.SH "DESCRIPTION"
.B ibv_modify_qp()
Modified: branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_modify_srq.3
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_modify_srq.3?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_modify_srq.3 (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_modify_srq.3 Fri Jan 15 11:38:55 2010
@@ -9,7 +9,7 @@
.sp
.BI "int ibv_modify_srq(struct ibv_srq " "*srq" ,
.BI " struct ibv_srq_attr " "*srq_attr" ,
-.BI " enum ibv_srq_attr_mask " "srq_attr_mask" );
+.BI " int " "srq_attr_mask" );
.fi
.SH "DESCRIPTION"
.B ibv_modify_srq()
Modified: branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_poll_cq.3
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_poll_cq.3?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_poll_cq.3 (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_poll_cq.3 Fri Jan 15 11:38:55 2010
@@ -33,7 +33,7 @@
uint32_t imm_data; /* Immediate data (in network byte order) */
uint32_t qp_num; /* Local QP number of completed WR */
uint32_t src_qp; /* Source QP number (remote QP number) of completed WR (valid only for UD QPs) */
-enum ibv_wc_flags wc_flags; /* Flags of the completed WR */
+int wc_flags; /* Flags of the completed WR */
uint16_t pkey_index; /* P_Key index (valid only for GSI QPs) */
uint16_t slid; /* Source LID */
uint8_t sl; /* Service Level */
Modified: branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_post_send.3
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_post_send.3?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_post_send.3 (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_post_send.3 Fri Jan 15 11:38:55 2010
@@ -33,7 +33,7 @@
struct ibv_sge *sg_list; /* Pointer to the s/g array */
int num_sge; /* Size of the s/g array */
enum ibv_wr_opcode opcode; /* Operation type */
-enum ibv_send_flags send_flags; /* Flags of the WR properties */
+int send_flags; /* Flags of the WR properties */
uint32_t imm_data; /* Immediate data (in network byte order) */
union {
.in +8
Modified: branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_query_qp.3
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_query_qp.3?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_query_qp.3 (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_query_qp.3 Fri Jan 15 11:38:55 2010
@@ -8,7 +8,7 @@
.B #include <infiniband/verbs.h>
.sp
.BI "int ibv_query_qp(struct ibv_qp " "*qp" ", struct ibv_qp_attr " "*attr" ,
-.BI " enum ibv_qp_attr_mask " "attr_mask" ,
+.BI " int " "attr_mask" ,
.BI " struct ibv_qp_init_attr " "*init_attr" );
.fi
.SH "DESCRIPTION"
@@ -69,7 +69,9 @@
.I attr_mask
is a hint that specifies the minimum list of attributes to retrieve.
Some RDMA devices may return extra attributes not requested, for
-example if the value can be returned cheaply.
+example if the value can be returned cheaply. This has the same
+form as in
+.B ibv_modify_qp()\fR.
.PP
Attribute values are valid if they have been set using
.B ibv_modify_qp()\fR.
Modified: branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_reg_mr.3
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_reg_mr.3?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_reg_mr.3 (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/man/ibv_reg_mr.3 Fri Jan 15 11:38:55 2010
@@ -8,8 +8,7 @@
.B #include <infiniband/verbs.h>
.sp
.BI "struct ibv_mr *ibv_reg_mr(struct ibv_pd " "*pd" ", void " "*addr" ,
-.BI " size_t " "length" ,
-.BI " enum ibv_access_flags " "access" );
+.BI " size_t " "length" ", int " "access" );
.sp
.BI "int ibv_dereg_mr(struct ibv_mr " "*mr" );
.fi
Modified: branches/ofed-1.5lenny/libibverbs/trunk/src/cmd.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/src/cmd.c?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/src/cmd.c (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/src/cmd.c Fri Jan 15 11:38:55 2010
@@ -231,7 +231,7 @@
}
int ibv_cmd_reg_mr(struct ibv_pd *pd, void *addr, size_t length,
- uint64_t hca_va, enum ibv_access_flags access,
+ uint64_t hca_va, int access,
struct ibv_mr *mr, struct ibv_reg_mr *cmd,
size_t cmd_size,
struct ibv_reg_mr_resp *resp, size_t resp_size)
@@ -513,7 +513,7 @@
static int ibv_cmd_modify_srq_v3(struct ibv_srq *srq,
struct ibv_srq_attr *srq_attr,
- enum ibv_srq_attr_mask srq_attr_mask,
+ int srq_attr_mask,
struct ibv_modify_srq *new_cmd,
size_t new_cmd_size)
{
@@ -541,7 +541,7 @@
int ibv_cmd_modify_srq(struct ibv_srq *srq,
struct ibv_srq_attr *srq_attr,
- enum ibv_srq_attr_mask srq_attr_mask,
+ int srq_attr_mask,
struct ibv_modify_srq *cmd, size_t cmd_size)
{
if (abi_ver == 3)
@@ -681,7 +681,7 @@
}
int ibv_cmd_query_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
- enum ibv_qp_attr_mask attr_mask,
+ int attr_mask,
struct ibv_qp_init_attr *init_attr,
struct ibv_query_qp *cmd, size_t cmd_size)
{
@@ -765,7 +765,7 @@
}
int ibv_cmd_modify_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
- enum ibv_qp_attr_mask attr_mask,
+ int attr_mask,
struct ibv_modify_qp *cmd, size_t cmd_size)
{
IBV_INIT_CMD(cmd, cmd_size, MODIFY_QP);
@@ -1305,7 +1305,7 @@
return 0;
}
-int ibv_cmd_attach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid)
+int ibv_cmd_attach_mcast(struct ibv_qp *qp, const union ibv_gid *gid, uint16_t lid)
{
struct ibv_attach_mcast cmd;
@@ -1321,7 +1321,7 @@
return 0;
}
-int ibv_cmd_detach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid)
+int ibv_cmd_detach_mcast(struct ibv_qp *qp, const union ibv_gid *gid, uint16_t lid)
{
struct ibv_detach_mcast cmd;
Modified: branches/ofed-1.5lenny/libibverbs/trunk/src/compat-1_0.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/src/compat-1_0.c?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/src/compat-1_0.c (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/src/compat-1_0.c Fri Jan 15 11:38:55 2010
@@ -88,7 +88,7 @@
struct ibv_sge *sg_list;
int num_sge;
enum ibv_wr_opcode opcode;
- enum ibv_send_flags send_flags;
+ int send_flags;
uint32_t imm_data; /* in network byte order */
union {
struct {
@@ -172,7 +172,7 @@
struct ibv_pd * (*alloc_pd)(struct ibv_context *context);
int (*dealloc_pd)(struct ibv_pd *pd);
struct ibv_mr * (*reg_mr)(struct ibv_pd *pd, void *addr, size_t length,
- enum ibv_access_flags access);
+ int access);
int (*dereg_mr)(struct ibv_mr *mr);
struct ibv_cq * (*create_cq)(struct ibv_context *context, int cqe,
struct ibv_comp_channel *channel,
@@ -188,7 +188,7 @@
struct ibv_srq_init_attr *srq_init_attr);
int (*modify_srq)(struct ibv_srq *srq,
struct ibv_srq_attr *srq_attr,
- enum ibv_srq_attr_mask srq_attr_mask);
+ int srq_attr_mask);
int (*query_srq)(struct ibv_srq *srq,
struct ibv_srq_attr *srq_attr);
int (*destroy_srq)(struct ibv_srq *srq);
@@ -197,10 +197,10 @@
struct ibv_recv_wr_1_0 **bad_recv_wr);
struct ibv_qp * (*create_qp)(struct ibv_pd *pd, struct ibv_qp_init_attr *attr);
int (*query_qp)(struct ibv_qp *qp, struct ibv_qp_attr *attr,
- enum ibv_qp_attr_mask attr_mask,
+ int attr_mask,
struct ibv_qp_init_attr *init_attr);
int (*modify_qp)(struct ibv_qp *qp, struct ibv_qp_attr *attr,
- enum ibv_qp_attr_mask attr_mask);
+ int attr_mask);
int (*destroy_qp)(struct ibv_qp *qp);
int (*post_send)(struct ibv_qp_1_0 *qp,
struct ibv_send_wr_1_0 *wr,
@@ -596,7 +596,7 @@
symver(__ibv_dealloc_pd_1_0, ibv_dealloc_pd, IBVERBS_1.0);
struct ibv_mr_1_0 *__ibv_reg_mr_1_0(struct ibv_pd_1_0 *pd, void *addr,
- size_t length, enum ibv_access_flags access)
+ size_t length, int access)
{
struct ibv_mr *real_mr;
struct ibv_mr_1_0 *mr;
@@ -736,7 +736,7 @@
int __ibv_modify_srq_1_0(struct ibv_srq_1_0 *srq,
struct ibv_srq_attr *srq_attr,
- enum ibv_srq_attr_mask srq_attr_mask)
+ int srq_attr_mask)
{
return ibv_modify_srq(srq->real_srq, srq_attr, srq_attr_mask);
}
@@ -806,7 +806,7 @@
symver(__ibv_create_qp_1_0, ibv_create_qp, IBVERBS_1.0);
int __ibv_query_qp_1_0(struct ibv_qp_1_0 *qp, struct ibv_qp_attr *attr,
- enum ibv_qp_attr_mask attr_mask,
+ int attr_mask,
struct ibv_qp_init_attr_1_0 *init_attr)
{
struct ibv_qp_init_attr real_init_attr;
@@ -829,7 +829,7 @@
symver(__ibv_query_qp_1_0, ibv_query_qp, IBVERBS_1.0);
int __ibv_modify_qp_1_0(struct ibv_qp_1_0 *qp, struct ibv_qp_attr *attr,
- enum ibv_qp_attr_mask attr_mask)
+ int attr_mask)
{
return ibv_modify_qp(qp->real_qp, attr, attr_mask);
}
Modified: branches/ofed-1.5lenny/libibverbs/trunk/src/device.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/src/device.c?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/src/device.c (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/src/device.c Fri Jan 15 11:38:55 2010
@@ -43,6 +43,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <alloca.h>
+#include <errno.h>
#include <infiniband/arch.h>
@@ -54,27 +55,35 @@
struct ibv_device **__ibv_get_device_list(int *num)
{
- struct ibv_device **l;
+ struct ibv_device **l = 0;
int i;
+
+ if (num)
+ *num = 0;
pthread_mutex_lock(&device_list_lock);
if (!num_devices)
num_devices = ibverbs_init(&device_list);
+ if (num_devices < 0) {
+ errno = -num_devices;
+ goto out;
+ }
+
l = calloc(num_devices + 1, sizeof (struct ibv_device *));
- if (!l)
+ if (!l) {
+ errno = ENOMEM;
goto out;
+ }
for (i = 0; i < num_devices; ++i)
l[i] = device_list[i];
+ if (num)
+ *num = num_devices;
out:
pthread_mutex_unlock(&device_list_lock);
-
- if (num)
- *num = l ? num_devices : 0;
-
return l;
}
default_symver(__ibv_get_device_list, ibv_get_device_list);
Modified: branches/ofed-1.5lenny/libibverbs/trunk/src/init.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/src/init.c?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/src/init.c (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/src/init.c Fri Jan 15 11:38:55 2010
@@ -46,6 +46,7 @@
#include <sys/time.h>
#include <sys/resource.h>
#include <dirent.h>
+#include <errno.h>
#include "ibverbs.h"
@@ -76,23 +77,21 @@
static struct ibv_driver_name *driver_name_list;
static struct ibv_driver *head_driver, *tail_driver;
-static void find_sysfs_devs(void)
+static int find_sysfs_devs(void)
{
char class_path[IBV_SYSFS_PATH_MAX];
DIR *class_dir;
struct dirent *dent;
struct ibv_sysfs_dev *sysfs_dev = NULL;
char value[8];
+ int ret = 0;
snprintf(class_path, sizeof class_path, "%s/class/infiniband_verbs",
ibv_get_sysfs_path());
class_dir = opendir(class_path);
- if (!class_dir) {
- fprintf(stderr, PFX "Fatal: couldn't open sysfs class "
- "directory '%s'.\n", class_path);
- return;
- }
+ if (!class_dir)
+ return ENOSYS;
while ((dent = readdir(class_dir))) {
struct stat buf;
@@ -103,9 +102,8 @@
if (!sysfs_dev)
sysfs_dev = malloc(sizeof *sysfs_dev);
if (!sysfs_dev) {
- fprintf(stderr, PFX "Warning: couldn't allocate sysfs dev "
- "for '%s'.\n", dent->d_name);
- continue;
+ ret = ENOMEM;
+ goto out;
}
snprintf(sysfs_dev->sysfs_path, sizeof sysfs_dev->sysfs_path,
@@ -128,7 +126,6 @@
sizeof sysfs_dev->ibdev_name) < 0) {
fprintf(stderr, PFX "Warning: no ibdev class attr for '%s'.\n",
dent->d_name);
- free(sysfs_dev);
continue;
}
@@ -148,10 +145,12 @@
sysfs_dev = NULL;
}
+ out:
if (sysfs_dev)
free(sysfs_dev);
closedir(class_dir);
+ return ret;
}
void ibv_register_driver(const char *name, ibv_driver_init_func init_func)
@@ -184,6 +183,8 @@
#define IBV_QUOTE(x) __IBV_QUOTE(x)
if (asprintf(&so_name,
+ name[0] == '/' ?
+ "%s-" IBV_QUOTE(IBV_DEVICE_LIBRARY_EXTENSION) ".so" :
"lib%s-" IBV_QUOTE(IBV_DEVICE_LIBRARY_EXTENSION) ".so",
name) < 0) {
fprintf(stderr, PFX "Warning: couldn't load driver '%s'.\n",
@@ -390,8 +391,7 @@
if (ibv_read_sysfs_file(path, "class/infiniband_verbs/abi_version",
value, sizeof value) < 0) {
- fprintf(stderr, PFX "Fatal: couldn't read uverbs ABI version.\n");
- return -1;
+ return ENOSYS;
}
abi_ver = strtol(value, NULL, 10);
@@ -401,7 +401,7 @@
fprintf(stderr, PFX "Fatal: kernel ABI version %d "
"doesn't match library version %d.\n",
abi_ver, IB_USER_VERBS_MAX_ABI_VERSION);
- return -1;
+ return ENOSYS;
}
return 0;
@@ -452,6 +452,7 @@
int list_size = 0;
int statically_linked = 0;
int no_driver = 0;
+ int ret;
*list = NULL;
@@ -461,19 +462,20 @@
"but init failed\n");
sysfs_path = ibv_get_sysfs_path();
- if (!sysfs_path) {
- fprintf(stderr, PFX "Fatal: couldn't find sysfs mount.\n");
- return 0;
- }
-
- if (check_abi_version(sysfs_path))
- return 0;
+ if (!sysfs_path)
+ return -ENOSYS;
+
+ ret = check_abi_version(sysfs_path);
+ if (ret)
+ return -ret;
check_memlock_limit();
read_config();
- find_sysfs_devs();
+ ret = find_sysfs_devs();
+ if (ret)
+ return -ret;
for (sysfs_dev = sysfs_dev_list; sysfs_dev; sysfs_dev = sysfs_dev->next) {
device = try_drivers(sysfs_dev);
Modified: branches/ofed-1.5lenny/libibverbs/trunk/src/verbs.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibverbs/trunk/src/verbs.c?rev=542&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibverbs/trunk/src/verbs.c (original)
+++ branches/ofed-1.5lenny/libibverbs/trunk/src/verbs.c Fri Jan 15 11:38:55 2010
@@ -155,7 +155,7 @@
default_symver(__ibv_dealloc_pd, ibv_dealloc_pd);
struct ibv_mr *__ibv_reg_mr(struct ibv_pd *pd, void *addr,
- size_t length, enum ibv_access_flags access)
+ size_t length, int access)
{
struct ibv_mr *mr;
@@ -406,7 +406,7 @@
int __ibv_modify_srq(struct ibv_srq *srq,
struct ibv_srq_attr *srq_attr,
- enum ibv_srq_attr_mask srq_attr_mask)
+ int srq_attr_mask)
{
return srq->context->ops.modify_srq(srq, srq_attr, srq_attr_mask);
}
@@ -450,7 +450,7 @@
default_symver(__ibv_create_qp, ibv_create_qp);
int __ibv_query_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
- enum ibv_qp_attr_mask attr_mask,
+ int attr_mask,
struct ibv_qp_init_attr *init_attr)
{
int ret;
@@ -467,7 +467,7 @@
default_symver(__ibv_query_qp, ibv_query_qp);
int __ibv_modify_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
- enum ibv_qp_attr_mask attr_mask)
+ int attr_mask)
{
int ret;
@@ -563,13 +563,13 @@
}
default_symver(__ibv_destroy_ah, ibv_destroy_ah);
-int __ibv_attach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid)
+int __ibv_attach_mcast(struct ibv_qp *qp, const union ibv_gid *gid, uint16_t lid)
{
return qp->context->ops.attach_mcast(qp, gid, lid);
}
default_symver(__ibv_attach_mcast, ibv_attach_mcast);
-int __ibv_detach_mcast(struct ibv_qp *qp, union ibv_gid *gid, uint16_t lid)
+int __ibv_detach_mcast(struct ibv_qp *qp, const union ibv_gid *gid, uint16_t lid)
{
return qp->context->ops.detach_mcast(qp, gid, lid);
}
More information about the Pkg-ofed-commits
mailing list