Date: Mon, 17 Dec 2007 23:01:33 GMT From: Kip Macy <kmacy@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 131133 for review Message-ID: <200712172301.lBHN1XVC034144@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=131133 Change 131133 by kmacy@entropy_kmacy_xen31 on 2007/12/17 23:00:48 IFC #131130 Affected files ... .. //depot/projects/xen31/Makefile#2 integrate .. //depot/projects/xen31/bin/mv/mv.c#2 integrate .. //depot/projects/xen31/contrib/amd/FREEBSD-Xlist#2 integrate .. //depot/projects/xen31/contrib/amd/FREEBSD-upgrade#2 integrate .. //depot/projects/xen31/contrib/gcc/fold-const.c#2 integrate .. //depot/projects/xen31/contrib/gdtoa/gdtoaimp.h#2 integrate .. //depot/projects/xen31/contrib/gdtoa/hexnan.c#2 integrate .. //depot/projects/xen31/contrib/gdtoa/strtod.c#2 integrate .. //depot/projects/xen31/contrib/gdtoa/strtof.c#2 integrate .. //depot/projects/xen31/contrib/gdtoa/strtorQ.c#2 integrate .. //depot/projects/xen31/contrib/gdtoa/strtorx.c#2 integrate .. //depot/projects/xen31/etc/rc.d/ldconfig#3 integrate .. //depot/projects/xen31/games/fortune/datfiles/fortunes#5 integrate .. //depot/projects/xen31/games/fortune/datfiles/fortunes-o.real#3 integrate .. //depot/projects/xen31/include/complex.h#2 integrate .. //depot/projects/xen31/include/nsswitch.h#2 integrate .. //depot/projects/xen31/include/pthread_np.h#3 integrate .. //depot/projects/xen31/lib/Makefile#5 integrate .. //depot/projects/xen31/lib/libc/Versions.def#2 integrate .. //depot/projects/xen31/lib/libc/amd64/Symbol.map#2 integrate .. //depot/projects/xen31/lib/libc/amd64/gd_qnan.h#2 integrate .. //depot/projects/xen31/lib/libc/arm/gd_qnan.h#2 integrate .. //depot/projects/xen31/lib/libc/gdtoa/Symbol.map#2 integrate .. //depot/projects/xen31/lib/libc/gen/getgrent.c#2 integrate .. //depot/projects/xen31/lib/libc/gen/getgrouplist.c#2 integrate .. //depot/projects/xen31/lib/libc/i386/Symbol.map#2 integrate .. //depot/projects/xen31/lib/libc/i386/gd_qnan.h#2 integrate .. //depot/projects/xen31/lib/libc/ia64/Symbol.map#2 integrate .. //depot/projects/xen31/lib/libc/ia64/gd_qnan.h#2 integrate .. //depot/projects/xen31/lib/libc/locale/localeconv.c#2 integrate .. //depot/projects/xen31/lib/libc/net/nsdispatch.c#2 integrate .. //depot/projects/xen31/lib/libc/sparc64/Symbol.map#2 integrate .. //depot/projects/xen31/lib/libc/sparc64/gd_qnan.h#2 integrate .. //depot/projects/xen31/lib/libc/stdlib/grantpt.c#2 integrate .. //depot/projects/xen31/lib/libc/stdlib/malloc.c#3 integrate .. //depot/projects/xen31/lib/libc/stdlib/rand.c#2 integrate .. //depot/projects/xen31/lib/libc/stdlib/strtod.3#2 integrate .. //depot/projects/xen31/lib/libc/string/strtok.3#2 integrate .. //depot/projects/xen31/lib/libc/string/strtok.c#2 integrate .. //depot/projects/xen31/lib/libc/string/wcstok.c#2 integrate .. //depot/projects/xen31/lib/libfetch/Makefile#2 integrate .. //depot/projects/xen31/lib/libfetch/common.c#2 integrate .. //depot/projects/xen31/lib/libfetch/common.h#2 integrate .. //depot/projects/xen31/lib/libfetch/fetch.c#2 integrate .. //depot/projects/xen31/lib/libfetch/file.c#2 integrate .. //depot/projects/xen31/lib/libfetch/ftp.c#2 integrate .. //depot/projects/xen31/lib/libfetch/http.c#2 integrate .. //depot/projects/xen31/lib/libkse/sys/thr_error.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_accept.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_aio_suspend.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_atfork.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_destroy.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_get_np.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_getdetachstate.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_getguardsize.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_getinheritsched.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_getschedparam.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_getschedpolicy.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_getscope.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_getstack.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_getstackaddr.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_getstacksize.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_init.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_setdetachstate.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_setguardsize.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_setinheritsched.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_setschedparam.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_setschedpolicy.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_setscope.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_setstack.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_setstackaddr.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_attr_setstacksize.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_barrier.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_barrierattr.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_cancel.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_clean.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_close.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_concurrency.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_cond.c#4 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_condattr_destroy.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_condattr_init.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_connect.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_creat.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_create.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_detach.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_equal.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_execve.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_exit.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_fcntl.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_fork.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_fsync.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_getprio.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_getschedparam.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_info.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_init.c#4 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_join.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_kill.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_main_np.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_mattr_init.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_mattr_kind_np.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_msync.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_multi_np.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_mutex.c#5 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_mutex_prioceiling.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_mutex_protocol.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_mutexattr_destroy.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_nanosleep.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_once.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_open.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_pause.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_poll.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_private.h#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_pselect.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_pspinlock.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_raise.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_read.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_readv.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_resume_np.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_rwlock.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_rwlockattr.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_select.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_self.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_sem.c#2 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_setprio.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_setschedparam.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_sigaction.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_sigaltstack.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_sigmask.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_sigpending.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_sigprocmask.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_sigsuspend.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_sigwait.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_single_np.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_sleep.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_spec.c#4 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_spinlock.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_suspend_np.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_switch_np.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_symbols.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_system.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_tcdrain.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_vfork.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_wait.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_wait4.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_waitpid.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_write.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_writev.c#3 integrate .. //depot/projects/xen31/lib/libkse/thread/thr_yield.c#3 integrate .. //depot/projects/xen31/lib/libthr/pthread.map#3 integrate .. //depot/projects/xen31/lib/libthr/thread/thr_mutex.c#4 integrate .. //depot/projects/xen31/lib/libthr/thread/thr_private.h#4 integrate .. //depot/projects/xen31/lib/libufs/Makefile#2 integrate .. //depot/projects/xen31/lib/libufs/block.c#2 integrate .. //depot/projects/xen31/lib/libufs/bread.3#2 integrate .. //depot/projects/xen31/lib/libufs/libufs.h#2 integrate .. //depot/projects/xen31/lib/msun/Makefile#2 integrate .. //depot/projects/xen31/lib/msun/Symbol.map#2 integrate .. //depot/projects/xen31/lib/msun/amd64/Makefile.inc#2 integrate .. //depot/projects/xen31/lib/msun/amd64/s_logbl.S#1 branch .. //depot/projects/xen31/lib/msun/i387/Makefile.inc#2 integrate .. //depot/projects/xen31/lib/msun/i387/s_logbl.S#1 branch .. //depot/projects/xen31/lib/msun/ld128/s_nanl.c#1 branch .. //depot/projects/xen31/lib/msun/ld80/s_nanl.c#1 branch .. //depot/projects/xen31/lib/msun/man/atan2.3#2 integrate .. //depot/projects/xen31/lib/msun/man/csqrt.3#1 branch .. //depot/projects/xen31/lib/msun/man/hypot.3#2 integrate .. //depot/projects/xen31/lib/msun/man/ilogb.3#2 integrate .. //depot/projects/xen31/lib/msun/man/math.3#2 integrate .. //depot/projects/xen31/lib/msun/man/nan.3#1 branch .. //depot/projects/xen31/lib/msun/man/sqrt.3#2 integrate .. //depot/projects/xen31/lib/msun/src/math.h#2 integrate .. //depot/projects/xen31/lib/msun/src/s_carg.c#1 branch .. //depot/projects/xen31/lib/msun/src/s_cargf.c#1 branch .. //depot/projects/xen31/lib/msun/src/s_csqrt.c#1 branch .. //depot/projects/xen31/lib/msun/src/s_csqrtf.c#1 branch .. //depot/projects/xen31/lib/msun/src/s_logb.c#2 integrate .. //depot/projects/xen31/lib/msun/src/s_logbl.c#1 branch .. //depot/projects/xen31/lib/msun/src/s_nan.c#1 branch .. //depot/projects/xen31/release/doc/en_US.ISO8859-1/hardware/article.sgml#3 integrate .. //depot/projects/xen31/release/doc/share/misc/dev.archlist.txt#2 integrate .. //depot/projects/xen31/sbin/atacontrol/atacontrol.c#2 integrate .. //depot/projects/xen31/sbin/growfs/growfs.c#2 integrate .. //depot/projects/xen31/sbin/ipfw/ipfw2.c#3 integrate .. //depot/projects/xen31/sbin/natd/natd.8#3 integrate .. //depot/projects/xen31/sbin/newfs/mkfs.c#2 integrate .. //depot/projects/xen31/sbin/newfs/newfs.8#3 integrate .. //depot/projects/xen31/sbin/newfs/newfs.c#3 integrate .. //depot/projects/xen31/sbin/newfs/newfs.h#3 integrate .. //depot/projects/xen31/share/man/man3/tgmath.3#2 integrate .. //depot/projects/xen31/share/man/man4/Makefile#4 integrate .. //depot/projects/xen31/share/man/man4/hptrr.4#1 branch .. //depot/projects/xen31/share/man/man5/src.conf.5#3 integrate .. //depot/projects/xen31/share/man/man7/build.7#2 integrate .. //depot/projects/xen31/share/mk/bsd.own.mk#3 integrate .. //depot/projects/xen31/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/xen31/sys/amd64/conf/GENERIC#5 integrate .. //depot/projects/xen31/sys/amd64/conf/NOTES#4 integrate .. //depot/projects/xen31/sys/arm/arm/pmap.c#7 integrate .. //depot/projects/xen31/sys/arm/at91/at91.c#2 integrate .. //depot/projects/xen31/sys/arm/at91/if_ate.c#3 integrate .. //depot/projects/xen31/sys/boot/powerpc/Makefile#2 integrate .. //depot/projects/xen31/sys/boot/powerpc/ofw/Makefile#1 branch .. //depot/projects/xen31/sys/boot/powerpc/ofw/conf.c#1 branch .. //depot/projects/xen31/sys/boot/powerpc/ofw/help.ofw#1 branch .. //depot/projects/xen31/sys/boot/powerpc/ofw/ldscript.powerpc#1 branch .. //depot/projects/xen31/sys/boot/powerpc/ofw/metadata.c#1 branch .. //depot/projects/xen31/sys/boot/powerpc/ofw/start.c#1 branch .. //depot/projects/xen31/sys/boot/powerpc/ofw/version#1 branch .. //depot/projects/xen31/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/xen31/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/xen31/sys/conf/NOTES#7 integrate .. //depot/projects/xen31/sys/conf/files#9 integrate .. //depot/projects/xen31/sys/conf/files.amd64#6 integrate .. //depot/projects/xen31/sys/conf/files.i386#9 integrate .. //depot/projects/xen31/sys/conf/files.powerpc#4 integrate .. //depot/projects/xen31/sys/conf/options#5 integrate .. //depot/projects/xen31/sys/conf/options.powerpc#2 integrate .. //depot/projects/xen31/sys/dev/amr/amr.c#4 integrate .. //depot/projects/xen31/sys/dev/amr/amr_cam.c#4 integrate .. //depot/projects/xen31/sys/dev/amr/amr_pci.c#3 integrate .. //depot/projects/xen31/sys/dev/amr/amrvar.h#2 integrate .. //depot/projects/xen31/sys/dev/ata/ata-all.h#3 integrate .. //depot/projects/xen31/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/xen31/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/xen31/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/common/cxgb_t3_cpl.h#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/cxgb_adapter.h#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/cxgb_config.h#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/cxgb_include.h#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/cxgb_l2t.c#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/cxgb_l2t.h#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/cxgb_main.c#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/cxgb_offload.c#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/cxgb_offload.h#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/cxgb_osdep.h#4 integrate .. //depot/projects/xen31/sys/dev/cxgb/cxgb_sge.c#3 integrate .. //depot/projects/xen31/sys/dev/cxgb/sys/cxgb_support.c#1 branch .. //depot/projects/xen31/sys/dev/cxgb/sys/mbufq.h#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/sys/mvec.h#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/sys/uipc_mvec.c#2 integrate .. //depot/projects/xen31/sys/dev/cxgb/t3cdev.h#1 branch .. //depot/projects/xen31/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#1 branch .. //depot/projects/xen31/sys/dev/cxgb/ulp/toecore/toedev.c#1 branch .. //depot/projects/xen31/sys/dev/cxgb/ulp/toecore/toedev.h#2 delete .. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#1 branch .. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#1 branch .. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_defs.h#1 branch .. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_listen.c#1 branch .. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#1 branch .. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_tcp.h#1 branch .. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_tcp_subr.c#1 branch .. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_tcp_usrreq.c#1 branch .. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#1 branch .. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_tom.c#1 branch .. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_tom.h#1 branch .. //depot/projects/xen31/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#1 branch .. //depot/projects/xen31/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/xen31/sys/dev/hptrr/array.h#1 branch .. //depot/projects/xen31/sys/dev/hptrr/him.h#1 branch .. //depot/projects/xen31/sys/dev/hptrr/himfuncs.h#1 branch .. //depot/projects/xen31/sys/dev/hptrr/hptintf.h#1 branch .. //depot/projects/xen31/sys/dev/hptrr/hptrr_config.c#1 branch .. //depot/projects/xen31/sys/dev/hptrr/hptrr_config.h#1 branch .. //depot/projects/xen31/sys/dev/hptrr/hptrr_os_bsd.c#1 branch .. //depot/projects/xen31/sys/dev/hptrr/hptrr_osm_bsd.c#1 branch .. //depot/projects/xen31/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/xen31/sys/dev/hptrr/ldm.h#1 branch .. //depot/projects/xen31/sys/dev/hptrr/list.h#1 branch .. //depot/projects/xen31/sys/dev/hptrr/os_bsd.h#1 branch .. //depot/projects/xen31/sys/dev/hptrr/osm.h#1 branch .. //depot/projects/xen31/sys/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/xen31/sys/dev/sound/pci/ich.c#2 integrate .. //depot/projects/xen31/sys/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/xen31/sys/dev/usb/umass.c#2 integrate .. //depot/projects/xen31/sys/dev/usb/uplcom.c#2 integrate .. //depot/projects/xen31/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/xen31/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/xen31/sys/geom/geom_dev.c#2 integrate .. //depot/projects/xen31/sys/geom/geom_io.c#3 integrate .. //depot/projects/xen31/sys/i386/conf/GENERIC#5 integrate .. //depot/projects/xen31/sys/i386/conf/NOTES#4 integrate .. //depot/projects/xen31/sys/i386/conf/PAE#4 integrate .. //depot/projects/xen31/sys/i386/i386/machdep.c#6 integrate .. //depot/projects/xen31/sys/kern/Makefile#2 integrate .. //depot/projects/xen31/sys/kern/kern_event.c#2 integrate .. //depot/projects/xen31/sys/kern/kern_mbuf.c#6 integrate .. //depot/projects/xen31/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/xen31/sys/kern/kern_resource.c#2 integrate .. //depot/projects/xen31/sys/kern/kern_rwlock.c#3 integrate .. //depot/projects/xen31/sys/kern/kern_sx.c#3 integrate .. //depot/projects/xen31/sys/kern/kern_thread.c#5 integrate .. //depot/projects/xen31/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/xen31/sys/kern/sched_4bsd.c#5 integrate .. //depot/projects/xen31/sys/kern/sched_ule.c#4 integrate .. //depot/projects/xen31/sys/kern/subr_lock.c#3 integrate .. //depot/projects/xen31/sys/kern/sys_generic.c#3 integrate .. //depot/projects/xen31/sys/kern/sys_pipe.c#4 integrate .. //depot/projects/xen31/sys/kern/uipc_sockbuf.c#2 integrate .. //depot/projects/xen31/sys/modules/Makefile#4 integrate .. //depot/projects/xen31/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/xen31/sys/modules/cxgb/cxgb/Makefile#1 branch .. //depot/projects/xen31/sys/modules/cxgb/toecore/Makefile#1 branch .. //depot/projects/xen31/sys/modules/cxgb/tom/Makefile#1 branch .. //depot/projects/xen31/sys/modules/hptrr/Makefile#1 branch .. //depot/projects/xen31/sys/net/if.h#3 integrate .. //depot/projects/xen31/sys/net/if_lagg.c#4 integrate .. //depot/projects/xen31/sys/net/route.c#4 integrate .. //depot/projects/xen31/sys/net/route.h#2 integrate .. //depot/projects/xen31/sys/net80211/ieee80211_radiotap.h#2 integrate .. //depot/projects/xen31/sys/netgraph/ng_l2tp.c#2 integrate .. //depot/projects/xen31/sys/netinet/if_ether.c#4 integrate .. //depot/projects/xen31/sys/netinet/if_ether.h#2 integrate .. //depot/projects/xen31/sys/netinet/tcp.h#2 integrate .. //depot/projects/xen31/sys/netinet/tcp_offload.c#1 branch .. //depot/projects/xen31/sys/netinet/tcp_offload.h#1 branch .. //depot/projects/xen31/sys/netinet/tcp_syncache.c#8 integrate .. //depot/projects/xen31/sys/netinet/tcp_syncache.h#2 integrate .. //depot/projects/xen31/sys/netinet/tcp_var.h#3 integrate .. //depot/projects/xen31/sys/netinet/toedev.h#1 branch .. //depot/projects/xen31/sys/netinet6/in6_pcb.c#3 integrate .. //depot/projects/xen31/sys/netncp/ncp_rq.c#2 integrate .. //depot/projects/xen31/sys/netncp/ncp_sock.c#2 integrate .. //depot/projects/xen31/sys/netncp/ncp_sock.h#2 integrate .. //depot/projects/xen31/sys/netsmb/smb_trantcp.c#2 integrate .. //depot/projects/xen31/sys/powerpc/aim/clock.c#1 branch .. //depot/projects/xen31/sys/powerpc/aim/copyinout.c#1 branch .. //depot/projects/xen31/sys/powerpc/aim/interrupt.c#1 branch .. //depot/projects/xen31/sys/powerpc/aim/locore.S#1 branch .. //depot/projects/xen31/sys/powerpc/aim/machdep.c#1 branch .. //depot/projects/xen31/sys/powerpc/aim/mmu_oea.c#1 branch .. //depot/projects/xen31/sys/powerpc/aim/nexus.c#1 branch .. //depot/projects/xen31/sys/powerpc/aim/ofw_machdep.c#1 branch .. //depot/projects/xen31/sys/powerpc/aim/ofwmagic.S#1 branch .. //depot/projects/xen31/sys/powerpc/aim/swtch.S#1 branch .. //depot/projects/xen31/sys/powerpc/aim/trap.c#1 branch .. //depot/projects/xen31/sys/powerpc/aim/trap_subr.S#1 branch .. //depot/projects/xen31/sys/powerpc/aim/uio_machdep.c#1 branch .. //depot/projects/xen31/sys/powerpc/aim/uma_machdep.c#1 branch .. //depot/projects/xen31/sys/powerpc/aim/vm_machdep.c#1 branch .. //depot/projects/xen31/sys/powerpc/conf/GENERIC#4 integrate .. //depot/projects/xen31/sys/powerpc/conf/NOTES#2 integrate .. //depot/projects/xen31/sys/powerpc/include/fpu.h#2 integrate .. //depot/projects/xen31/sys/powerpc/powerpc/clock.c#3 delete .. //depot/projects/xen31/sys/powerpc/powerpc/copyinout.c#2 delete .. //depot/projects/xen31/sys/powerpc/powerpc/db_memrw.c#2 delete .. //depot/projects/xen31/sys/powerpc/powerpc/interrupt.c#2 delete .. //depot/projects/xen31/sys/powerpc/powerpc/locore.S#2 delete .. //depot/projects/xen31/sys/powerpc/powerpc/machdep.c#4 delete .. //depot/projects/xen31/sys/powerpc/powerpc/mmu_oea.c#3 delete .. //depot/projects/xen31/sys/powerpc/powerpc/nexus.c#2 delete .. //depot/projects/xen31/sys/powerpc/powerpc/ofw_machdep.c#2 delete .. //depot/projects/xen31/sys/powerpc/powerpc/ofwmagic.S#2 delete .. //depot/projects/xen31/sys/powerpc/powerpc/swtch.S#3 delete .. //depot/projects/xen31/sys/powerpc/powerpc/trap.c#3 delete .. //depot/projects/xen31/sys/powerpc/powerpc/trap_subr.S#2 delete .. //depot/projects/xen31/sys/powerpc/powerpc/uio_machdep.c#2 delete .. //depot/projects/xen31/sys/powerpc/powerpc/uma_machdep.c#2 delete .. //depot/projects/xen31/sys/powerpc/powerpc/vm_machdep.c#4 delete .. //depot/projects/xen31/sys/security/mac/mac_posix_sem.c#3 integrate .. //depot/projects/xen31/sys/sys/_lock.h#2 integrate .. //depot/projects/xen31/sys/sys/ata.h#2 integrate .. //depot/projects/xen31/sys/sys/kerneldump.h#2 integrate .. //depot/projects/xen31/sys/sys/lock_profile.h#2 integrate .. //depot/projects/xen31/sys/sys/pcpu.h#4 integrate .. //depot/projects/xen31/sys/sys/proc.h#6 integrate .. //depot/projects/xen31/sys/sys/selinfo.h#2 integrate .. //depot/projects/xen31/sys/sys/socket.h#2 integrate .. //depot/projects/xen31/sys/sys/socketvar.h#2 integrate .. //depot/projects/xen31/sys/sys/sx.h#2 integrate .. //depot/projects/xen31/sys/sys/systm.h#3 integrate .. //depot/projects/xen31/sys/sys/tty.h#2 integrate .. //depot/projects/xen31/sys/vm/vm_page.c#6 integrate .. //depot/projects/xen31/tools/build/options/WITHOUT_BZIP2#2 integrate .. //depot/projects/xen31/tools/build/options/WITHOUT_GNU#2 integrate .. //depot/projects/xen31/tools/build/options/WITHOUT_GSSAPI#1 branch .. //depot/projects/xen31/tools/build/options/WITHOUT_KERBEROS#3 integrate .. //depot/projects/xen31/tools/build/options/WITHOUT_KVM#2 integrate .. //depot/projects/xen31/tools/build/options/WITHOUT_PAM#2 integrate .. //depot/projects/xen31/tools/build/options/WITHOUT_TOOLCHAIN#2 integrate .. //depot/projects/xen31/tools/build/options/WITH_GSSAPI#2 delete .. //depot/projects/xen31/tools/build/options/makeman#3 integrate .. //depot/projects/xen31/tools/regression/bin/mv/Makefile#1 branch .. //depot/projects/xen31/tools/regression/bin/mv/regress.sh#1 branch .. //depot/projects/xen31/tools/regression/bin/mv/regress.t#1 branch .. //depot/projects/xen31/tools/regression/lib/libc/gen/test-wordexp.c#2 integrate .. //depot/projects/xen31/tools/regression/lib/msun/Makefile#2 integrate .. //depot/projects/xen31/tools/regression/lib/msun/test-csqrt.c#1 branch .. //depot/projects/xen31/tools/regression/lib/msun/test-csqrt.t#1 branch .. //depot/projects/xen31/tools/regression/lib/msun/test-nan.c#1 branch .. //depot/projects/xen31/tools/regression/lib/msun/test-nan.t#1 branch .. //depot/projects/xen31/tools/regression/lib/msun/test-next.c#3 integrate .. //depot/projects/xen31/tools/regression/usr.bin/sed/multitest.t#2 integrate .. //depot/projects/xen31/tools/regression/usr.bin/sed/regress.sh#2 integrate .. //depot/projects/xen31/tools/tools/ath/athdebug/athdebug.c#3 integrate .. //depot/projects/xen31/tools/tools/ath/athstats/Makefile#2 integrate .. //depot/projects/xen31/tools/tools/ath/athstats/athstats.c#3 integrate .. //depot/projects/xen31/tools/tools/ath/athstats/main.c#3 integrate .. //depot/projects/xen31/tools/tools/ath/athstats/statfoo.c#3 integrate .. //depot/projects/xen31/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.common#2 integrate .. //depot/projects/xen31/usr.bin/procstat/procstat_args.c#2 integrate .. //depot/projects/xen31/usr.bin/procstat/procstat_bin.c#2 integrate .. //depot/projects/xen31/usr.bin/procstat/procstat_cred.c#2 integrate .. //depot/projects/xen31/usr.bin/procstat/procstat_files.c#2 integrate .. //depot/projects/xen31/usr.bin/vmstat/Makefile#2 integrate .. //depot/projects/xen31/usr.bin/vmstat/vmstat.8#2 integrate .. //depot/projects/xen31/usr.bin/vmstat/vmstat.c#2 integrate .. //depot/projects/xen31/usr.bin/xinstall/xinstall.c#2 integrate .. //depot/projects/xen31/usr.sbin/iostat/iostat.c#2 integrate .. //depot/projects/xen31/usr.sbin/syslogd/syslogd.c#3 integrate Differences ... ==== //depot/projects/xen31/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.342 2007/10/18 08:41:52 delphij Exp $ +# $FreeBSD: src/Makefile,v 1.344 2007/12/13 00:08:02 imp Exp $ # # The user-driven targets are: # @@ -234,17 +234,18 @@ PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \ PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \ then \ - (cd ${.CURDIR} && make make); \ + (cd ${.CURDIR} && ${MAKE} make); \ fi # # Upgrade make(1) to the current version using the installed -# headers, libraries and tools. +# headers, libraries and tools. Also, allow the location of +# the system bsdmake-like utility to be overridden. # MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \ DESTDIR= \ INSTALL="sh ${.CURDIR}/tools/install.sh" -MMAKE= ${MMAKEENV} make \ +MMAKE= ${MMAKEENV} ${MAKE} \ -D_UPGRADING \ -DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WERROR ==== //depot/projects/xen31/bin/mv/mv.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.46 2005/09/05 04:36:08 csjp Exp $"); +__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.49 2007/12/17 09:02:42 dds Exp $"); #include <sys/types.h> #include <sys/acl.h> @@ -355,8 +355,34 @@ int copy(char *from, char *to) { + struct stat sb; + enum clean {CLEAN_SOURCE, CLEAN_DEST, CLEAN_ODEST, CLEAN_MAX}; + char *cleanup[CLEAN_MAX]; int pid, status; + volatile int i, rval; + + rval = 0; + for (i = 0; i < CLEAN_MAX; i++) + cleanup[i] = NULL; + /* + * If "to" exists and is a directory, get it out of the way. + * When the copy succeeds, delete it. + */ + if (stat(to, &sb) == 0 && S_ISDIR(sb.st_mode)) { + if (asprintf(&cleanup[CLEAN_ODEST], "%s.XXXXXX", to) == -1) { + warnx("asprintf failed"); + return (1); + } + if (rename(to, cleanup[CLEAN_ODEST]) < 0) { + warn("rename of existing target from %s to %s failed", + to, cleanup[CLEAN_ODEST]); + free(cleanup[CLEAN_ODEST]); + return (1); + } + } + /* Copy source to destination. */ + cleanup[CLEAN_DEST] = to; if ((pid = fork()) == 0) { execl(_PATH_CP, "mv", vflg ? "-PRpv" : "-PRp", "--", from, to, (char *)NULL); @@ -365,36 +391,77 @@ } if (waitpid(pid, &status, 0) == -1) { warn("%s: waitpid", _PATH_CP); - return (1); + rval = 1; + goto done; } if (!WIFEXITED(status)) { warnx("%s: did not terminate normally", _PATH_CP); - return (1); + rval = 1; + goto done; } if (WEXITSTATUS(status)) { warnx("%s: terminated with %d (non-zero) status", _PATH_CP, WEXITSTATUS(status)); - return (1); + rval = 1; + goto done; } - if (!(pid = vfork())) { - execl(_PATH_RM, "mv", "-rf", "--", from, (char *)NULL); - warn("%s", _PATH_RM); - _exit(1); + /* + * The copy succeeded. From now on the destination is where users + * will find their files. + */ + cleanup[CLEAN_DEST] = NULL; + cleanup[CLEAN_SOURCE] = from; +done: + /* Clean what needs to be cleaned. */ + for (i = 0; i < CLEAN_MAX; i++) { + if (cleanup[i] == NULL) + continue; + if (!(pid = vfork())) { + execl(_PATH_RM, "mv", "-rf", "--", cleanup[i], + (char *)NULL); + _exit(EX_OSERR); + } + if (waitpid(pid, &status, 0) == -1) { + warn("%s %s: waitpid", _PATH_RM, cleanup[i]); + rval = 1; + continue; + } + if (!WIFEXITED(status)) { + warnx("%s %s: did not terminate normally", + _PATH_RM, cleanup[i]); + rval = 1; + continue; + } + switch (WEXITSTATUS(status)) { + case 0: + break; + case EX_OSERR: + warnx("Failed to exec %s %s", _PATH_RM, cleanup[i]); + rval = 1; + continue; + default: + warnx("%s %s: terminated with %d (non-zero) status", + _PATH_RM, cleanup[i], WEXITSTATUS(status)); + rval = 1; + continue; + } + /* + * If the copy failed, and we just deleted the copy's trash, + * try to salvage the original destination, + */ + if (i == CLEAN_DEST && cleanup[CLEAN_ODEST]) { + if (rename(cleanup[CLEAN_ODEST], to) < 0) { + warn("rename back renamed existing target from %s to %s failed", + cleanup[CLEAN_ODEST], to); + rval = 1; + } + free(cleanup[CLEAN_ODEST]); + cleanup[CLEAN_ODEST] = NULL; + } } - if (waitpid(pid, &status, 0) == -1) { - warn("%s: waitpid", _PATH_RM); - return (1); - } - if (!WIFEXITED(status)) { - warnx("%s: did not terminate normally", _PATH_RM); - return (1); - } - if (WEXITSTATUS(status)) { - warnx("%s: terminated with %d (non-zero) status", - _PATH_RM, WEXITSTATUS(status)); - return (1); - } - return (0); + if (cleanup[CLEAN_ODEST]) + free(cleanup[CLEAN_ODEST]); + return (rval); } void ==== //depot/projects/xen31/contrib/amd/FREEBSD-Xlist#2 (text+ko) ==== @@ -1,7 +1,8 @@ -$FreeBSD: src/contrib/amd/FREEBSD-Xlist,v 1.5 2004/07/06 12:52:27 mbr Exp $ +$FreeBSD: src/contrib/amd/FREEBSD-Xlist,v 1.6 2007/12/11 19:15:17 obrien Exp $ *LSM.am-utils *Makefile.* *README.autofs +*README.osx *ac*.m4 *.old *acconfig.h @@ -15,6 +16,7 @@ *missing *mkinstalldirs *stamp-h.in +*amd/test1.sh *amd/Makefile.* *amq/Makefile.* *commit @@ -38,10 +40,13 @@ *conf/fh_dref/fh_dref_sunos3.h *conf/fh_dref/fh_dref_sunos4.h *conf/fh_dref/fh_dref_svr4.h +*conf/hn_dref/hn_dref_default.h, *conf/hn_dref/hn_dref_isc3.h *conf/hn_dref/hn_dref_linux.h *conf/mount/mount_aix.c +*conf/mount/mount_aix3.c *conf/mount/mount_bsdi3.c +*conf/mount/mount_default.c *conf/mount/mount_freebsd3.c *conf/mount/mount_hpux.c *conf/mount/mount_irix5.c @@ -54,6 +59,7 @@ *conf/mtab/mtab_aix.c *conf/mtab/mtab_file.c *conf/mtab/mtab_isc3.c +*conf/mtab/mtab_linux.c *conf/mtab/mtab_mach3.c *conf/mtab/mtab_osf.c *conf/mtab/mtab_svr4.c @@ -63,6 +69,7 @@ *conf/nfs_prot/nfs_prot_aix4_2.h *conf/nfs_prot/nfs_prot_aix4_3.h *conf/nfs_prot/nfs_prot_aix5_1.h +*conf/nfs_prot/nfs_prot_aix5_2.h *conf/nfs_prot/nfs_prot_bsdi2.h *conf/nfs_prot/nfs_prot_bsdi3.h *conf/nfs_prot/nfs_prot_darwin.h @@ -92,6 +99,12 @@ *conf/nfs_prot/nfs_prot_sunos5_8.h *conf/nfs_prot/nfs_prot_svr4.h *conf/nfs_prot/nfs_prot_ultrix.h +*conf/autofs/autofs_linux.h +*conf/autofs/autofs_linux.c +*conf/autofs/autofs_solaris_v1.h +*conf/autofs/autofs_solaris_v1.c +*conf/autofs/autofs_solaris_v2_v3.h +*conf/autofs/autofs_solaris_v2_v3.c *conf/sa_dref/sa_dref_386bsd.h *conf/sa_dref/sa_dref_aix3.h *conf/sa_dref/sa_dref_aoi.h @@ -103,6 +116,7 @@ *conf/trap/trap_aix3.h *conf/trap/trap_aux.h *conf/trap/trap_dgux.h +*conf/trap/trap_freebsd3.h *conf/trap/trap_hcx.h *conf/trap/trap_hpux.h *conf/trap/trap_hpux11.h @@ -115,7 +129,9 @@ *conf/trap/trap_stellix.h *conf/trap/trap_svr4.h *conf/trap/trap_ultrix.h +*conf/umount/umount_aix.c *conf/umount/umount_default.c +*conf/umount/umount_linux.c *conf/umount/umount_osf.c *doc/Makefile.am *doc/Makefile.in @@ -135,11 +151,118 @@ *fsinfo/Makefile.* *hlfsd/Makefile.* *libamu/Makefile.* +*libamu/alloca.c *libamu/clnt_sperrno.c *libamu/memcmp.c *libamu/strcasecmp.c *libamu/strdup.c *libamu/strstr.c +*libamu/strlcat.c +*libamu/strlcpy.c *libamu/ualarm.c *mk-amd-map/Makefile.* *wire-test/Makefile.* +*m4/GNUmakefile +*m4/amdgrep* +*m4/amindent* +*m4/autopat* +*m4/chop-aclocal.pl* +*m4/copy-if-newbig* +*m4/mk-aclocal* +*m4/mkconf* +*m4/rmtspc* +*m4/update_build_version* +*m4/macros/HEADER +*m4/macros/TRAILER +*m4/macros/c_void_p.m4 +*m4/macros/cache_check_dynamic.m4 +*m4/macros/check_amu_fs.m4 +*m4/macros/check_checkmount_style.m4 +*m4/macros/check_extern.m4 +*m4/macros/check_fhandle.m4 +*m4/macros/check_field.m4 +*m4/macros/check_fs_headers.m4 +*m4/macros/check_fs_mntent.m4 +*m4/macros/check_gnu_getopt.m4 +*m4/macros/check_hide_mount_type.m4 +*m4/macros/check_lib2.m4 +*m4/macros/check_map_funcs.m4 +*m4/macros/check_mnt2_cdfs_opt.m4 +*m4/macros/check_mnt2_gen_opt.m4 +*m4/macros/check_mnt2_nfs_opt.m4 +*m4/macros/check_mnttab_file_name.m4 +*m4/macros/check_mnttab_location.m4 +*m4/macros/check_mnttab_opt.m4 +*m4/macros/check_mnttab_style.m4 +*m4/macros/check_mnttab_type.m4 +*m4/macros/check_mount_style.m4 +*m4/macros/check_mount_trap.m4 +*m4/macros/check_mount_type.m4 +*m4/macros/check_mtype_printf_type.m4 +*m4/macros/check_mtype_type.m4 +*m4/macros/check_network_transport_type.m4 +*m4/macros/check_nfs_fh_dref.m4 +*m4/macros/check_nfs_hn_dref.m4 +*m4/macros/check_nfs_prot_headers.m4 +*m4/macros/check_nfs_sa_dref.m4 +*m4/macros/check_nfs_socket_connection.m4 +*m4/macros/check_os_libs.m4 +*m4/macros/check_restartable_signal_handler.m4 +*m4/macros/check_umount_style.m4 +*m4/macros/check_unmount_args.m4 +*m4/macros/check_unmount_call.m4 +*m4/macros/expand_cpp_hex.m4 +*m4/macros/expand_cpp_int.m4 +*m4/macros/expand_cpp_string.m4 +*m4/macros/expand_run_string.m4 +*m4/macros/extern_optarg.m4 +*m4/macros/extern_sys_errlist.m4 +*m4/macros/field_mntent_t_mnt_time_string.m4 +*m4/macros/func_bad_memcmp.m4 +*m4/macros/func_bad_yp_all.m4 +*m4/macros/header_templates.m4 +*m4/macros/host_macros.m4 +*m4/macros/linux_headers.m4 +*m4/macros/localconfig.m4 +*m4/macros/mount_headers.m4 +*m4/macros/name_package.m4 +*m4/macros/name_version.m4 +*m4/macros/opt_amu_cflags.m4 +*m4/macros/opt_cppflags.m4 +*m4/macros/opt_debug.m4 +*m4/macros/opt_ldflags.m4 +*m4/macros/opt_libs.m4 +*m4/macros/os_cflags.m4 +*m4/macros/os_cppflags.m4 +*m4/macros/os_ldflags.m4 +*m4/macros/package_bugreport.m4 +*m4/macros/package_name.m4 +*m4/macros/package_version.m4 +*m4/macros/save_state.m4 +*m4/macros/struct_field_nfs_fh.m4 +*m4/macros/struct_mntent.m4 +*m4/macros/struct_mnttab.m4 +*m4/macros/struct_nfs_args.m4 +*m4/macros/struct_nfs_fh.m4 +*m4/macros/struct_nfs_fh3.m4 +*m4/macros/struct_nfs_gfs_mount.m4 +*m4/macros/try_compile_anyfs.m4 +*m4/macros/try_compile_nfs.m4 +*m4/macros/try_compile_rpc.m4 +*m4/macros/type_auth_create_gidlist.m4 +*m4/macros/type_cachefs_args.m4 +*m4/macros/type_cdfs_args.m4 +*m4/macros/type_efs_args.m4 +*m4/macros/type_lofs_args.m4 +*m4/macros/type_mfs_args.m4 +*m4/macros/type_pcfs_args.m4 +*m4/macros/type_recvfrom_fromlen.m4 +*m4/macros/type_rfs_args.m4 +*m4/macros/type_svc_in_arg.m4 +*m4/macros/type_time_t.m4 +*m4/macros/type_tmpfs_args.m4 +*m4/macros/type_ufs_args.m4 +*m4/macros/type_xdrproc_t.m4 +*m4/macros/type_xfs_args.m4 +*m4/macros/type_yp_order_outorder.m4 +*m4/macros/with_addon.m4 ==== //depot/projects/xen31/contrib/amd/FREEBSD-upgrade#2 (text+ko) ==== @@ -1,21 +1,19 @@ # ex:ts=8 -$FreeBSD: src/contrib/amd/FREEBSD-upgrade,v 1.15 2004/05/14 13:29:48 mbr Exp $ +$FreeBSD: src/contrib/amd/FREEBSD-upgrade,v 1.16 2007/12/11 19:16:51 obrien Exp $ -AMD (am-utils) 6.0.9 - originals can be found at: ftp://shekel.mcl.cs.columbia.edu/pub/am-utils/ - (http://www.cs.columbia.edu/~ezk/am-utils/index.html) - +AMD (am-utils) 6.1.5 + originals can be found at: ftp://ftp.am-utils.org/pub/am-utils/ For the import of AMD many files were pruned by: - tar -X FREEBSD-Xlist -xzf am-utils-6.0.9.tar.gz + tar -X FREEBSD-Xlist -xf am-utils-6.1.5.tar.gz and `find . -name '.cvsignore' -delete` Then imported by: - cvs import -m 'Virgin import of AMD (am-utils) v6.0.9' \ - src/contrib/amd COLUMBIA amd_6_0_9 + cvs import -m 'Virgin import of AMD (am-utils) v6.1.5' \ + src/contrib/amd COLUMBIA amd_6_1_5 After the import, a separate extraction of am-utils was GNU configured in the "normal" way. The resulting config.h file should be compared with @@ -25,8 +23,11 @@ To make local changes to amd, simply patch and commit to the main branch (aka HEAD). Never make local changes on the vendor (COLUMBIA) branch. -All local changes should be submitted to "amd-dev@majordomo.cs.columbia.edu" -for inclusion in the next vendor release. +Note, we don't trim anything in scripts/ as sysadmins may find the bits +as a useful reference. + +All local changes should be submitted to "am-utils@am-utils.org" or +https://bugzilla.am-utils.org for inclusion in the next vendor release. Local changes: ==== //depot/projects/xen31/contrib/gcc/fold-const.c#2 (text+ko) ==== @@ -5661,6 +5661,9 @@ } break; } + /* If the constant is negative, we cannot simplify this. */ + if (tree_int_cst_sgn (c) == -1) + break; /* FALLTHROUGH */ case NEGATE_EXPR: if ((t1 = extract_muldiv (op0, c, code, wide_type, strict_overflow_p)) ==== //depot/projects/xen31/contrib/gdtoa/gdtoaimp.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ ****************************************************************/ -/* $FreeBSD: src/contrib/gdtoa/gdtoaimp.h,v 1.8 2007/01/03 04:59:33 das Exp $ */ +/* $FreeBSD: src/contrib/gdtoa/gdtoaimp.h,v 1.9 2007/12/17 00:19:49 das Exp $ */ /* This is a variation on dtoa.c that converts arbitary binary floating-point formats to and from decimal notation. It uses @@ -169,6 +169,9 @@ #ifndef GDTOAIMP_H_INCLUDED #define GDTOAIMP_H_INCLUDED + +#define Long int + #include "gdtoa.h" #include "gd_qnan.h" ==== //depot/projects/xen31/contrib/gdtoa/hexnan.c#2 (text+ko) ==== @@ -29,6 +29,8 @@ /* Please send bug reports to David M. Gay (dmg at acm dot org, * with " at " changed at "@" and " dot " changed to "."). */ +/* $FreeBSD: src/contrib/gdtoa/hexnan.c,v 1.2 2007/12/16 21:13:54 das Exp $ */ + #include "gdtoaimp.h" static void @@ -71,8 +73,14 @@ x1 = xe = x; havedig = hd0 = i = 0; s = *sp; + + /* FreeBSD local: Accept (but ignore) the '0x' prefix. */ + if (s[1] == '0' && (s[2] == 'x' || s[2] == 'X')) + s += 2; + while(c = *(CONST unsigned char*)++s) { if (!(h = hexdig[c])) { +#if 0 if (c <= ' ') { if (hd0 < havedig) { if (x < x1 && i < 8) @@ -92,7 +100,8 @@ *sp = s + 1; break; } - return STRTOG_NaN; +#endif + break; } havedig++; if (++i > 8) { @@ -103,9 +112,7 @@ } *x = (*x << 4) | h & 0xf; } - if (!havedig) - return STRTOG_NaN; - if (x < x1 && i < 8) + if (havedig && x < x1 && i < 8) L_shift(x, x1, i); if (x > x0) { x1 = x0; @@ -119,6 +126,7 @@ if ( (i = nbits & (ULbits-1)) !=0) *xe &= ((ULong)0xffffffff) >> (ULbits - i); } + if (havedig) { for(x1 = xe;; --x1) { if (*x1 != 0) break; @@ -127,5 +135,22 @@ break; } } + } + + /* + * FreeBSD local: Accept all the sequences allowed by C99 and update + * the tail pointer correctly. Don't accept any invalid sequences. + */ + if (c == '\0') /* nan() calls this, too; tolerate a missing ')' */ + return STRTOG_NaNbits; + if (c != ')') { + while(c = *(CONST unsigned char*)++s) { + if (c == ')') + break; + if (!isalnum(c) && c != '_') + return STRTOG_NaNbits; + } + } + *sp = s + 1; return STRTOG_NaNbits; } ==== //depot/projects/xen31/contrib/gdtoa/strtod.c#2 (text+ko) ==== @@ -29,6 +29,8 @@ /* Please send bug reports to David M. Gay (dmg at acm dot org, * with " at " changed at "@" and " dot " changed to "."). */ +/* $FreeBSD: src/contrib/gdtoa/strtod.c,v 1.2 2007/12/16 21:14:33 das Exp $ */ + #include "gdtoaimp.h" #ifndef NO_FENV_H #include <fenv.h> @@ -258,7 +260,7 @@ if (*s == '(' /*)*/ && hexnan(&s, &fpinan, bits) == STRTOG_NaNbits) { - word0(rv) = 0x7ff00000 | bits[1]; + word0(rv) = 0x7ff80000 | bits[1]; word1(rv) = bits[0]; } else { ==== //depot/projects/xen31/contrib/gdtoa/strtof.c#2 (text+ko) ==== @@ -29,6 +29,8 @@ /* Please send bug reports to David M. Gay (dmg at acm dot org, * with " at " changed at "@" and " dot " changed to "."). */ +/* $FreeBSD: src/contrib/gdtoa/strtof.c,v 1.2 2007/12/16 21:14:33 das Exp $ */ + #include "gdtoaimp.h" float @@ -52,10 +54,14 @@ break; case STRTOG_Normal: - case STRTOG_NaNbits: u.L[0] = bits[0] & 0x7fffff | exp + 0x7f + 23 << 23; break; + case STRTOG_NaNbits: + /* FreeBSD local: always return a quiet NaN */ + u.L[0] = bits[0] | 0x7fc00000; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200712172301.lBHN1XVC034144>