Date: Fri, 5 Feb 2010 19:51:17 GMT From: Alexander Motin <mav@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 174366 for review Message-ID: <201002051951.o15JpH1i078965@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/chv.cgi?CH=174366 Change 174366 by mav@mav_mavbook on 2010/02/05 19:50:55 IFC Affected files ... .. //depot/projects/scottl-camlock/src/bin/pax/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#15 integrate .. //depot/projects/scottl-camlock/src/etc/network.subr#11 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/Makefile#10 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/rtsold#1 branch .. //depot/projects/scottl-camlock/src/games/morse/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/games/morse/morse.c#3 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/binutils/gdb/Makefile.alpha#2 delete .. //depot/projects/scottl-camlock/src/gnu/usr.bin/binutils/ld/Makefile.alpha#2 delete .. //depot/projects/scottl-camlock/src/gnu/usr.bin/binutils/libbfd/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/binutils/libbfd/Makefile.alpha#2 delete .. //depot/projects/scottl-camlock/src/gnu/usr.bin/binutils/libopcodes/Makefile.alpha#2 delete .. //depot/projects/scottl-camlock/src/lib/libc/gen/getutxent.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/mips/sys/ptrace.S#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/string/memccpy.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/string/memchr.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/string/memcmp.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/string/memset.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/msun/amd64/fenv.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/msun/amd64/fenv.h#2 integrate .. //depot/projects/scottl-camlock/src/lib/msun/i387/fenv.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/msun/i387/fenv.h#2 integrate .. //depot/projects/scottl-camlock/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#7 integrate .. //depot/projects/scottl-camlock/src/sbin/dump/itime.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/dump/main.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/geom/class/multipath/geom_multipath.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifcarp.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/iscontrol/iscontrol.h#2 integrate .. //depot/projects/scottl-camlock/src/sbin/iscontrol/pdu.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/mount_nfs/mount_nfs.c#7 integrate .. //depot/projects/scottl-camlock/src/sbin/umount/umount.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#81 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#151 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_cpu.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#103 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cam.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-siliconimage.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ciss/ciss.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/vesa.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#30 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_library.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_library.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_pci.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_sbus.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/ispmbox.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/ispvar.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_cam.c#32 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mpt/mpt_raid.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pci.c#31 integrate .. //depot/projects/scottl-camlock/src/sys/dev/pci/pcivar.h#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#41 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/u3g.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#43 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/SWARM#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/exception.S#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/swtch.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/trap.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_asm.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_machdep.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_scd.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_scd.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_zbbus.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_zbpci.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/net/vnet.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/net/vnet.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_input.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/sys/fbio.h#6 integrate .. //depot/projects/scottl-camlock/src/usr.bin/bc/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/bc/bc.y#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/bc/extern.h#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/bc/scan.l#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/dc/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/dc/bcode.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/dc/bcode.h#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/dc/dc.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/dc/inout.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/dc/mem.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/dc/stack.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/gcore/extern.h#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/gcore/gcore.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/truss/mips-fbsd.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/powerd/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/powerd/powerd.c#5 integrate Differences ... ==== //depot/projects/scottl-camlock/src/bin/pax/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/pax/Makefile,v 1.12 2004/05/14 13:31:19 cognet Exp $ +# $FreeBSD: src/bin/pax/Makefile,v 1.13 2010/02/04 07:18:19 imp Exp $ # To install on versions prior to BSD 4.4 the following may have to be # defined with CFLAGS += @@ -33,8 +33,6 @@ #MAN= pax.1 tar.1 cpio.1 #LINKS= ${BINDIR}/pax ${BINDIR}/tar ${BINDIR}/pax ${BINDIR}/cpio -.if ${MACHINE_ARCH} == "arm" WARNS?= 3 -.endif .include <bsd.prog.mk> ==== //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#15 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.367 2010/01/17 08:41:07 ume Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.368 2010/02/03 16:18:42 ume Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -460,6 +460,10 @@ # Now this works only for IPv6 link local # multicast addrs. rtsol_flags="" # Flags to IPv6 router solicitation. +rtsold_enable="NO" # Set to YES to enable an IPv6 router + # solicitation daemon. +rtsold_flags="-a" # Flags to an IPv6 router solicitation + # daemon. rtadvd_enable="NO" # Set to YES to enable an IPv6 router # advertisement daemon. If set to YES, # this router becomes a possible candidate ==== //depot/projects/scottl-camlock/src/etc/network.subr#11 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/network.subr,v 1.205 2009/12/29 21:06:49 jhb Exp $ +# $FreeBSD: src/etc/network.subr,v 1.206 2010/02/03 16:18:42 ume Exp $ # # @@ -882,7 +882,9 @@ { if ipv6_autoconfif $1; then ifconfig $1 inet6 accept_rtadv up - rtsol ${rtsol_flags} $1 + if ! checkyesno rtsold_enable; then + rtsol ${rtsol_flags} $1 + fi fi } ==== //depot/projects/scottl-camlock/src/etc/rc.d/Makefile#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.102 2009/12/02 15:05:26 ume Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.103 2010/02/03 16:18:42 ume Exp $ .include <bsd.own.mk> @@ -30,7 +30,7 @@ powerd power_profile ppp pppoed pwcheck \ quota \ random rarpd resolv rfcomm_pppd_server root \ - route6d routed routing rpcbind rtadvd rwho \ + route6d routed routing rpcbind rtadvd rtsold rwho \ savecore sdpd securelevel sendmail \ serial sppp statd static_arp stf swap1 \ syscons sysctl syslogd \ ==== //depot/projects/scottl-camlock/src/games/morse/Makefile#2 (text+ko) ==== @@ -1,11 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/morse/Makefile,v 1.8 2005/11/11 09:57:32 ru Exp $ +# $FreeBSD: src/games/morse/Makefile,v 1.9 2010/02/04 07:08:06 imp Exp $ PROG= morse MAN= morse.6 -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" -CFLAGS += -DSPEAKER=\"/dev/speaker\" -.endif - .include <bsd.prog.mk> ==== //depot/projects/scottl-camlock/src/games/morse/morse.c#3 (text+ko) ==== @@ -47,7 +47,7 @@ static char sccsid[] = "@(#)morse.c 8.1 (Berkeley) 5/31/93"; #endif static const char rcsid[] = - "$FreeBSD: src/games/morse/morse.c,v 1.22 2008/06/08 19:35:47 scf Exp $"; + "$FreeBSD: src/games/morse/morse.c,v 1.23 2010/02/04 07:08:06 imp Exp $"; #endif /* not lint */ #include <sys/time.h> @@ -63,6 +63,9 @@ #include <termios.h> #include <unistd.h> +/* Always use the speaker, let the open fail if -p is selected */ +#define SPEAKER "/dev/speaker" + #ifdef SPEAKER #include <dev/speaker/speaker.h> #endif ==== //depot/projects/scottl-camlock/src/gnu/usr.bin/binutils/libbfd/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile,v 1.33 2004/10/24 15:32:25 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile,v 1.34 2010/02/03 18:29:35 imp Exp $ .include "../Makefile.inc0" @@ -11,8 +11,7 @@ section.c srec.c stab-syms.c stabs.c syms.c targets.c tekhex.c \ targmatch.h dwarf1.c dwarf2.c config.h bfdver.h bfdio.c simple.c WARNS?= 0 -.if (${TARGET_ARCH} == "alpha" || ${TARGET_ARCH} == "ia64" || \ - ${TARGET_ARCH} == "sparc64") +.if (${TARGET_ARCH} == "ia64" || ${TARGET_ARCH} == "sparc64") WARNS?= 2 .endif CFLAGS+= -D_GNU_SOURCE ==== //depot/projects/scottl-camlock/src/lib/libc/gen/getutxent.3#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/getutxent.3,v 1.7 2010/01/23 17:58:40 ed Exp $ +.\" $FreeBSD: src/lib/libc/gen/getutxent.3,v 1.8 2010/02/03 19:31:02 ed Exp $ .\" .Dd January 8, 2010 .Os @@ -426,8 +426,10 @@ .Fa ut_type . This prevents the need for special utility functions to update the other databases, such as the +.Fn updlastlogx +and .Fn updwtmpx -function which is often available in other implementations. +functions which are available in other implementations. It also tries to replace .Dv DEAD_PROCESS entries in the active sessions database when storing ==== //depot/projects/scottl-camlock/src/lib/libc/mips/sys/ptrace.S#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <machine/asm.h> -__FBSDID("$FreeBSD: src/lib/libc/mips/sys/ptrace.S,v 1.3 2008/04/26 12:08:02 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/mips/sys/ptrace.S,v 1.6 2010/02/04 05:49:59 neel Exp $"); #include "SYS.h" #if defined(LIBC_SCCS) && !defined(lint) @@ -42,14 +42,26 @@ #endif /* LIBC_SCCS and not lint */ LEAF(ptrace) + .frame sp, 40, ra + .mask 0x80000000, -8 #ifdef __ABICALLS__ .set noreorder .cpload t9 .set reorder #endif + subu sp, sp, 40 + sw ra, 32(sp) +#ifdef __ABICALLS__ + .cprestore 16 +#endif la t9, _C_LABEL(__error) # locate address of errno jalr t9 +#ifdef __ABICALLS__ + lw gp, 16(sp) +#endif sw zero, 0(v0) + lw ra, 32(sp) + addu sp, sp, 40 li v0, SYS_ptrace syscall bne a3, zero, 1f ==== //depot/projects/scottl-camlock/src/lib/libc/string/memccpy.3#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)memccpy.3 8.1 (Berkeley) 6/9/93 -.\" $FreeBSD: src/lib/libc/string/memccpy.3,v 1.7 2007/01/09 00:28:12 imp Exp $ +.\" $FreeBSD: src/lib/libc/string/memccpy.3,v 1.8 2010/02/04 11:23:28 ru Exp $ .\" .Dd June 9, 1993 .Dt MEMCCPY 3 @@ -50,7 +50,9 @@ .Fa dst . If the character .Fa c -(as converted to an unsigned char) occurs in the string +(as converted to an +.Vt "unsigned char" ) +occurs in the string .Fa src , the copy stops and a pointer to the byte after the copy of .Fa c ==== //depot/projects/scottl-camlock/src/lib/libc/string/memchr.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)memchr.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/string/memchr.3,v 1.12 2009/04/23 08:37:56 brueffer Exp $ +.\" $FreeBSD: src/lib/libc/string/memchr.3,v 1.13 2010/02/04 11:23:28 ru Exp $ .\" .Dd April 9, 2008 .Dt MEMCHR 3 @@ -52,7 +52,8 @@ function locates the first occurrence of .Fa c -(converted to an unsigned char) +(converted to an +.Vt "unsigned char" ) in string .Fa b . .Pp ==== //depot/projects/scottl-camlock/src/lib/libc/string/memcmp.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)memcmp.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/string/memcmp.3,v 1.10 2009/04/07 13:42:53 trasz Exp $ +.\" $FreeBSD: src/lib/libc/string/memcmp.3,v 1.11 2010/02/04 11:23:28 ru Exp $ .\" .Dd June 4, 1993 .Dt MEMCMP 3 @@ -61,7 +61,9 @@ function returns zero if the two strings are identical, otherwise returns the difference between the first two differing bytes -(treated as unsigned char values, so that +(treated as +.Vt "unsigned char" +values, so that .Sq Li \e200 is greater than .Sq Li \&\e0 , ==== //depot/projects/scottl-camlock/src/lib/libc/string/memset.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)memset.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/string/memset.3,v 1.9 2009/04/07 13:42:53 trasz Exp $ +.\" $FreeBSD: src/lib/libc/string/memset.3,v 1.10 2010/02/04 11:23:28 ru Exp $ .\" .Dd June 4, 1993 .Dt MEMSET 3 @@ -52,7 +52,9 @@ .Fa len bytes of value .Fa c -(converted to an unsigned char) to the string +(converted to an +.Vt "unsigned char" ) +to the string .Fa b . .Sh RETURN VALUES The ==== //depot/projects/scottl-camlock/src/lib/msun/amd64/fenv.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/msun/amd64/fenv.c,v 1.4 2007/01/05 07:15:26 das Exp $ + * $FreeBSD: src/lib/msun/amd64/fenv.c,v 1.5 2010/02/03 20:23:47 kib Exp $ */ #include <sys/cdefs.h> @@ -86,7 +86,7 @@ int feholdexcept(fenv_t *envp) { - int mxcsr; + __uint32_t mxcsr; __stmxcsr(&mxcsr); __fnstenv(&envp->__x87); @@ -101,7 +101,8 @@ int feupdateenv(const fenv_t *envp) { - int mxcsr, status; + __uint32_t mxcsr; + __uint16_t status; __fnstsw(&status); __stmxcsr(&mxcsr); @@ -113,7 +114,8 @@ int __feenableexcept(int mask) { - int mxcsr, control, omask; + __uint32_t mxcsr, omask; + __uint16_t control; mask &= FE_ALL_EXCEPT; __fnstcw(&control); @@ -129,7 +131,8 @@ int __fedisableexcept(int mask) { - int mxcsr, control, omask; + __uint32_t mxcsr, omask; + __uint16_t control; mask &= FE_ALL_EXCEPT; __fnstcw(&control); ==== //depot/projects/scottl-camlock/src/lib/msun/amd64/fenv.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/msun/amd64/fenv.h,v 1.6 2007/01/06 21:46:23 das Exp $ + * $FreeBSD: src/lib/msun/amd64/fenv.h,v 1.7 2010/02/03 20:23:47 kib Exp $ */ #ifndef _FENV_H_ @@ -110,7 +110,8 @@ static __inline int fegetexceptflag(fexcept_t *__flagp, int __excepts) { - int __mxcsr, __status; + __uint32_t __mxcsr; + __uint16_t __status; __stmxcsr(&__mxcsr); __fnstsw(&__status); @@ -124,7 +125,8 @@ static __inline int fetestexcept(int __excepts) { - int __mxcsr, __status; + __uint32_t __mxcsr; + __uint16_t __status; __stmxcsr(&__mxcsr); __fnstsw(&__status); @@ -134,7 +136,7 @@ static __inline int fegetround(void) { - int __control; + __uint16_t __control; /* * We assume that the x87 and the SSE unit agree on the @@ -149,7 +151,8 @@ static __inline int fesetround(int __round) { - int __mxcsr, __control; + __uint32_t __mxcsr; + __uint16_t __control; if (__round & ~_ROUND_MASK) return (-1); @@ -197,7 +200,7 @@ static __inline int fegetexcept(void) { - int __control; + __uint16_t __control; /* * We assume that the masks for the x87 and the SSE unit are ==== //depot/projects/scottl-camlock/src/lib/msun/i387/fenv.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/msun/i387/fenv.c,v 1.3 2007/01/05 07:15:26 das Exp $ + * $FreeBSD: src/lib/msun/i387/fenv.c,v 1.4 2010/02/03 20:23:47 kib Exp $ */ #include <sys/cdefs.h> @@ -87,7 +87,7 @@ fesetexceptflag(const fexcept_t *flagp, int excepts) { fenv_t env; - int mxcsr; + __uint32_t mxcsr; __fnstenv(&env); env.__status &= ~excepts; @@ -117,7 +117,7 @@ int fegetenv(fenv_t *envp) { - int mxcsr; + __uint32_t mxcsr; __fnstenv(envp); /* @@ -135,7 +135,7 @@ int feholdexcept(fenv_t *envp) { - int mxcsr; + __uint32_t mxcsr; __fnstenv(envp); __fnclex(); @@ -152,7 +152,8 @@ int feupdateenv(const fenv_t *envp) { - int mxcsr, status; + __uint32_t mxcsr; + __uint16_t status; __fnstsw(&status); if (__HAS_SSE()) @@ -167,7 +168,8 @@ int __feenableexcept(int mask) { - int mxcsr, control, omask; + __uint32_t mxcsr, omask; + __uint16_t control; mask &= FE_ALL_EXCEPT; __fnstcw(&control); @@ -188,7 +190,8 @@ int __fedisableexcept(int mask) { - int mxcsr, control, omask; + __uint32_t mxcsr, omask; + __uint16_t control; mask &= FE_ALL_EXCEPT; __fnstcw(&control); ==== //depot/projects/scottl-camlock/src/lib/msun/i387/fenv.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/msun/i387/fenv.h,v 1.6 2007/01/06 21:46:23 das Exp $ + * $FreeBSD: src/lib/msun/i387/fenv.h,v 1.7 2010/02/03 20:23:47 kib Exp $ */ #ifndef _FENV_H_ @@ -114,7 +114,7 @@ feclearexcept(int __excepts) { fenv_t __env; - int __mxcsr; + __uint32_t __mxcsr; if (__excepts == FE_ALL_EXCEPT) { __fnclex(); @@ -134,7 +134,8 @@ static __inline int fegetexceptflag(fexcept_t *__flagp, int __excepts) { - int __mxcsr, __status; + __uint32_t __mxcsr; + __uint16_t __status; __fnstsw(&__status); if (__HAS_SSE()) @@ -151,7 +152,8 @@ static __inline int fetestexcept(int __excepts) { - int __mxcsr, __status; + __uint32_t __mxcsr; + __uint16_t __status; __fnstsw(&__status); if (__HAS_SSE()) @@ -164,7 +166,7 @@ static __inline int fegetround(void) { - int __control; + __uint16_t __control; /* * We assume that the x87 and the SSE unit agree on the @@ -179,7 +181,8 @@ static __inline int fesetround(int __round) { - int __mxcsr, __control; + __uint32_t __mxcsr; + __uint16_t __control; if (__round & ~_ROUND_MASK) return (-1); @@ -206,7 +209,7 @@ fesetenv(const fenv_t *__envp) { fenv_t __env = *__envp; - int __mxcsr; + __uint32_t __mxcsr; __mxcsr = __get_mxcsr(__env); __set_mxcsr(__env, 0xffffffff); @@ -234,7 +237,7 @@ static __inline int fegetexcept(void) { - int __control; + __uint16_t __control; /* * We assume that the masks for the x87 and the SSE unit are ==== //depot/projects/scottl-camlock/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#7 (text+ko) ==== @@ -17,7 +17,7 @@ <corpauthor>The &os; Documentation Project</corpauthor> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.358 2010/01/19 22:44:29 brueffer Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.359 2010/02/05 16:41:19 nwhitehorn Exp $</pubdate> <copyright> <year>2000</year> @@ -316,8 +316,51 @@ <sect2 id="proc-powerpc"> <title>powerpc</title> - <para>The information for this paragraph has yet to be - compiled.</para> + <para>This section describes the systems currently known to be + supported by &os; on the PowerPC platform. This list is not + exhaustive.</para> + + <para>In general, all New World architecture Apple hardware + is supported, as well a limited selection of non-Apple + machines.</para> + + <para>All systems listed below are fully supported, with the + exception that software fan control is currently missing on + the Power Macintosh G5. SMP is supported on all systems with + more than 1 processor.</para> + + <itemizedlist> + <listitem> + <para>Apple iMac</para> + </listitem> + <listitem> + <para>Apple Power Macintosh G3 (Blue & White)</para> + </listitem> + <listitem> + <para>Apple Power Macintosh G4</para> + </listitem> + <listitem> + <para>Apple Power Macintosh G5 (non-970MP models)</para> + </listitem> + <listitem> + <para>Apple iBook</para> + </listitem> + <listitem> + <para>Apple PowerBook G4</para> + </listitem> + <listitem> + <para>Apple XServe G4</para> + </listitem> + <listitem> + <para>Apple XServe G5</para> + </listitem> + <listitem> + <para>Apple Mac Mini</para> + </listitem> + <listitem> + <para>Embedded boards based on MPC85XX</para> + </listitem> + </itemizedlist> </sect2> <sect2 id="proc-sparc64"> ==== //depot/projects/scottl-camlock/src/sbin/dump/itime.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ static char sccsid[] = "@(#)itime.c 8.1 (Berkeley) 6/5/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/dump/itime.c,v 1.17 2008/05/24 05:20:46 mckusick Exp $"; + "$FreeBSD: src/sbin/dump/itime.c,v 1.18 2010/02/03 23:56:12 delphij Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -106,8 +106,10 @@ for (;;) { dtwalk = (struct dumptime *)calloc(1, sizeof (struct dumptime)); - if (getrecord(df, &(dtwalk->dt_value)) < 0) + if (getrecord(df, &(dtwalk->dt_value)) < 0) { + free(dtwalk); break; + } nddates++; SLIST_INSERT_HEAD(&dthead, dtwalk, dt_list); } ==== //depot/projects/scottl-camlock/src/sbin/dump/main.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/1/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/dump/main.c,v 1.67 2008/05/24 05:20:46 mckusick Exp $"; + "$FreeBSD: src/sbin/dump/main.c,v 1.68 2010/02/03 23:56:12 delphij Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -767,7 +767,8 @@ if (flags) { *p = '\0'; *nargv++ = flagsp; - } + } else + free(flagsp); /* Copy remaining arguments. */ while ((*nargv++ = *argv++)); ==== //depot/projects/scottl-camlock/src/sbin/geom/class/multipath/geom_multipath.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/geom/class/multipath/geom_multipath.c,v 1.2 2007/05/15 20:25:17 marcel Exp $"); +__FBSDID("$FreeBSD: src/sbin/geom/class/multipath/geom_multipath.c,v 1.3 2010/02/04 21:51:33 mjacob Exp $"); #include <sys/param.h> #include <errno.h> #include <paths.h> @@ -55,6 +55,10 @@ NULL, "[-v] name prov ..." }, { + "destroy", G_FLAG_VERBOSE, NULL, G_NULL_OPTS, + NULL, "[-v] prov ..." + }, + { "clear", G_FLAG_VERBOSE, mp_main, G_NULL_OPTS, NULL, "[-v] prov ..." }, ==== //depot/projects/scottl-camlock/src/sbin/ifconfig/ifcarp.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sbin/ifconfig/ifcarp.c,v 1.2 2005/02/22 14:07:47 glebius Exp $ */ +/* $FreeBSD: src/sbin/ifconfig/ifcarp.c,v 1.3 2010/02/04 11:43:22 ru Exp $ */ /* from $OpenBSD: ifconfig.c,v 1.82 2003/10/19 05:43:35 mcbride Exp $ */ /* @@ -96,6 +96,7 @@ if (ioctl(s, SIOCGVH, (caddr_t)&ifr) == -1) err(1, "SIOCGVH"); + memset(carpr.carpr_key, 0, sizeof(carpr.carpr_key)); /* XXX Should hash the password into the key here, perhaps? */ strlcpy(carpr.carpr_key, val, CARP_KEY_LEN); ==== //depot/projects/scottl-camlock/src/sbin/iscontrol/iscontrol.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sbin/iscontrol/iscontrol.h,v 1.2 2008/11/25 07:17:11 scottl Exp $ + * $FreeBSD: src/sbin/iscontrol/iscontrol.h,v 1.3 2010/02/03 23:58:00 delphij Exp $ */ /* | $Id: iscontrol.h,v 2.3 2007/04/27 08:36:49 danny Exp danny $ @@ -144,7 +144,6 @@ void freePDU(pdu_t *pp); int xmitpdu(isess_t *sess, pdu_t *pp); int recvpdu(isess_t *sess, pdu_t *pp); -void pukeText(char *it, pdu_t *pp); int lookup(token_t *tbl, char *m); ==== //depot/projects/scottl-camlock/src/sbin/iscontrol/pdu.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/iscontrol/pdu.c,v 1.2 2008/11/25 07:17:11 scottl Exp $"); +__FBSDID("$FreeBSD: src/sbin/iscontrol/pdu.c,v 1.3 2010/02/03 23:58:00 delphij Exp $"); #include <sys/types.h> #include <sys/time.h> @@ -46,6 +46,8 @@ #include "iscsi.h" #include "iscontrol.h" +static void pukeText(char *it, pdu_t *pp); + int xmitpdu(isess_t *sess, pdu_t *pp) { @@ -153,7 +155,7 @@ pp->ds_size = pp->ds_len = 0; } -void +static void pukeText(char *it, pdu_t *pp) { char *ptr; ==== //depot/projects/scottl-camlock/src/sbin/mount_nfs/mount_nfs.c#7 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/mount_nfs/mount_nfs.c,v 1.90 2009/10/26 14:57:33 jh Exp $"); +__FBSDID("$FreeBSD: src/sbin/mount_nfs/mount_nfs.c,v 1.92 2010/02/04 15:17:49 ume Exp $"); #include <sys/param.h> #include <sys/linker.h> @@ -130,20 +130,19 @@ TRYRET_LOCALERR /* Local failure. */ }; -int fallback_mount(struct iovec *iov, int iovlen, int mntflags); -int sec_name_to_num(char *sec); -char *sec_num_to_name(int num); -int getnfsargs(char *, struct iovec **iov, int *iovlen); +static int fallback_mount(struct iovec *iov, int iovlen, int mntflags); +static int sec_name_to_num(char *sec); +static char *sec_num_to_name(int num); +static int getnfsargs(char *, struct iovec **iov, int *iovlen); /* void set_rpc_maxgrouplist(int); */ -struct netconfig *getnetconf_cached(const char *netid); -const char *netidbytype(int af, int sotype); -void usage(void) __dead2; -int xdr_dir(XDR *, char *); -int xdr_fh(XDR *, struct nfhret *); -enum tryret nfs_tryproto(struct addrinfo *ai, char *hostp, char *spec, +static struct netconfig *getnetconf_cached(const char *netid); +static const char *netidbytype(int af, int sotype); +static void usage(void) __dead2; +static int xdr_dir(XDR *, char *); +static int xdr_fh(XDR *, struct nfhret *); +static enum tryret nfs_tryproto(struct addrinfo *ai, char *hostp, char *spec, char **errstr, struct iovec **iov, int *iovlen); -enum tryret returncode(enum clnt_stat stat, struct rpc_err *rpcerr); -extern int getosreldate(void); +static enum tryret returncode(enum clnt_stat stat, struct rpc_err *rpcerr); int main(int argc, char *argv[]) @@ -476,7 +475,7 @@ * passing NFS mount options to nmount() as individual * parameters. It should be eventually be removed. */ -int +static int fallback_mount(struct iovec *iov, int iovlen, int mntflags) { struct nfs_args args = { @@ -663,7 +662,7 @@ return nmount(newiov, newiovlen, mntflags); } -int +static int sec_name_to_num(char *sec) { if (!strcmp(sec, "krb5")) @@ -677,7 +676,7 @@ return (-1); } -char * +static char * sec_num_to_name(int flavor) { switch (flavor) { @@ -693,17 +692,22 @@ return (NULL); } -int +static int getnfsargs(char *spec, struct iovec **iov, int *iovlen) { struct addrinfo hints, *ai_nfs, *ai; enum tryret ret; - int ecode, speclen, remoteerr; + int ecode, speclen, remoteerr, offset, have_bracket = 0; char *hostp, *delimp, *errstr; size_t len; static char nam[MNAMELEN + 1], pname[MAXHOSTNAMELEN + 5]; - if ((delimp = strrchr(spec, ':')) != NULL) { + if (*spec == '[' && (delimp = strchr(spec + 1, ']')) != NULL && + *(delimp + 1) == ':') { + hostp = spec + 1; + spec = delimp + 2; + have_bracket = 1; + } else if ((delimp = strrchr(spec, ':')) != NULL) { hostp = spec; spec = delimp + 1; } else if ((delimp = strrchr(spec, '@')) != NULL) { @@ -731,10 +735,15 @@ /* Make both '@' and ':' notations equal */ if (*hostp != '\0') { len = strlen(hostp); - memmove(nam, hostp, len); - nam[len] = ':'; - memmove(nam + len + 1, spec, speclen); - nam[len + speclen + 1] = '\0'; + offset = 0; + if (have_bracket) + nam[offset++] = '['; + memmove(nam + offset, hostp, len); + if (have_bracket) + nam[len + offset++] = ']'; + nam[len + offset++] = ':'; + memmove(nam + len + offset, spec, speclen); + nam[len + speclen + offset] = '\0'; } /* @@ -839,7 +848,7 @@ * In all error cases, *errstr will be set to a statically-allocated string * describing the error. */ -enum tryret +static enum tryret nfs_tryproto(struct addrinfo *ai, char *hostp, char *spec, char **errstr, struct iovec **iov, int *iovlen) { @@ -1061,7 +1070,7 @@ * Catagorise a RPC return status and error into an `enum tryret' * return code. */ -enum tryret +static enum tryret returncode(enum clnt_stat stat, struct rpc_err *rpcerr) { switch (stat) { @@ -1096,7 +1105,7 @@ * * XXX there should be a library function for this. */ -const char * +static const char * netidbytype(int af, int sotype) { struct nc_protos *p; @@ -1116,7 +1125,7 @@ * Otherwise it behaves just like getnetconfigent(), so nc_*error() * work on failure. */ -struct netconfig * +static struct netconfig * getnetconf_cached(const char *netid) { static struct nc_entry { >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201002051951.o15JpH1i078965>