PERFORCE change 127188 for review
Kip Macy
kmacy at FreeBSD.org
Thu Oct 4 12:48:40 PDT 2007
http://perforce.freebsd.org/chv.cgi?CH=127188
Change 127188 by kmacy at kmacy:storage:toestack on 2007/10/04 19:48:21
IFC 127119
Affected files ...
.. //depot/projects/toestack/Makefile.inc1#2 integrate
.. //depot/projects/toestack/UPDATING#3 integrate
.. //depot/projects/toestack/cddl/lib/Makefile#2 integrate
.. //depot/projects/toestack/cddl/sbin/zfs/Makefile#2 integrate
.. //depot/projects/toestack/cddl/sbin/zpool/Makefile#2 integrate
.. //depot/projects/toestack/cddl/usr.bin/Makefile#2 integrate
.. //depot/projects/toestack/cddl/usr.bin/ztest/Makefile#2 integrate
.. //depot/projects/toestack/cddl/usr.sbin/Makefile#2 integrate
.. //depot/projects/toestack/cddl/usr.sbin/zdb/Makefile#2 integrate
.. //depot/projects/toestack/contrib/gcc/opts.c#2 integrate
.. //depot/projects/toestack/contrib/wpa_supplicant/main.c#2 integrate
.. //depot/projects/toestack/etc/rc.d/cached#2 delete
.. //depot/projects/toestack/include/Makefile#3 integrate
.. //depot/projects/toestack/lib/libc/Makefile#2 integrate
.. //depot/projects/toestack/lib/libpthread/Makefile#2 integrate
.. //depot/projects/toestack/lib/libthr/Makefile#2 integrate
.. //depot/projects/toestack/libexec/atrun/Makefile#2 integrate
.. //depot/projects/toestack/sbin/ggate/Makefile#2 integrate
.. //depot/projects/toestack/share/man/man4/pci.4#2 integrate
.. //depot/projects/toestack/share/man/man9/pci.9#2 integrate
.. //depot/projects/toestack/share/mk/bsd.libnames.mk#2 integrate
.. //depot/projects/toestack/share/mk/bsd.prog.mk#2 integrate
.. //depot/projects/toestack/sys/amd64/amd64/legacy.c#2 integrate
.. //depot/projects/toestack/sys/amd64/include/legacyvar.h#2 integrate
.. //depot/projects/toestack/sys/amd64/pci/pci_bus.c#2 integrate
.. //depot/projects/toestack/sys/arm/xscale/i80321/i80321_pci.c#2 integrate
.. //depot/projects/toestack/sys/arm/xscale/i8134x/i81342_pci.c#2 integrate
.. //depot/projects/toestack/sys/arm/xscale/ixp425/ixp425_pci.c#2 integrate
.. //depot/projects/toestack/sys/dev/acpica/acpi_pci.c#2 integrate
.. //depot/projects/toestack/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate
.. //depot/projects/toestack/sys/dev/bge/if_bge.c#2 integrate
.. //depot/projects/toestack/sys/dev/cardbus/cardbus.c#2 integrate
.. //depot/projects/toestack/sys/dev/pccbb/pccbb.c#2 integrate
.. //depot/projects/toestack/sys/dev/pccbb/pccbb_pci.c#2 integrate
.. //depot/projects/toestack/sys/dev/pccbb/pccbbvar.h#2 integrate
.. //depot/projects/toestack/sys/dev/pci/pci.c#2 integrate
.. //depot/projects/toestack/sys/dev/pci/pci_pci.c#2 integrate
.. //depot/projects/toestack/sys/dev/pci/pci_private.h#2 integrate
.. //depot/projects/toestack/sys/dev/pci/pci_user.c#2 integrate
.. //depot/projects/toestack/sys/dev/pci/pcib_private.h#2 integrate
.. //depot/projects/toestack/sys/dev/pci/pcivar.h#2 integrate
.. //depot/projects/toestack/sys/i386/i386/legacy.c#2 integrate
.. //depot/projects/toestack/sys/i386/include/legacyvar.h#2 integrate
.. //depot/projects/toestack/sys/i386/pci/pci_bus.c#2 integrate
.. //depot/projects/toestack/sys/kern/kern_sx.c#2 integrate
.. //depot/projects/toestack/sys/kern/sched_ule.c#3 integrate
.. //depot/projects/toestack/sys/modules/cxgb/Makefile#5 integrate
.. //depot/projects/toestack/sys/net/if_var.h#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_asconf.c#5 integrate
.. //depot/projects/toestack/sys/netinet/sctp_constants.h#4 integrate
.. //depot/projects/toestack/sys/netinet/sctp_indata.c#4 integrate
.. //depot/projects/toestack/sys/netinet/sctp_input.c#5 integrate
.. //depot/projects/toestack/sys/netinet/sctp_output.c#4 integrate
.. //depot/projects/toestack/sys/netinet/sctp_output.h#4 integrate
.. //depot/projects/toestack/sys/netinet/sctp_pcb.c#4 integrate
.. //depot/projects/toestack/sys/netinet/sctp_timer.c#4 integrate
.. //depot/projects/toestack/sys/netinet/sctp_usrreq.c#4 integrate
.. //depot/projects/toestack/sys/netinet/sctp_var.h#3 integrate
.. //depot/projects/toestack/sys/netinet/sctputil.c#4 integrate
.. //depot/projects/toestack/sys/powerpc/powermac/grackle.c#2 integrate
.. //depot/projects/toestack/sys/powerpc/powermac/uninorth.c#2 integrate
.. //depot/projects/toestack/sys/sparc64/pci/apb.c#2 integrate
.. //depot/projects/toestack/sys/sparc64/pci/ofw_pcibus.c#3 integrate
.. //depot/projects/toestack/sys/sparc64/pci/psycho.c#3 integrate
.. //depot/projects/toestack/sys/sun4v/sun4v/hv_pci.c#2 integrate
.. //depot/projects/toestack/sys/sys/param.h#3 integrate
.. //depot/projects/toestack/sys/sys/pciio.h#2 integrate
.. //depot/projects/toestack/tools/build/make_check/Makefile#2 integrate
.. //depot/projects/toestack/tools/build/mk/OptionalObsoleteFiles.inc#2 integrate
.. //depot/projects/toestack/tools/make_libdeps.sh#2 integrate
.. //depot/projects/toestack/tools/tools/pciroms/pciroms.c#2 integrate
.. //depot/projects/toestack/usr.bin/Makefile#2 integrate
.. //depot/projects/toestack/usr.sbin/Makefile#3 integrate
.. //depot/projects/toestack/usr.sbin/bluetooth/bthidd/Makefile#2 integrate
.. //depot/projects/toestack/usr.sbin/cached/Makefile#2 delete
.. //depot/projects/toestack/usr.sbin/cached/agent.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/agent.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/agents/Makefile.inc#2 delete
.. //depot/projects/toestack/usr.sbin/cached/agents/group.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/agents/group.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/agents/passwd.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/agents/passwd.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/agents/services.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/agents/services.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/cached.8#2 delete
.. //depot/projects/toestack/usr.sbin/cached/cached.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/cached.conf.5#2 delete
.. //depot/projects/toestack/usr.sbin/cached/cachedcli.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/cachedcli.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/cachelib.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/cachelib.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/cacheplcs.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/cacheplcs.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/config.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/config.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/debug.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/debug.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/hashtable.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/log.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/log.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/mp_rs_query.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/mp_rs_query.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/mp_ws_query.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/mp_ws_query.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/parser.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/parser.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/protocol.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/protocol.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/query.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/query.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/singletons.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/singletons.h#2 delete
.. //depot/projects/toestack/usr.sbin/config/Makefile#2 integrate
.. //depot/projects/toestack/usr.sbin/cron/cron/Makefile#2 integrate
.. //depot/projects/toestack/usr.sbin/ngctl/Makefile#2 integrate
.. //depot/projects/toestack/usr.sbin/pciconf/pciconf.8#2 integrate
.. //depot/projects/toestack/usr.sbin/pciconf/pciconf.c#2 integrate
.. //depot/projects/toestack/usr.sbin/pmcstat/Makefile#2 integrate
.. //depot/projects/toestack/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#2 integrate
Differences ...
==== //depot/projects/toestack/Makefile.inc1#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.584 2007/07/10 10:19:45 delphij Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.586 2007/10/01 18:24:46 ru Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -330,8 +330,7 @@
.endfor
.for _dir in \
lib usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \
- usr/libexec usr/sbin usr/share/misc \
- usr/share/snmp/defs usr/share/snmp/mibs
+ usr/libexec usr/sbin usr/share/misc
mkdir -p ${WORLDTMP}/${_dir}
.endfor
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
@@ -415,9 +414,7 @@
@echo ">>> stage 5.1: building 32 bit shim libraries"
@echo "--------------------------------------------------------------"
.for _dir in \
- lib lib32 usr/bin usr/include usr/lib32 usr/libdata/ldscripts \
- usr/libexec usr/sbin usr/share/misc \
- usr/share/snmp/defs usr/share/snmp/mibs
+ usr/include usr/lib32 usr/share/misc
mkdir -p ${LIB32TMP}/${_dir}
.endfor
mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
@@ -1027,12 +1024,20 @@
${_lib_libgssapi} ${_lib_libipx} \
lib/libkiconv lib/libkvm lib/libmd \
lib/ncurses/ncurses lib/ncurses/ncursesw \
- lib/libopie lib/libpam lib/${DEFAULT_THREAD_LIB} \
+ lib/libopie lib/libpam ${_default_thread_lib} \
lib/libradius lib/libsbuf lib/libtacplus lib/libutil \
${_lib_libypclnt} lib/libz lib/msun \
${_secure_lib_libcrypto} ${_secure_lib_libssh} \
${_secure_lib_libssl}
+.if ${MK_LIBTHR} != "no" && ${MK_LIBPTHREAD} != "no"
+_default_thread_lib= lib/${DEFAULT_THREAD_LIB}
+.elif ${MK_LIBTHR} != "no"
+_default_thread_lib= lib/libthr
+.elif ${MK_LIBPTHREAD} != "no"
+_default_thread_lib= lib/libpthread
+.endif
+
_generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib
lib/libopie__L lib/libtacplus__L: lib/libmd__L
==== //depot/projects/toestack/UPDATING#3 (text+ko) ====
@@ -21,6 +21,13 @@
developers choose to disable these features on build machines
to maximize performance.
+20070930:
+ The PCI code has been made aware of PCI domains. This means that
+ the location strings as used by pciconf(8) etc are now in the
+ following format: pci<domain>:<bus>:<device>[:<function>]. It
+ also means that consumers of <sys/pciio.h> potentially need to
+ be recompiled; this includes the hal and xorg-server ports.
+
20070928:
The caching daemon (cached) was renamed to nscd. nscd.conf
configuration file should be used instead of cached.conf and
@@ -894,4 +901,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.504 2007/09/28 10:38:07 bushman Exp $
+$FreeBSD: src/UPDATING,v 1.505 2007/09/30 11:05:12 marius Exp $
==== //depot/projects/toestack/cddl/lib/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/lib/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $
+# $FreeBSD: src/cddl/lib/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $
.include <bsd.own.mk>
@@ -11,7 +11,9 @@
.if ${MK_ZFS} != "no"
_libzfs= libzfs
+.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
_libzpool= libzpool
.endif
+.endif
.include <bsd.subdir.mk>
==== //depot/projects/toestack/cddl/sbin/zfs/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.2 2007/04/16 21:20:26 ru Exp $
+# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $
.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zfs
@@ -19,7 +19,9 @@
CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
-DPADD= ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS}
-LDADD= -lgeom -lm -lnvpair -luutil -lzfs
+DPADD= ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
+ ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
+LDADD= -lzfs -lgeom -lbsdxml -lsbuf \
+ -lm -lnvpair -luutil -lutil
.include <bsd.prog.mk>
==== //depot/projects/toestack/cddl/sbin/zpool/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.2 2007/04/16 21:20:26 ru Exp $
+# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $
.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zpool
@@ -19,7 +19,9 @@
CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
-DPADD= ${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS}
-LDADD= -lavl -lgeom -lm -lnvpair -luutil -lzfs
+DPADD= ${LIBAVL} ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
+ ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
+LDADD= -lavl -lzfs -lgeom -lbsdxml -lsbuf \
+ -lm -lnvpair -luutil -lutil
.include <bsd.prog.mk>
==== //depot/projects/toestack/cddl/usr.bin/Makefile#2 (text+ko) ====
@@ -1,11 +1,13 @@
-# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $
+# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $
.include <bsd.own.mk>
SUBDIR= ${_ztest}
.if ${MK_ZFS} != "no"
+.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
_ztest= ztest
.endif
+.endif
.include <bsd.subdir.mk>
==== //depot/projects/toestack/cddl/usr.bin/ztest/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.3 2007/04/17 15:52:37 pjd Exp $
+# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.4 2007/10/01 18:17:23 ru Exp $
.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/ztest
@@ -15,7 +15,8 @@
CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
CFLAGS+= -I${.CURDIR}/../../lib/libumem
-DPADD= ${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} ${LIBZPOOL}
-LDADD= -lavl -lm -lnvpair -lpthread -lumem -lzpool
+DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
+ ${LIBPTHREAD} ${LIBZ} ${LIBAVL}
+LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
.include <bsd.prog.mk>
==== //depot/projects/toestack/cddl/usr.sbin/Makefile#2 (text+ko) ====
@@ -1,11 +1,13 @@
-# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $
+# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $
.include <bsd.own.mk>
SUBDIR= ${_zdb}
.if ${MK_ZFS} != "no"
+.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
_zdb= zdb
.endif
+.endif
.include <bsd.subdir.mk>
==== //depot/projects/toestack/cddl/usr.sbin/zdb/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.3 2007/04/17 15:52:37 pjd Exp $
+# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.4 2007/10/01 18:17:23 ru Exp $
.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zdb
@@ -16,7 +16,8 @@
CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
CFLAGS+= -I${.CURDIR}/../../lib/libumem
-DPADD= ${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} ${LIBZPOOL}
-LDADD= -lavl -lm -lnvpair -lpthread -lumem -lzpool
+DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
+ ${LIBPTHREAD} ${LIBZ} ${LIBAVL}
+LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
.include <bsd.prog.mk>
==== //depot/projects/toestack/contrib/gcc/opts.c#2 (text+ko) ====
@@ -20,7 +20,7 @@
Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA. */
-/* $FreeBSD: src/contrib/gcc/opts.c,v 1.3 2007/05/19 02:22:16 kan Exp $ */
+/* $FreeBSD: src/contrib/gcc/opts.c,v 1.4 2007/10/02 20:06:14 obrien Exp $ */
#include "config.h"
#include "system.h"
@@ -501,7 +501,10 @@
flag_reorder_functions = 1;
flag_tree_store_ccp = 1;
flag_tree_store_copy_prop = 1;
- flag_tree_vrp = 1;
+ /* XXX: some issues with ports have been traced to -ftree-vrp.
+ So remove it from -O2 and above. Note that jdk1{5,6} are affected
+ and they build with w/-O3 - so we cannot just move it to -O3. */
+ // flag_tree_vrp = 1;
if (!optimize_size)
{
==== //depot/projects/toestack/contrib/wpa_supplicant/main.c#2 (text) ====
@@ -82,7 +82,7 @@
" -N = start describing new interface\n");
printf("example:\n"
- " wpa_supplicant -Dwext -iwlan0 -c/etc/wpa_supplicant.conf\n");
+ " wpa_supplicant -Dbsd -iwlan0 -c/etc/wpa_supplicant.conf\n");
#endif /* CONFIG_NO_STDOUT_DEBUG */
}
==== //depot/projects/toestack/include/Makefile#3 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.275 2007/09/23 07:34:21 pjd Exp $
+# $FreeBSD: src/include/Makefile,v 1.276 2007/10/01 18:07:29 ru Exp $
#
# Doing a "make install" builds /usr/include.
@@ -45,11 +45,13 @@
LSUBDIRS= cam/scsi \
dev/acpica dev/an dev/bktr dev/firewire dev/hwpmc \
dev/ic dev/iicbus ${_dev_ieee488} dev/lmc dev/ofw \
- dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \
+ dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \
+ dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \
fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \
${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/unionfs \
geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \
- geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe geom/virstor \
+ geom/mirror geom/multipath geom/nop \
+ geom/raid3 geom/shsec geom/stripe geom/virstor \
netgraph/atm netgraph/netflow \
security/audit \
security/mac_biba security/mac_bsdextended security/mac_lomac \
==== //depot/projects/toestack/lib/libc/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.2 (Berkeley) 2/3/94
-# $FreeBSD: src/lib/libc/Makefile,v 1.72 2007/05/19 16:38:39 kan Exp $
+# $FreeBSD: src/lib/libc/Makefile,v 1.73 2007/10/01 18:15:10 ru Exp $
SHLIBDIR?= /lib
@@ -23,6 +23,7 @@
#
# Only link with static libgcc.a (no libgcc_eh.a).
#
+DPADD+= ${LIBGCC}
LDFLAGS+= -nodefaultlibs
LDADD+= -lgcc
==== //depot/projects/toestack/lib/libpthread/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libpthread/Makefile,v 1.63 2007/05/21 02:49:06 deischen Exp $
+# $FreeBSD: src/lib/libpthread/Makefile,v 1.64 2007/10/01 18:22:31 ru Exp $
#
# All library objects contain FreeBSD revision strings by default; they may be
# excluded as a space-saving measure. To produce a library that does
@@ -10,7 +10,8 @@
.include <bsd.own.mk>
-.if ${DEFAULT_THREAD_LIB} == "libpthread" && ${SHLIBDIR} == "/usr/lib"
+.if (${DEFAULT_THREAD_LIB} == "libpthread" || ${MK_LIBTHR} == "no") && \
+ ${SHLIBDIR} == "/usr/lib"
SHLIBDIR= /lib
.endif
@@ -46,7 +47,7 @@
.include "${.CURDIR}/sys/Makefile.inc"
.include "${.CURDIR}/thread/Makefile.inc"
-.if ${DEFAULT_THREAD_LIB} == "libpthread"
+.if ${DEFAULT_THREAD_LIB} == "libpthread" || ${MK_LIBTHR} == "no"
SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a
.if !defined(NO_PIC)
SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so
==== //depot/projects/toestack/lib/libthr/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libthr/Makefile,v 1.26 2007/06/08 02:21:13 davidxu Exp $
+# $FreeBSD: src/lib/libthr/Makefile,v 1.27 2007/10/01 18:29:55 ru Exp $
#
# All library objects contain FreeBSD revision strings by default; they may be
# excluded as a space-saving measure. To produce a library that does
@@ -10,7 +10,8 @@
.include <bsd.own.mk>
-.if ${DEFAULT_THREAD_LIB} == "libthr" && ${SHLIBDIR} == "/usr/lib"
+.if (${DEFAULT_THREAD_LIB} == "libthr" || ${MK_LIBPTHREAD} == "no") && \
+ ${SHLIBDIR} == "/usr/lib"
SHLIBDIR= /lib
.endif
@@ -43,7 +44,7 @@
.include "${.CURDIR}/sys/Makefile.inc"
.include "${.CURDIR}/thread/Makefile.inc"
-.if ${DEFAULT_THREAD_LIB} == "libthr"
+.if ${DEFAULT_THREAD_LIB} == "libthr" || ${MK_LIBPTHREAD} == "no"
SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a
.if !defined(NO_PIC)
SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so
==== //depot/projects/toestack/libexec/atrun/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/libexec/atrun/Makefile,v 1.14 2007/06/15 12:02:16 yar Exp $
+# $FreeBSD: src/libexec/atrun/Makefile,v 1.15 2007/10/01 18:17:23 ru Exp $
MAINSRC=${.CURDIR}/../../usr.bin/at
@@ -16,7 +16,7 @@
WFORMAT=0
DPADD= ${LIBPAM} ${LIBUTIL}
-LDADD= -lpam -lutil
+LDADD= ${MINUSLPAM} -lutil
atrun.8: atrun.man
@${ECHO} Making ${.TARGET:T} from ${.ALLSRC:T}; \
==== //depot/projects/toestack/sbin/ggate/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sbin/ggate/Makefile,v 1.7 2006/11/26 14:36:33 ru Exp $
+# $FreeBSD: src/sbin/ggate/Makefile,v 1.8 2007/10/01 18:22:31 ru Exp $
.include <bsd.own.mk>
@@ -6,8 +6,7 @@
${_ggated} \
ggatel
-.if ${MK_LIBTHR} != "no" || \
- (${MACHINE_ARCH} != "sparc64" && ${MK_LIBPTHREAD} != "no")
+.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
_ggatec= ggatec
_ggated= ggated
.endif
==== //depot/projects/toestack/share/man/man4/pci.4#2 (text+ko) ====
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/pci.4,v 1.18 2007/04/07 14:36:18 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/pci.4,v 1.19 2007/09/30 11:05:12 marius Exp $
.\"
-.Dd October 24, 1999
+.Dd September 30, 2007
.Dt PCI 4
.Os
.Sh NAME
@@ -109,7 +109,7 @@
.Bl -tag -width pd_vendor
.It pc_sel
.Tn PCI
-bus, slot and function.
+domain, bus, slot and function.
.It pd_name
.Tn PCI
device driver name.
@@ -150,7 +150,7 @@
.Bl -tag -width pc_subvendor
.It pc_sel
.Tn PCI
-bus, slot and function.
+domain, bus, slot and function.
.It pc_hdr
.Tn PCI
header type.
@@ -257,9 +257,10 @@
.It pi_sel
A
.Va pcisel
-structure which specifies the bus, slot and function the user would like to
-query.
-If the specific bus is not found, errno will be set to ENODEV and -1 returned from the ioctl.
+structure which specifies the domain, bus, slot and function the user would
+like to query.
+If the specific bus is not found, errno will be set to ENODEV and -1 returned
+from the ioctl.
.It pi_reg
The
.Tn PCI
==== //depot/projects/toestack/share/man/man9/pci.9#2 (text+ko) ====
@@ -23,9 +23,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/pci.9,v 1.9 2005/06/28 20:15:18 hmp Exp $
+.\" $FreeBSD: src/share/man/man9/pci.9,v 1.10 2007/09/30 11:05:13 marius Exp $
.\"
-.Dd January 22, 2005
+.Dd September 30, 2007
.Dt PCI 9
.Os
.Sh NAME
@@ -39,6 +39,7 @@
.Nm pci_set_powerstate ,
.Nm pci_get_powerstate ,
.Nm pci_find_bsf ,
+.Nm pci_find_dbsf ,
.Nm pci_find_device
.Nd PCI bus interface
.Sh SYNOPSIS
@@ -65,6 +66,8 @@
.Ft device_t
.Fn pci_find_bsf "uint8_t bus" "uint8_t slot" "uint8_t func"
.Ft device_t
+.Fn pci_find_dbsf "uint32_t domain" "uint8_t bus" "uint8_t slot" "uint8_t func"
+.Ft device_t
.Fn pci_find_device "uint16_t vendor" "uint16_t device"
.Sh DESCRIPTION
The
@@ -198,6 +201,30 @@
number actually refers to the number of the device on the bus,
which does not necessarily indicate its geographic location
in terms of a physical slot.
+Note that in case the system has multiple PCI domains,
+the
+.Fn pci_find_bsf
+function only searches the first one.
+Actually, it is equivalent to:
+.Bd -literal -offset indent
+pci_find_dbsf(0, bus, slot, func);
+.Ed
+.Pp
+The
+.Fn pci_find_dbsf
+function looks up the
+.Vt device_t
+of a PCI device, given its
+.Fa domain ,
+.Fa bus ,
+.Fa slot ,
+and
+.Fa func .
+The
+.Fa slot
+number actually refers to the number of the device on the bus,
+which does not necessarily indicate its geographic location
+in terms of a physical slot.
.Pp
The
.Fn pci_find_device
==== //depot/projects/toestack/share/mk/bsd.libnames.mk#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/mk/bsd.libnames.mk,v 1.104 2007/05/13 14:12:40 deischen Exp $
+# $FreeBSD: src/share/mk/bsd.libnames.mk,v 1.105 2007/10/01 18:15:11 ru Exp $
# The include file <bsd.libnames.mk> define library names.
# Other include files (e.g. bsd.prog.mk, bsd.lib.mk) include this
@@ -120,11 +120,7 @@
LIBPANEL?= ${DESTDIR}${LIBDIR}/libpanel.a
LIBPCAP?= ${DESTDIR}${LIBDIR}/libpcap.a
LIBPMC?= ${DESTDIR}${LIBDIR}/libpmc.a
-.if defined(DEFAULT_THREAD_LIB)
-LIBPTHREAD?= ${DESTDIR}${LIBDIR}/${DEFAULT_THREAD_LIB}.a
-.else
-LIBPTHREAD?= ${DESTDIR}${LIBDIR}/libthr.a
-.endif
+LIBPTHREAD?= ${DESTDIR}${LIBDIR}/libpthread.a
LIBRADIUS?= ${DESTDIR}${LIBDIR}/libradius.a
LIBREADLINE?= ${DESTDIR}${LIBDIR}/libreadline.a
LIBROKEN?= ${DESTDIR}${LIBDIR}/libroken.a
==== //depot/projects/toestack/share/mk/bsd.prog.mk#2 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
-# $FreeBSD: src/share/mk/bsd.prog.mk,v 1.149 2006/09/13 23:27:21 obrien Exp $
+# $FreeBSD: src/share/mk/bsd.prog.mk,v 1.150 2007/10/01 18:15:11 ru Exp $
.include <bsd.init.mk>
@@ -40,8 +40,12 @@
# If there are Objective C sources, link with Objective C libraries.
.if !empty(SRCS:M*.m)
-OBJCLIBS?= -lobjc -lpthread
+.if defined(OBJCLIBS)
LDADD+= ${OBJCLIBS}
+.else
+DPADD+= ${LIBOBJC} ${LIBPTHREAD}
+LDADD+= -lobjc -lpthread
+.endif
.endif
OBJS+= ${SRCS:N*.h:R:S/$/.o/g}
==== //depot/projects/toestack/sys/amd64/amd64/legacy.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.60 2007/03/20 20:21:44 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.61 2007/09/30 11:05:13 marius Exp $");
/*
* This code implements a system driver for legacy systems that do not
@@ -207,6 +207,9 @@
struct legacy_device *atdev = DEVTOAT(child);
switch (which) {
+ case LEGACY_IVAR_PCIDOMAIN:
+ *result = 0;
+ break;
case LEGACY_IVAR_PCIBUS:
*result = atdev->lg_pcibus;
break;
@@ -223,6 +226,8 @@
struct legacy_device *atdev = DEVTOAT(child);
switch (which) {
+ case LEGACY_IVAR_PCIDOMAIN:
+ return EINVAL;
case LEGACY_IVAR_PCIBUS:
atdev->lg_pcibus = value;
break;
==== //depot/projects/toestack/sys/amd64/include/legacyvar.h#2 (text+ko) ====
@@ -23,19 +23,21 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/legacyvar.h,v 1.7 2005/09/18 01:42:43 imp Exp $
+ * $FreeBSD: src/sys/amd64/include/legacyvar.h,v 1.8 2007/09/30 11:05:13 marius Exp $
*/
#ifndef _MACHINE_LEGACYVAR_H_
#define _MACHINE_LEGACYVAR_H_
enum legacy_device_ivars {
+ LEGACY_IVAR_PCIDOMAIN,
LEGACY_IVAR_PCIBUS
};
#define LEGACY_ACCESSOR(var, ivar, type) \
__BUS_ACCESSOR(legacy, var, LEGACY, ivar, type)
+LEGACY_ACCESSOR(pcidomain, PCIDOMAIN, uint32_t)
LEGACY_ACCESSOR(pcibus, PCIBUS, uint32_t)
#undef LEGACY_ACCESSOR
==== //depot/projects/toestack/sys/amd64/pci/pci_bus.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.121 2007/05/02 17:50:34 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.122 2007/09/30 11:05:13 marius Exp $");
#include "opt_cpu.h"
@@ -276,6 +276,9 @@
{
switch (which) {
+ case PCIB_IVAR_DOMAIN:
+ *result = 0;
+ return 0;
case PCIB_IVAR_BUS:
*result = legacy_get_pcibus(dev);
return 0;
@@ -289,6 +292,8 @@
{
switch (which) {
+ case PCIB_IVAR_DOMAIN:
+ return EINVAL;
case PCIB_IVAR_BUS:
legacy_set_pcibus(dev, value);
return 0;
==== //depot/projects/toestack/sys/arm/xscale/i80321/i80321_pci.c#2 (text+ko) ====
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.11 2007/07/27 14:53:42 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.12 2007/09/30 11:05:13 marius Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -250,8 +250,10 @@
{
struct i80321_pci_softc *sc = device_get_softc(dev);
switch (which) {
+ case PCIB_IVAR_DOMAIN:
+ *result = 0;
+ return (0);
case PCIB_IVAR_BUS:
-
*result = sc->sc_busno;
return (0);
@@ -265,6 +267,8 @@
struct i80321_pci_softc * sc = device_get_softc(dev);
switch (which) {
+ case PCIB_IVAR_DOMAIN:
+ return (EINVAL);
case PCIB_IVAR_BUS:
sc->sc_busno = result;
return (0);
==== //depot/projects/toestack/sys/arm/xscale/i8134x/i81342_pci.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342_pci.c,v 1.1 2007/07/27 14:50:57 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342_pci.c,v 1.2 2007/09/30 11:05:14 marius Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -481,8 +481,10 @@
{
struct i81342_pci_softc *sc = device_get_softc(dev);
switch (which) {
+ case PCIB_IVAR_DOMAIN:
+ *result = 0;
+ return (0);
case PCIB_IVAR_BUS:
-
*result = sc->sc_busno;
return (0);
@@ -496,6 +498,8 @@
struct i81342_pci_softc * sc = device_get_softc(dev);
switch (which) {
+ case PCIB_IVAR_DOMAIN:
+ return (EINVAL);
case PCIB_IVAR_BUS:
sc->sc_busno = result;
return (0);
==== //depot/projects/toestack/sys/arm/xscale/ixp425/ixp425_pci.c#2 (text+ko) ====
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_pci.c,v 1.4 2007/03/06 10:58:22 piso Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_pci.c,v 1.5 2007/09/30 11:05:14 marius Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -229,6 +229,9 @@
sc = device_get_softc(dev);
switch (which) {
+ case PCIB_IVAR_DOMAIN:
+ *result = 0;
+ return (0);
case PCIB_IVAR_BUS:
*result = sc->sc_bus;
return (0);
@@ -244,6 +247,8 @@
sc = device_get_softc(dev);
switch (which) {
+ case PCIB_IVAR_DOMAIN:
+ return (EINVAL);
case PCIB_IVAR_BUS:
sc->sc_bus = value;
return (0);
==== //depot/projects/toestack/sys/dev/acpica/acpi_pci.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.30 2006/05/11 22:13:20 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.31 2007/09/30 11:05:14 marius Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -275,17 +275,19 @@
static int
acpi_pci_attach(device_t dev)
{
- int busno;
+ int busno, domain;
/*
* Since there can be multiple independantly numbered PCI
* busses on systems with multiple PCI domains, we can't use
* the unit number to decide which bus we are probing. We ask
- * the parent pcib what our bus number is.
+ * the parent pcib what our domain and bus numbers are.
*/
+ domain = pcib_get_domain(dev);
busno = pcib_get_bus(dev);
if (bootverbose)
- device_printf(dev, "physical bus=%d\n", busno);
+ device_printf(dev, "domain=%d, physical bus=%d\n",
+ domain, busno);
/*
* First, PCI devices are added as in the normal PCI bus driver.
@@ -297,7 +299,7 @@
* pci_add_children() doesn't find. We currently just ignore
* these devices.
*/
- pci_add_children(dev, busno, sizeof(struct acpi_pci_devinfo));
+ pci_add_children(dev, domain, busno, sizeof(struct acpi_pci_devinfo));
AcpiWalkNamespace(ACPI_TYPE_DEVICE, acpi_get_handle(dev), 1,
acpi_pci_save_handle, dev, NULL);
==== //depot/projects/toestack/sys/dev/acpica/acpi_pcib_acpi.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.54 2007/05/02 17:50:35 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.55 2007/09/30 11:05:14 marius Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -259,6 +259,9 @@
struct acpi_hpcib_softc *sc = device_get_softc(dev);
switch (which) {
+ case PCIB_IVAR_DOMAIN:
+ *result = 0;
+ return (0);
case PCIB_IVAR_BUS:
*result = sc->ap_bus;
return (0);
@@ -278,6 +281,8 @@
struct acpi_hpcib_softc *sc = device_get_softc(dev);
switch (which) {
+ case PCIB_IVAR_DOMAIN:
+ return (EINVAL);
case PCIB_IVAR_BUS:
sc->ap_bus = value;
return (0);
==== //depot/projects/toestack/sys/dev/bge/if_bge.c#2 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.197 2007/06/04 18:25:03 dwmalone Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.198 2007/09/30 11:05:14 marius Exp $");
/*
* Broadcom BCM570x family gigabit ethernet driver for FreeBSD.
@@ -2181,13 +2181,14 @@
bge_has_multiple_ports(struct bge_softc *sc)
{
device_t dev = sc->bge_dev;
- u_int b, s, f, fscan;
+ u_int b, d, f, fscan, s;
+ d = pci_get_domain(dev);
b = pci_get_bus(dev);
s = pci_get_slot(dev);
f = pci_get_function(dev);
for (fscan = 0; fscan <= PCI_FUNCMAX; fscan++)
- if (fscan != f && pci_find_bsf(b, s, fscan) != NULL)
+ if (fscan != f && pci_find_dbsf(d, b, s, fscan) != NULL)
return (1);
return (0);
}
==== //depot/projects/toestack/sys/dev/cardbus/cardbus.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus.c,v 1.65 2007/05/16 23:40:08 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus.c,v 1.66 2007/09/30 11:05:14 marius Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -162,12 +162,13 @@
{
device_t brdev = device_get_parent(cbdev);
device_t child;
+ int bus, domain, slot, func;
int cardattached = 0;
- int bus, slot, func;
int cardbusfunchigh = 0;
cardbus_detach_card(cbdev); /* detach existing cards */
POWER_ENABLE_SOCKET(brdev, cbdev);
+ domain = pcib_get_domain(cbdev);
bus = pcib_get_bus(cbdev);
slot = 0;
/* For each function, set it up and try to attach a driver to it */
@@ -175,7 +176,7 @@
struct cardbus_devinfo *dinfo;
dinfo = (struct cardbus_devinfo *)
- pci_read_device(brdev, bus, slot, func,
+ pci_read_device(brdev, domain, bus, slot, func,
sizeof(struct cardbus_devinfo));
if (dinfo == NULL)
continue;
==== //depot/projects/toestack/sys/dev/pccbb/pccbb.c#2 (text+ko) ====
@@ -75,7 +75,7 @@
*/
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list