Date: Wed, 11 Mar 2015 11:17:10 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r279883 - in projects/ifnet: . cddl/contrib/dtracetoolkit/Proc cddl/contrib/opensolaris/common/ctf cddl/contrib/opensolaris/tools/ctf/cvt contrib/libc++/include contrib/tzdata lib/libc/... Message-ID: <201503111117.t2BBHAM3042918@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Wed Mar 11 11:17:09 2015 New Revision: 279883 URL: https://svnweb.freebsd.org/changeset/base/279883 Log: Merge head r257698 through r279882. Added: projects/ifnet/lib/libpmc/pmc.haswellxeon.3 - copied unchanged from r279882, head/lib/libpmc/pmc.haswellxeon.3 projects/ifnet/lib/libstand/powerpc/syncicache.c - copied unchanged from r279882, head/lib/libstand/powerpc/syncicache.c projects/ifnet/share/dtrace/tcpconn - copied unchanged from r279882, head/share/dtrace/tcpconn projects/ifnet/share/dtrace/tcpstate - copied unchanged from r279882, head/share/dtrace/tcpstate projects/ifnet/share/dtrace/tcptrack - copied unchanged from r279882, head/share/dtrace/tcptrack projects/ifnet/share/dtrace/udptrack - copied unchanged from r279882, head/share/dtrace/udptrack projects/ifnet/sys/arm/broadcom/bcm2835/bcm283x_dwc_fdt.c - copied unchanged from r279882, head/sys/arm/broadcom/bcm2835/bcm283x_dwc_fdt.c projects/ifnet/sys/boot/powerpc/ofw/ofwfdt.c - copied unchanged from r279882, head/sys/boot/powerpc/ofw/ofwfdt.c projects/ifnet/sys/dev/uart/uart_cpu_fdt.h - copied unchanged from r279882, head/sys/dev/uart/uart_cpu_fdt.h projects/ifnet/sys/dev/usb/controller/dwc_otg_fdt.h - copied unchanged from r279882, head/sys/dev/usb/controller/dwc_otg_fdt.h projects/ifnet/sys/modules/dtb/am335x/ - copied from r279882, head/sys/modules/dtb/am335x/ projects/ifnet/sys/sys/gzio.h - copied unchanged from r279882, head/sys/sys/gzio.h projects/ifnet/usr.bin/procstat/procstat_cs.c - copied unchanged from r279882, head/usr.bin/procstat/procstat_cs.c Modified: projects/ifnet/UPDATING projects/ifnet/cddl/contrib/dtracetoolkit/Proc/pidpersec.d projects/ifnet/cddl/contrib/opensolaris/common/ctf/ctf_create.c projects/ifnet/cddl/contrib/opensolaris/tools/ctf/cvt/output.c projects/ifnet/contrib/libc++/include/__bit_reference projects/ifnet/contrib/libc++/include/__tree projects/ifnet/contrib/libc++/include/algorithm projects/ifnet/contrib/tzdata/antarctica projects/ifnet/contrib/tzdata/asia projects/ifnet/contrib/tzdata/backward projects/ifnet/contrib/tzdata/europe projects/ifnet/contrib/tzdata/leap-seconds.list projects/ifnet/contrib/tzdata/northamerica projects/ifnet/contrib/tzdata/southamerica projects/ifnet/contrib/tzdata/zone.tab projects/ifnet/contrib/tzdata/zone1970.tab projects/ifnet/lib/libc/gen/getpwent.c projects/ifnet/lib/libc/net/sctp_sys_calls.c projects/ifnet/lib/libc/powerpc/gen/_setjmp.S projects/ifnet/lib/libc/powerpc/gen/setjmp.S projects/ifnet/lib/libc/powerpc/gen/sigsetjmp.S projects/ifnet/lib/libc/powerpc64/gen/_setjmp.S projects/ifnet/lib/libc/powerpc64/gen/setjmp.S projects/ifnet/lib/libc/powerpc64/gen/sigsetjmp.S projects/ifnet/lib/libc/sys/cap_ioctls_limit.2 projects/ifnet/lib/libgpio/gpio.3 projects/ifnet/lib/libgpio/gpio.c projects/ifnet/lib/libgpio/libgpio.h projects/ifnet/lib/libnv/tests/dnv_tests.cc projects/ifnet/lib/libnv/tests/nv_tests.cc projects/ifnet/lib/libpmc/libpmc.c projects/ifnet/lib/libpmc/pmc.3 projects/ifnet/lib/libpmc/pmc.haswell.3 projects/ifnet/lib/libpmc/pmc.ivybridge.3 projects/ifnet/lib/libpmc/pmc.ivybridgexeon.3 projects/ifnet/lib/libpmc/pmc.sandybridge.3 projects/ifnet/lib/libpmc/pmc.sandybridgexeon.3 projects/ifnet/lib/libstand/Makefile projects/ifnet/lib/libstand/powerpc/_setjmp.S projects/ifnet/lib/libthr/thread/thr_private.h projects/ifnet/lib/msun/man/j0.3 projects/ifnet/lib/msun/src/e_j0.c projects/ifnet/lib/msun/src/e_j0f.c projects/ifnet/lib/msun/src/e_j1.c projects/ifnet/lib/msun/src/e_j1f.c projects/ifnet/lib/msun/src/e_jn.c projects/ifnet/lib/msun/src/e_jnf.c projects/ifnet/sbin/ifconfig/af_inet6.c projects/ifnet/sbin/ifconfig/af_nd6.c projects/ifnet/sbin/ifconfig/ifconfig.8 projects/ifnet/share/dtrace/Makefile projects/ifnet/share/man/man4/Makefile projects/ifnet/share/man/man4/ds3231.4 projects/ifnet/share/man/man5/core.5 projects/ifnet/share/man/man9/SDT.9 projects/ifnet/share/man/man9/VOP_VPTOCNP.9 projects/ifnet/share/misc/committers-src.dot projects/ifnet/sys/amd64/amd64/mp_machdep.c projects/ifnet/sys/amd64/vmm/io/vatpic.c projects/ifnet/sys/arm/arm/cpufunc_asm_armv7.S projects/ifnet/sys/arm/arm/cpuinfo.c projects/ifnet/sys/arm/arm/genassym.c projects/ifnet/sys/arm/arm/physmem.c projects/ifnet/sys/arm/at91/uart_bus_at91usart.c projects/ifnet/sys/arm/at91/uart_cpu_at91usart.c projects/ifnet/sys/arm/at91/uart_dev_at91usart.c projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_fb.c projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_fbd.c projects/ifnet/sys/arm/broadcom/bcm2835/files.bcm2835 projects/ifnet/sys/arm/conf/ARMADAXP projects/ifnet/sys/arm/conf/BEAGLEBONE projects/ifnet/sys/arm/conf/CUBIEBOARD projects/ifnet/sys/arm/conf/CUBIEBOARD2 projects/ifnet/sys/arm/conf/DB-78XXX projects/ifnet/sys/arm/conf/DB-88F5XXX projects/ifnet/sys/arm/conf/DB-88F6XXX projects/ifnet/sys/arm/conf/DOCKSTAR projects/ifnet/sys/arm/conf/DREAMPLUG-1001 projects/ifnet/sys/arm/conf/EXYNOS5.common projects/ifnet/sys/arm/conf/PANDABOARD projects/ifnet/sys/arm/conf/SHEEVAPLUG projects/ifnet/sys/arm/conf/TS7800 projects/ifnet/sys/arm/conf/VYBRID projects/ifnet/sys/arm/conf/ZEDBOARD projects/ifnet/sys/arm/freescale/vybrid/vf_uart.c projects/ifnet/sys/arm/include/cpu-v6.h projects/ifnet/sys/arm/include/cpuinfo.h projects/ifnet/sys/arm/samsung/exynos/exynos_uart.c projects/ifnet/sys/arm/samsung/s3c2xx0/uart_bus_s3c2410.c projects/ifnet/sys/arm/samsung/s3c2xx0/uart_cpu_s3c2410.c projects/ifnet/sys/arm/ti/aintc.c projects/ifnet/sys/arm/ti/am335x/am335x_dmtimer.c projects/ifnet/sys/arm/ti/omap4/omap4_prcm_clks.c projects/ifnet/sys/arm/xilinx/uart_dev_cdnc.c projects/ifnet/sys/arm/xilinx/zy7_devcfg.c projects/ifnet/sys/arm/xilinx/zy7_slcr.c projects/ifnet/sys/arm/xilinx/zy7_slcr.h projects/ifnet/sys/boot/amd64/boot1.efi/boot1.c projects/ifnet/sys/boot/libstand32/Makefile projects/ifnet/sys/boot/ofw/common/main.c projects/ifnet/sys/boot/ofw/libofw/elf_freebsd.c projects/ifnet/sys/boot/ofw/libofw/openfirm.c projects/ifnet/sys/boot/ofw/libofw/openfirm.h projects/ifnet/sys/boot/ofw/libofw/ppc64_elf_freebsd.c projects/ifnet/sys/boot/powerpc/ofw/Makefile projects/ifnet/sys/boot/powerpc/ofw/metadata.c projects/ifnet/sys/boot/sparc64/loader/metadata.c projects/ifnet/sys/cam/scsi/scsi_da.c projects/ifnet/sys/cddl/dev/dtrace/arm/dtrace_subr.c projects/ifnet/sys/conf/Makefile.powerpc projects/ifnet/sys/conf/NOTES projects/ifnet/sys/conf/options projects/ifnet/sys/dev/acpica/acpi.c projects/ifnet/sys/dev/bge/if_bge.c projects/ifnet/sys/dev/cadence/if_cgem.c projects/ifnet/sys/dev/cxgbe/t4_netmap.c projects/ifnet/sys/dev/etherswitch/arswitch/arswitch.c projects/ifnet/sys/dev/etherswitch/arswitch/arswitch_8327.c projects/ifnet/sys/dev/etherswitch/arswitch/arswitch_phy.c projects/ifnet/sys/dev/etherswitch/arswitch/arswitch_phy.h projects/ifnet/sys/dev/etherswitch/arswitch/arswitch_reg.c projects/ifnet/sys/dev/etherswitch/arswitch/arswitch_vlans.c projects/ifnet/sys/dev/etherswitch/arswitch/arswitch_vlans.h projects/ifnet/sys/dev/etherswitch/arswitch/arswitchreg.h projects/ifnet/sys/dev/etherswitch/arswitch/arswitchvar.h projects/ifnet/sys/dev/fb/fbd.c projects/ifnet/sys/dev/gpio/gpiobus.c projects/ifnet/sys/dev/gpio/gpiobus_if.m projects/ifnet/sys/dev/gpio/gpiobusvar.h projects/ifnet/sys/dev/gpio/gpioc.c projects/ifnet/sys/dev/gpio/ofw_gpiobus.c projects/ifnet/sys/dev/hwpmc/hwpmc_core.c projects/ifnet/sys/dev/hwpmc/pmc_events.h projects/ifnet/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/ifnet/sys/dev/iicbus/ds3231.c projects/ifnet/sys/dev/iicbus/lm75.c projects/ifnet/sys/dev/ixgbe/ixgbe.c projects/ifnet/sys/dev/ixl/i40e_adminq_cmd.h projects/ifnet/sys/dev/ixl/i40e_common.c projects/ifnet/sys/dev/ixl/i40e_prototype.h projects/ifnet/sys/dev/ixl/i40e_type.h projects/ifnet/sys/dev/ixl/if_ixl.c projects/ifnet/sys/dev/ixl/if_ixlv.c projects/ifnet/sys/dev/ixl/ixl.h projects/ifnet/sys/dev/ixl/ixl_pf.h projects/ifnet/sys/dev/ixl/ixl_txrx.c projects/ifnet/sys/dev/ixl/ixlv.h projects/ifnet/sys/dev/ixl/ixlvc.c projects/ifnet/sys/dev/mps/mps_sas.c projects/ifnet/sys/dev/pci/pci_iov.c projects/ifnet/sys/dev/uart/uart.h projects/ifnet/sys/dev/uart/uart_bus_fdt.c projects/ifnet/sys/dev/uart/uart_cpu_fdt.c projects/ifnet/sys/dev/uart/uart_dev_imx.c projects/ifnet/sys/dev/uart/uart_dev_lpc.c projects/ifnet/sys/dev/uart/uart_dev_msm.c projects/ifnet/sys/dev/uart/uart_dev_ns8250.c projects/ifnet/sys/dev/uart/uart_dev_pl011.c projects/ifnet/sys/dev/uart/uart_dev_ti8250.c projects/ifnet/sys/dev/uart/uart_subr.c projects/ifnet/sys/dev/usb/controller/dwc_otg_fdt.c projects/ifnet/sys/dev/usb/input/uhid.c projects/ifnet/sys/dev/usb/quirk/usb_quirk.c projects/ifnet/sys/dev/usb/serial/u3g.c projects/ifnet/sys/dev/usb/serial/usb_serial.c projects/ifnet/sys/dev/usb/serial/usb_serial.h projects/ifnet/sys/dev/usb/usbdevs projects/ifnet/sys/dev/usb/video/udl.c projects/ifnet/sys/dev/vt/hw/fb/vt_fb.c projects/ifnet/sys/dev/vt/hw/ofwfb/ofwfb.c projects/ifnet/sys/dev/wpi/if_wpi.c projects/ifnet/sys/i386/i386/mp_machdep.c projects/ifnet/sys/kern/imgact_elf.c projects/ifnet/sys/kern/kern_gzio.c projects/ifnet/sys/kern/kern_sig.c projects/ifnet/sys/kern/kern_tc.c projects/ifnet/sys/kern/link_elf.c projects/ifnet/sys/kern/subr_bus.c projects/ifnet/sys/mips/atheros/if_arge.c projects/ifnet/sys/mips/conf/AP135.hints projects/ifnet/sys/modules/Makefile projects/ifnet/sys/modules/dtrace/dtraceall/dtraceall.c projects/ifnet/sys/net/zlib.h projects/ifnet/sys/netinet/if_ether.c projects/ifnet/sys/netinet/sctp.h projects/ifnet/sys/netinet/sctp_cc_functions.c projects/ifnet/sys/netinet/sctp_input.c projects/ifnet/sys/netinet/sctp_pcb.c projects/ifnet/sys/netinet/sctp_pcb.h projects/ifnet/sys/netinet/sctp_peeloff.c projects/ifnet/sys/netinet/sctp_structs.h projects/ifnet/sys/netinet/sctp_timer.c projects/ifnet/sys/netinet/sctp_usrreq.c projects/ifnet/sys/netinet/sctputil.c projects/ifnet/sys/netinet/tcp_usrreq.c projects/ifnet/sys/netinet6/in6.c projects/ifnet/sys/netinet6/in6_pcb.c projects/ifnet/sys/netinet6/nd6.h projects/ifnet/sys/netinet6/nd6_nbr.c projects/ifnet/sys/netipsec/key.c projects/ifnet/sys/ofed/drivers/net/mlx4/en_netdev.c projects/ifnet/sys/powerpc/aim/locore32.S projects/ifnet/sys/powerpc/aim/machdep.c projects/ifnet/sys/powerpc/aim/trap_subr32.S projects/ifnet/sys/powerpc/aim/trap_subr64.S projects/ifnet/sys/powerpc/booke/locore.S projects/ifnet/sys/powerpc/booke/pmap.c projects/ifnet/sys/powerpc/booke/trap_subr.S projects/ifnet/sys/powerpc/ofw/ofwcall32.S projects/ifnet/sys/powerpc/powermac/platform_powermac.c projects/ifnet/sys/powerpc/powerpc/elf32_machdep.c projects/ifnet/sys/powerpc/powerpc/swtch32.S projects/ifnet/sys/powerpc/powerpc/syncicache.c projects/ifnet/sys/powerpc/ps3/ps3_syscons.c projects/ifnet/sys/sys/buf.h projects/ifnet/sys/sys/bus.h projects/ifnet/sys/sys/elf_common.h projects/ifnet/sys/sys/gpio.h projects/ifnet/sys/sys/param.h projects/ifnet/sys/sys/timepps.h projects/ifnet/sys/vm/vm_object.c projects/ifnet/sys/vm/vm_pager.c projects/ifnet/sys/vm/vm_reserv.c projects/ifnet/sys/vm/vnode_pager.c projects/ifnet/tools/regression/usr.bin/env/regress-env.rgdata projects/ifnet/tools/regression/usr.bin/env/regress-sb.rb projects/ifnet/usr.bin/ctlstat/ctlstat.8 projects/ifnet/usr.bin/env/envopts.c projects/ifnet/usr.bin/m4/misc.c projects/ifnet/usr.bin/procstat/Makefile projects/ifnet/usr.bin/procstat/procstat.1 projects/ifnet/usr.bin/procstat/procstat.c projects/ifnet/usr.bin/procstat/procstat.h projects/ifnet/usr.bin/rlogin/rlogin.c projects/ifnet/usr.bin/touch/touch.1 projects/ifnet/usr.bin/w/w.c projects/ifnet/usr.sbin/autofs/automount.c projects/ifnet/usr.sbin/autofs/automountd.8 projects/ifnet/usr.sbin/autofs/automountd.c projects/ifnet/usr.sbin/autofs/common.c projects/ifnet/usr.sbin/autofs/common.h projects/ifnet/usr.sbin/autofs/popen.c projects/ifnet/usr.sbin/bhyve/pci_virtio_block.c projects/ifnet/usr.sbin/gpioctl/gpioctl.8 projects/ifnet/usr.sbin/gpioctl/gpioctl.c Directory Properties: projects/ifnet/ (props changed) projects/ifnet/cddl/ (props changed) projects/ifnet/cddl/contrib/opensolaris/ (props changed) projects/ifnet/contrib/libc++/ (props changed) projects/ifnet/contrib/tzdata/ (props changed) projects/ifnet/lib/libc/ (props changed) projects/ifnet/sbin/ (props changed) projects/ifnet/share/ (props changed) projects/ifnet/share/man/man4/ (props changed) projects/ifnet/sys/ (props changed) projects/ifnet/sys/amd64/vmm/ (props changed) projects/ifnet/sys/boot/ (props changed) projects/ifnet/sys/boot/powerpc/ofw/ (props changed) projects/ifnet/sys/conf/ (props changed) projects/ifnet/sys/dev/hyperv/ (props changed) projects/ifnet/usr.bin/procstat/ (props changed) projects/ifnet/usr.sbin/bhyve/ (props changed) Modified: projects/ifnet/UPDATING ============================================================================== --- projects/ifnet/UPDATING Wed Mar 11 10:43:14 2015 (r279882) +++ projects/ifnet/UPDATING Wed Mar 11 11:17:09 2015 (r279883) @@ -31,6 +31,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20150307: + The 32-bit PowerPC kernel has been changed to a position-independent + executable. This can only be booted with a version of loader(8) + newer than January 31, 2015, so make sure to update both world and + kernel before rebooting. + 20150217: If you are running a -CURRENT kernel since r273872 (Oct 30th, 2014), but before r278950, the RNG was not seeded properly. Immediately Modified: projects/ifnet/cddl/contrib/dtracetoolkit/Proc/pidpersec.d ============================================================================== --- projects/ifnet/cddl/contrib/dtracetoolkit/Proc/pidpersec.d Wed Mar 11 10:43:14 2015 (r279882) +++ projects/ifnet/cddl/contrib/dtracetoolkit/Proc/pidpersec.d Wed Mar 11 11:17:09 2015 (r279883) @@ -41,7 +41,7 @@ dtrace:::BEGIN { - printf("%-22s %8s %6s\n", "TIME", "LASTPID", "PID/s"); + printf("%-22s %6s\n", "TIME", "PID/s"); pids = 0; } @@ -52,6 +52,6 @@ proc:::exec-success profile:::tick-1sec { - printf("%-22Y %8d %6d\n", walltimestamp, `mpid, pids); + printf("%-22Y %6d\n", walltimestamp, pids); pids = 0; } Modified: projects/ifnet/cddl/contrib/opensolaris/common/ctf/ctf_create.c ============================================================================== --- projects/ifnet/cddl/contrib/opensolaris/common/ctf/ctf_create.c Wed Mar 11 10:43:14 2015 (r279882) +++ projects/ifnet/cddl/contrib/opensolaris/common/ctf/ctf_create.c Wed Mar 11 11:17:09 2015 (r279883) @@ -583,10 +583,10 @@ ctf_discard(ctf_file_t *fp) return (0); /* no update required */ for (dtd = ctf_list_prev(&fp->ctf_dtdefs); dtd != NULL; dtd = ntd) { - if (dtd->dtd_type <= fp->ctf_dtoldid) + ntd = ctf_list_prev(dtd); + if (CTF_TYPE_TO_INDEX(dtd->dtd_type) <= fp->ctf_dtoldid) continue; /* skip types that have been committed */ - ntd = ctf_list_prev(dtd); ctf_dtd_delete(fp, dtd); } @@ -1313,10 +1313,13 @@ ctf_add_type(ctf_file_t *dst_fp, ctf_fil * unless dst_type is a forward declaration and src_type is a struct, * union, or enum (i.e. the definition of the previous forward decl). */ - if (dst_type != CTF_ERR && dst_kind != kind && ( - dst_kind != CTF_K_FORWARD || (kind != CTF_K_ENUM && - kind != CTF_K_STRUCT && kind != CTF_K_UNION))) - return (ctf_set_errno(dst_fp, ECTF_CONFLICT)); + if (dst_type != CTF_ERR && dst_kind != kind) { + if (dst_kind != CTF_K_FORWARD || (kind != CTF_K_ENUM && + kind != CTF_K_STRUCT && kind != CTF_K_UNION)) + return (ctf_set_errno(dst_fp, ECTF_CONFLICT)); + else + dst_type = CTF_ERR; + } /* * If the non-empty name was not found in the appropriate hash, search @@ -1328,7 +1331,7 @@ ctf_add_type(ctf_file_t *dst_fp, ctf_fil */ if (dst_type == CTF_ERR && name[0] != '\0') { for (dtd = ctf_list_prev(&dst_fp->ctf_dtdefs); dtd != NULL && - dtd->dtd_type > dst_fp->ctf_dtoldid; + CTF_TYPE_TO_INDEX(dtd->dtd_type) > dst_fp->ctf_dtoldid; dtd = ctf_list_prev(dtd)) { if (CTF_INFO_KIND(dtd->dtd_data.ctt_info) == kind && dtd->dtd_name != NULL && Modified: projects/ifnet/cddl/contrib/opensolaris/tools/ctf/cvt/output.c ============================================================================== --- projects/ifnet/cddl/contrib/opensolaris/tools/ctf/cvt/output.c Wed Mar 11 10:43:14 2015 (r279882) +++ projects/ifnet/cddl/contrib/opensolaris/tools/ctf/cvt/output.c Wed Mar 11 11:17:09 2015 (r279883) @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Routines for preparing tdata trees for conversion into CTF data, and * for placing the resulting data into an output file. Modified: projects/ifnet/contrib/libc++/include/__bit_reference ============================================================================== --- projects/ifnet/contrib/libc++/include/__bit_reference Wed Mar 11 10:43:14 2015 (r279882) +++ projects/ifnet/contrib/libc++/include/__bit_reference Wed Mar 11 11:17:09 2015 (r279883) @@ -906,7 +906,6 @@ rotate(__bit_iterator<_Cp, false> __firs { typedef __bit_iterator<_Cp, false> _I1; typedef typename _I1::difference_type difference_type; - typedef typename _I1::__storage_type __storage_type; difference_type __d1 = __middle - __first; difference_type __d2 = __last - __middle; _I1 __r = __first + __d2; Modified: projects/ifnet/contrib/libc++/include/__tree ============================================================================== --- projects/ifnet/contrib/libc++/include/__tree Wed Mar 11 10:43:14 2015 (r279882) +++ projects/ifnet/contrib/libc++/include/__tree Wed Mar 11 11:17:09 2015 (r279883) @@ -2069,7 +2069,6 @@ template <class _Key> typename __tree<_Tp, _Compare, _Allocator>::size_type __tree<_Tp, _Compare, _Allocator>::__count_multi(const _Key& __k) const { - typedef pair<const_iterator, const_iterator> _Pp; __node_const_pointer __result = __end_node(); __node_const_pointer __rt = __root(); while (__rt != nullptr) Modified: projects/ifnet/contrib/libc++/include/algorithm ============================================================================== --- projects/ifnet/contrib/libc++/include/algorithm Wed Mar 11 10:43:14 2015 (r279882) +++ projects/ifnet/contrib/libc++/include/algorithm Wed Mar 11 11:17:09 2015 (r279883) @@ -4365,8 +4365,6 @@ __buffered_inplace_merge(_BidirectionalI typename iterator_traits<_BidirectionalIterator>::value_type* __buff) { typedef typename iterator_traits<_BidirectionalIterator>::value_type value_type; - typedef typename iterator_traits<_BidirectionalIterator>::difference_type difference_type; - typedef typename iterator_traits<_BidirectionalIterator>::pointer pointer; __destruct_n __d(0); unique_ptr<value_type, __destruct_n&> __h2(__buff, __d); if (__len1 <= __len2) @@ -4400,7 +4398,6 @@ __inplace_merge(_BidirectionalIterator _ typename iterator_traits<_BidirectionalIterator>::difference_type __len2, typename iterator_traits<_BidirectionalIterator>::value_type* __buff, ptrdiff_t __buff_size) { - typedef typename iterator_traits<_BidirectionalIterator>::value_type value_type; typedef typename iterator_traits<_BidirectionalIterator>::difference_type difference_type; while (true) { @@ -4799,7 +4796,6 @@ void __sift_up(_RandomAccessIterator __first, _RandomAccessIterator __last, _Compare __comp, typename iterator_traits<_RandomAccessIterator>::difference_type __len) { - typedef typename iterator_traits<_RandomAccessIterator>::difference_type difference_type; typedef typename iterator_traits<_RandomAccessIterator>::value_type value_type; if (__len > 1) { Modified: projects/ifnet/contrib/tzdata/antarctica ============================================================================== --- projects/ifnet/contrib/tzdata/antarctica Wed Mar 11 10:43:14 2015 (r279882) +++ projects/ifnet/contrib/tzdata/antarctica Wed Mar 11 11:17:09 2015 (r279883) @@ -47,8 +47,8 @@ Rule ChileAQ 2009 only - Mar Sun>=9 3:00 Rule ChileAQ 2010 only - Apr Sun>=1 3:00u 0 - Rule ChileAQ 2011 only - May Sun>=2 3:00u 0 - Rule ChileAQ 2011 only - Aug Sun>=16 4:00u 1:00 S -Rule ChileAQ 2012 max - Apr Sun>=23 3:00u 0 - -Rule ChileAQ 2012 max - Sep Sun>=2 4:00u 1:00 S +Rule ChileAQ 2012 2015 - Apr Sun>=23 3:00u 0 - +Rule ChileAQ 2012 2014 - Sep Sun>=2 4:00u 1:00 S # Argentina - year-round bases # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05 @@ -354,9 +354,10 @@ Zone Antarctica/Rothera 0 - zzz 1976 Dec # # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Antarctica/Palmer 0 - zzz 1965 - -4:00 ArgAQ AR%sT 1969 Oct 5 + -4:00 ArgAQ AR%sT 1969 Oct 5 -3:00 ArgAQ AR%sT 1982 May - -4:00 ChileAQ CL%sT + -4:00 ChileAQ CL%sT 2015 Apr 26 3:00u + -3:00 - CLT # # # McMurdo Station, Ross Island, since 1955-12 Modified: projects/ifnet/contrib/tzdata/asia ============================================================================== --- projects/ifnet/contrib/tzdata/asia Wed Mar 11 10:43:14 2015 (r279882) +++ projects/ifnet/contrib/tzdata/asia Wed Mar 11 11:17:09 2015 (r279883) @@ -145,10 +145,7 @@ Zone Asia/Baku 3:19:24 - LMT 1924 May 2 4:00 Azer AZ%sT # Bahrain -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Asia/Bahrain 3:22:20 - LMT 1920 # Manamah - 4:00 - GST 1972 Jun - 3:00 - AST +# See Asia/Qatar. # Bangladesh # From Alexander Krivenyshev (2009-05-13): @@ -1731,9 +1728,7 @@ Zone Asia/Pyongyang 8:23:00 - LMT 1908 A ############################################################################### # Kuwait -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Asia/Kuwait 3:11:56 - LMT 1950 - 3:00 - AST +# See Asia/Riyadh. # Laos # See Asia/Bangkok. @@ -1954,12 +1949,7 @@ Zone Asia/Kathmandu 5:41:16 - LMT 1920 5:45 - NPT # Nepal Time # Oman - -# Milne says 3:54:24 was the meridian of the Muscat Tidal Observatory. - -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Asia/Muscat 3:54:24 - LMT 1920 - 4:00 - GST +# See Asia/Dubai. # Pakistan @@ -2453,6 +2443,7 @@ Zone Asia/Manila -15:56:00 - LMT 1844 De Zone Asia/Qatar 3:26:08 - LMT 1920 # Al Dawhah / Doha 4:00 - GST 1972 Jun 3:00 - AST +Link Asia/Qatar Asia/Bahrain # Saudi Arabia # @@ -2479,6 +2470,8 @@ Zone Asia/Qatar 3:26:08 - LMT 1920 # # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Riyadh 3:06:52 - LMT 1947 Mar 14 3:00 - AST +Link Asia/Riyadh Asia/Aden # Yemen +Link Asia/Riyadh Asia/Kuwait # Singapore # taken from Mok Ly Yng (2003-10-30) @@ -2767,6 +2760,7 @@ Zone Asia/Ashgabat 3:53:32 - LMT 1924 Ma # Zone NAME GMTOFF RULES FORMAT [UNTIL] Zone Asia/Dubai 3:41:12 - LMT 1920 4:00 - GST +Link Asia/Dubai Asia/Muscat # Oman # Uzbekistan # Byalokoz 1919 says Uzbekistan was 4:27:53. @@ -2851,10 +2845,4 @@ Zone Asia/Ho_Chi_Minh 7:06:40 - LMT 1906 7:00 - ICT # Yemen - -# Milne says 2:59:54 was the meridian of the saluting battery at Aden, -# and that Yemen was at 1:55:56, the meridian of the Hagia Sophia. - -# Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Asia/Aden 2:59:54 - LMT 1950 - 3:00 - AST +# See Asia/Riyadh. Modified: projects/ifnet/contrib/tzdata/backward ============================================================================== --- projects/ifnet/contrib/tzdata/backward Wed Mar 11 10:43:14 2015 (r279882) +++ projects/ifnet/contrib/tzdata/backward Wed Mar 11 11:17:09 2015 (r279883) @@ -5,7 +5,7 @@ # and their old names. Many names changed in late 1993. # Link TARGET LINK-NAME -Link Africa/Asmara Africa/Asmera +Link Africa/Nairobi Africa/Asmera Link Africa/Abidjan Africa/Timbuktu Link America/Argentina/Catamarca America/Argentina/ComodRivadavia Link America/Adak America/Atka Modified: projects/ifnet/contrib/tzdata/europe ============================================================================== --- projects/ifnet/contrib/tzdata/europe Wed Mar 11 10:43:14 2015 (r279882) +++ projects/ifnet/contrib/tzdata/europe Wed Mar 11 11:17:09 2015 (r279883) @@ -1407,35 +1407,32 @@ Zone Europe/Budapest 1:16:20 - LMT 1890 # might be a reference to the Julian calendar as opposed to Gregorian, or it # might mean something else (???). # -# From Paul Eggert (2006-03-22): -# The Iceland Almanak, Shanks & Pottenger, and Whitman disagree on many points. -# We go with the Almanak, except for one claim from Shanks & Pottenger, namely -# that Reykavik was 21W57 from 1837 to 1908, local mean time before that. +# From Paul Eggert (2014-11-22): +# The information below is taken from the 1988 Almanak; see +# http://www.almanak.hi.is/klukkan.html # # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S -Rule Iceland 1917 1918 - Feb 19 23:00 1:00 S +Rule Iceland 1917 1919 - Feb 19 23:00 1:00 S Rule Iceland 1917 only - Oct 21 1:00 0 - -Rule Iceland 1918 only - Nov 16 1:00 0 - +Rule Iceland 1918 1919 - Nov 16 1:00 0 - +Rule Iceland 1921 only - Mar 19 23:00 1:00 S +Rule Iceland 1921 only - Jun 23 1:00 0 - Rule Iceland 1939 only - Apr 29 23:00 1:00 S -Rule Iceland 1939 only - Nov 29 2:00 0 - +Rule Iceland 1939 only - Oct 29 2:00 0 - Rule Iceland 1940 only - Feb 25 2:00 1:00 S -Rule Iceland 1940 only - Nov 3 2:00 0 - -Rule Iceland 1941 only - Mar 2 1:00s 1:00 S -Rule Iceland 1941 only - Nov 2 1:00s 0 - -Rule Iceland 1942 only - Mar 8 1:00s 1:00 S -Rule Iceland 1942 only - Oct 25 1:00s 0 - +Rule Iceland 1940 1941 - Nov Sun>=2 1:00s 0 - +Rule Iceland 1941 1942 - Mar Sun>=2 1:00s 1:00 S # 1943-1946 - first Sunday in March until first Sunday in winter Rule Iceland 1943 1946 - Mar Sun>=1 1:00s 1:00 S -Rule Iceland 1943 1948 - Oct Sun>=22 1:00s 0 - +Rule Iceland 1942 1948 - Oct Sun>=22 1:00s 0 - # 1947-1967 - first Sunday in April until first Sunday in winter Rule Iceland 1947 1967 - Apr Sun>=1 1:00s 1:00 S -# 1949 Oct transition delayed by 1 week +# 1949 and 1967 Oct transitions delayed by 1 week Rule Iceland 1949 only - Oct 30 1:00s 0 - Rule Iceland 1950 1966 - Oct Sun>=22 1:00s 0 - Rule Iceland 1967 only - Oct 29 1:00s 0 - # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Atlantic/Reykjavik -1:27:24 - LMT 1837 - -1:27:48 - RMT 1908 # Reykjavik Mean Time? +Zone Atlantic/Reykjavik -1:28 - LMT 1908 -1:00 Iceland IS%sT 1968 Apr 7 1:00s 0:00 - GMT Modified: projects/ifnet/contrib/tzdata/leap-seconds.list ============================================================================== --- projects/ifnet/contrib/tzdata/leap-seconds.list Wed Mar 11 10:43:14 2015 (r279882) +++ projects/ifnet/contrib/tzdata/leap-seconds.list Wed Mar 11 11:17:09 2015 (r279883) @@ -47,7 +47,7 @@ # and can be ignored for many purposes. These differences # are tabulated in Circular T, which is published monthly # by the International Bureau of Weights and Measures -# (BIPM). See www.bipm.fr for more information. +# (BIPM). See www.bipm.org for more information. # # 3. The current definition of the relationship between UTC # and TAI dates from 1 January 1972. A number of different @@ -127,6 +127,15 @@ # with, since the difficulty of unambiguously representing the epoch # during the leap second does not arise. # +# Some systems implement leap seconds by amortizing the leap second +# over the last few minutes of the day. The frequency of the local +# clock is decreased (or increased) to realize the positive (or +# negative) leap second. This method removes the time step described +# above. Although the long-term behavior of the time scale is correct +# in this case, this method introduces an error during the adjustment +# period both in time and in frequency with respect to the official +# defintion of UTC. +# # Questions or comments to: # Judah Levine # Time and Frequency Division @@ -134,7 +143,7 @@ # Boulder, Colorado # Judah.Levine@nist.gov # -# Last Update of leap second values: 11 January 2012 +# Last Update of leap second values: 5 January 2015 # # The following line shows this last update date in NTP timestamp # format. This is the date on which the most recent change to @@ -142,7 +151,7 @@ # be identified by the unique pair of characters in the first two # columns as shown below. # -#$ 3535228800 +#$ 3629404800 # # The NTP timestamps are in units of seconds since the NTP epoch, # which is 1 January 1900, 00:00:00. The Modified Julian Day number @@ -190,10 +199,10 @@ # current -- the update time stamp, the data and the name of the file # will not change. # -# Updated through IERS Bulletin C48 -# File expires on: 28 June 2015 +# Updated through IERS Bulletin C49 +# File expires on: 28 December 2015 # -#@ 3644438400 +#@ 3660249600 # 2272060800 10 # 1 Jan 1972 2287785600 11 # 1 Jul 1972 @@ -221,6 +230,7 @@ 3345062400 33 # 1 Jan 2006 3439756800 34 # 1 Jan 2009 3550089600 35 # 1 Jul 2012 +3644697600 36 # 1 Jul 2015 # # the following special comment contains the # hash value of the data in this file computed @@ -236,4 +246,4 @@ # the hash line is also ignored in the # computation. # -#h a4862ccd c6f43c6 964f3604 85944a26 b5cfad4e +#h 45e70fa7 a9df2033 f4a49ab0 ec648273 7b6c22c Modified: projects/ifnet/contrib/tzdata/northamerica ============================================================================== --- projects/ifnet/contrib/tzdata/northamerica Wed Mar 11 10:43:14 2015 (r279882) +++ projects/ifnet/contrib/tzdata/northamerica Wed Mar 11 11:17:09 2015 (r279883) @@ -124,7 +124,7 @@ Rule US 1918 1919 - Mar lastSun 2:00 1:0 Rule US 1918 1919 - Oct lastSun 2:00 0 S Rule US 1942 only - Feb 9 2:00 1:00 W # War Rule US 1945 only - Aug 14 23:00u 1:00 P # Peace -Rule US 1945 only - Sep 30 2:00 0 S +Rule US 1945 only - Sep lastSun 2:00 0 S Rule US 1967 2006 - Oct lastSun 2:00 0 S Rule US 1967 1973 - Apr lastSun 2:00 1:00 D Rule US 1974 only - Jan 6 2:00 1:00 D @@ -2124,11 +2124,11 @@ Zone America/Dawson -9:17:40 - LMT 1900 # Mexico -# From Paul Eggert (2001-03-05): +# From Paul Eggert (2014-12-07): # The Investigation and Analysis Service of the # Mexican Library of Congress (MLoC) has published a # history of Mexican local time (in Spanish) -# http://www.cddhcu.gob.mx/bibliot/publica/inveyana/polisoc/horver/ +# http://www.diputados.gob.mx/bibliot/publica/inveyana/polisoc/horver/index.htm # # Here are the discrepancies between Shanks & Pottenger (S&P) and the MLoC. # (In all cases we go with the MLoC.) @@ -2297,6 +2297,24 @@ Zone America/Dawson -9:17:40 - LMT 1900 # efecto desde las dos horas del segundo domingo de marzo y concluirá a # las dos horas del primer domingo de noviembre. +# From Steffen Thorsen (2014-12-08), translated by Gwillim Law: +# The Mexican state of Quintana Roo will likely change to EST in 2015. +# +# http://www.unioncancun.mx/articulo/2014/12/04/medio-ambiente/congreso-aprueba-una-hora-mas-de-sol-en-qroo +# "With this change, the time conflict that has existed between the municipios +# of Quintana Roo and the municipio of Felipe Carrillo Puerto may come to an +# end. The latter declared itself in rebellion 15 years ago when a time change +# was initiated in Mexico, and since then it has refused to change its time +# zone along with the rest of the country." +# +# From Steffen Thorsen (2015-01-14), translated by Gwillim Law: +# http://sipse.com/novedades/confirman-aplicacion-de-nueva-zona-horaria-para-quintana-roo-132331.html +# "...the new time zone will come into effect at two o'clock on the first Sunday +# of February, when we will have to advance the clock one hour from its current +# time..." +# +# Also, the new zone will not use DST. + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Mexico 1939 only - Feb 5 0:00 1:00 D Rule Mexico 1939 only - Jun 25 0:00 0 S @@ -2317,7 +2335,8 @@ Rule Mexico 2002 max - Oct lastSun 2:00 Zone America/Cancun -5:47:04 - LMT 1922 Jan 1 0:12:56 -6:00 - CST 1981 Dec 23 -5:00 Mexico E%sT 1998 Aug 2 2:00 - -6:00 Mexico C%sT + -6:00 Mexico C%sT 2015 Feb 1 2:00 + -5:00 - EST # Campeche, Yucatán; represented by Mérida Zone America/Merida -5:58:28 - LMT 1922 Jan 1 0:01:32 -6:00 - CST 1981 Dec 23 Modified: projects/ifnet/contrib/tzdata/southamerica ============================================================================== --- projects/ifnet/contrib/tzdata/southamerica Wed Mar 11 10:43:14 2015 (r279882) +++ projects/ifnet/contrib/tzdata/southamerica Wed Mar 11 11:17:09 2015 (r279883) @@ -1206,6 +1206,11 @@ Zone America/Rio_Branco -4:31:12 - LMT 1 # DST Start: first Saturday of September 2014 (Sun 07 Sep 2014 04:00 UTC) # http://www.diariooficial.interior.gob.cl//media/2014/02/19/do-20140219.pdf +# From Juan Correa (2015-01-28): +# ... today the Ministry of Energy announced that Chile will drop DST, will keep +# "summer time" (UTC -3 / UTC -5) all year round.... +# http://www.minenergia.cl/ministerio/noticias/generales/ministerio-de-energia-anuncia.html + # NOTE: ChileAQ rules for Antarctic bases are stored separately in the # 'antarctica' file. @@ -1247,8 +1252,8 @@ Rule Chile 2009 only - Mar Sun>=9 3:00u Rule Chile 2010 only - Apr Sun>=1 3:00u 0 - Rule Chile 2011 only - May Sun>=2 3:00u 0 - Rule Chile 2011 only - Aug Sun>=16 4:00u 1:00 S -Rule Chile 2012 max - Apr Sun>=23 3:00u 0 - -Rule Chile 2012 max - Sep Sun>=2 4:00u 1:00 S +Rule Chile 2012 2015 - Apr Sun>=23 3:00u 0 - +Rule Chile 2012 2014 - Sep Sun>=2 4:00u 1:00 S # IATA SSIM anomalies: (1992-02) says 1992-03-14; # (1996-09) says 1998-03-08. Ignore these. # Zone NAME GMTOFF RULES FORMAT [UNTIL] @@ -1259,11 +1264,13 @@ Zone America/Santiago -4:42:46 - LMT 189 -4:00 - CLT 1919 Jul 1 # Chile Time -4:42:46 - SMT 1927 Sep 1 # Santiago Mean Time -5:00 Chile CL%sT 1947 May 22 # Chile Time - -4:00 Chile CL%sT + -4:00 Chile CL%sT 2015 Apr 26 3:00u + -3:00 - CLT Zone Pacific/Easter -7:17:44 - LMT 1890 -7:17:28 - EMT 1932 Sep # Easter Mean Time - -7:00 Chile EAS%sT 1982 Mar 13 21:00 # Easter Time - -6:00 Chile EAS%sT + -7:00 Chile EAS%sT 1982 Mar 13 3:00u # Easter Time + -6:00 Chile EAS%sT 2015 Apr 26 3:00u + -5:00 - EAST # # Salas y Gómez Island is uninhabited. # Other Chilean locations, including Juan Fernández Is, Desventuradas Is, Modified: projects/ifnet/contrib/tzdata/zone.tab ============================================================================== --- projects/ifnet/contrib/tzdata/zone.tab Wed Mar 11 10:43:14 2015 (r279882) +++ projects/ifnet/contrib/tzdata/zone.tab Wed Mar 11 11:17:09 2015 (r279883) @@ -274,7 +274,7 @@ MU -2010+05730 Indian/Mauritius MV +0410+07330 Indian/Maldives MW -1547+03500 Africa/Blantyre MX +1924-09909 America/Mexico_City Central Time - most locations -MX +2105-08646 America/Cancun Central Time - Quintana Roo +MX +2105-08646 America/Cancun Eastern Standard Time - Quintana Roo MX +2058-08937 America/Merida Central Time - Campeche, Yucatan MX +2540-10019 America/Monterrey Mexican Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas away from US border MX +2550-09730 America/Matamoros US Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas near US border Modified: projects/ifnet/contrib/tzdata/zone1970.tab ============================================================================== --- projects/ifnet/contrib/tzdata/zone1970.tab Wed Mar 11 10:43:14 2015 (r279882) +++ projects/ifnet/contrib/tzdata/zone1970.tab Wed Mar 11 11:17:09 2015 (r279883) @@ -234,7 +234,7 @@ MT +3554+01431 Europe/Malta MU -2010+05730 Indian/Mauritius MV +0410+07330 Indian/Maldives MX +1924-09909 America/Mexico_City Central Time - most locations -MX +2105-08646 America/Cancun Central Time - Quintana Roo +MX +2105-08646 America/Cancun Eastern Standard Time - Quintana Roo MX +2058-08937 America/Merida Central Time - Campeche, Yucatán MX +2540-10019 America/Monterrey Mexican Central Time - Coahuila, Durango, Nuevo León, Tamaulipas away from US border MX +2550-09730 America/Matamoros US Central Time - Coahuila, Durango, Nuevo León, Tamaulipas near US border Modified: projects/ifnet/lib/libc/gen/getpwent.c ============================================================================== --- projects/ifnet/lib/libc/gen/getpwent.c Wed Mar 11 10:43:14 2015 (r279882) +++ projects/ifnet/lib/libc/gen/getpwent.c Wed Mar 11 11:17:09 2015 (r279883) @@ -1942,7 +1942,7 @@ docompat: break; } fin: - if (!stayopen && st->db != NULL) { + if (st->db != NULL && !stayopen) { (void)st->db->close(st->db); st->db = NULL; } Modified: projects/ifnet/lib/libc/net/sctp_sys_calls.c ============================================================================== --- projects/ifnet/lib/libc/net/sctp_sys_calls.c Wed Mar 11 10:43:14 2015 (r279882) +++ projects/ifnet/lib/libc/net/sctp_sys_calls.c Wed Mar 11 11:17:09 2015 (r279883) @@ -383,6 +383,9 @@ sctp_opt_info(int sd, sctp_assoc_t id, i case SCTP_PR_ASSOC_STATUS: ((struct sctp_prstatus *)arg)->sprstat_assoc_id = id; break; + case SCTP_MAX_CWND: + ((struct sctp_assoc_value *)arg)->assoc_id = id; + break; default: break; } Modified: projects/ifnet/lib/libc/powerpc/gen/_setjmp.S ============================================================================== --- projects/ifnet/lib/libc/powerpc/gen/_setjmp.S Wed Mar 11 10:43:14 2015 (r279882) +++ projects/ifnet/lib/libc/powerpc/gen/_setjmp.S Wed Mar 11 11:17:09 2015 (r279883) @@ -56,12 +56,54 @@ ENTRY(_setjmp) mr %r10,%r1 mr %r9,%r2 stmw %r9,20(%r3) + + /* FPRs */ + stfd %f14,92+0*8(%r3) + stfd %f15,92+1*8(%r3) + stfd %f16,92+2*8(%r3) + stfd %f17,92+3*8(%r3) + stfd %f18,92+4*8(%r3) + stfd %f19,92+5*8(%r3) + stfd %f20,92+6*8(%r3) + stfd %f21,92+7*8(%r3) + stfd %f22,92+8*8(%r3) + stfd %f23,92+9*8(%r3) + stfd %f24,92+10*8(%r3) + stfd %f25,92+11*8(%r3) + stfd %f26,92+12*8(%r3) + stfd %f27,92+13*8(%r3) + stfd %f28,93+13*8(%r3) + stfd %f29,93+14*8(%r3) + stfd %f30,93+15*8(%r3) + stfd %f31,93+16*8(%r3) + li %r3,0 blr END(_setjmp) ENTRY(_longjmp) lmw %r9,20(%r3) + + /* FPRs */ + lfd %f14,92+0*8(%r3) + lfd %f15,92+1*8(%r3) + lfd %f16,92+2*8(%r3) + lfd %f17,92+3*8(%r3) + lfd %f18,92+4*8(%r3) + lfd %f19,92+5*8(%r3) + lfd %f20,92+6*8(%r3) + lfd %f21,92+7*8(%r3) + lfd %f22,92+8*8(%r3) + lfd %f23,92+9*8(%r3) + lfd %f24,92+10*8(%r3) + lfd %f25,92+11*8(%r3) + lfd %f26,92+12*8(%r3) + lfd %f27,92+13*8(%r3) + lfd %f28,93+13*8(%r3) + lfd %f29,93+14*8(%r3) + lfd %f30,93+15*8(%r3) + lfd %f31,93+16*8(%r3) + mtlr %r11 mtcr %r12 mr %r1,%r10 Modified: projects/ifnet/lib/libc/powerpc/gen/setjmp.S ============================================================================== --- projects/ifnet/lib/libc/powerpc/gen/setjmp.S Wed Mar 11 10:43:14 2015 (r279882) +++ projects/ifnet/lib/libc/powerpc/gen/setjmp.S Wed Mar 11 11:17:09 2015 (r279883) @@ -66,6 +66,27 @@ ENTRY(setjmp) mr %r10,%r1 /* r10 <- stackptr */ mr %r9,%r2 /* r9 <- global ptr */ stmw %r9,20(%r6) + + /* FPRs */ + stfd %f14,92+0*8(%r6) + stfd %f15,92+1*8(%r6) + stfd %f16,92+2*8(%r6) + stfd %f17,92+3*8(%r6) + stfd %f18,92+4*8(%r6) + stfd %f19,92+5*8(%r6) + stfd %f20,92+6*8(%r6) + stfd %f21,92+7*8(%r6) + stfd %f22,92+8*8(%r6) + stfd %f23,92+9*8(%r6) + stfd %f24,92+10*8(%r6) + stfd %f25,92+11*8(%r6) + stfd %f26,92+12*8(%r6) + stfd %f27,92+13*8(%r6) + stfd %f28,93+13*8(%r6) + stfd %f29,93+14*8(%r6) + stfd %f30,93+15*8(%r6) + stfd %f31,93+16*8(%r6) + li %r3,0 /* return (0) */ blr END(setjmp) @@ -73,6 +94,27 @@ END(setjmp) WEAK_REFERENCE(CNAME(__longjmp), longjmp) ENTRY(__longjmp) lmw %r9,20(%r3) /* restore regs */ + + /* FPRs */ + lfd %f14,92+0*8(%r3) + lfd %f15,92+1*8(%r3) + lfd %f16,92+2*8(%r3) + lfd %f17,92+3*8(%r3) + lfd %f18,92+4*8(%r3) + lfd %f19,92+5*8(%r3) + lfd %f20,92+6*8(%r3) + lfd %f21,92+7*8(%r3) + lfd %f22,92+8*8(%r3) + lfd %f23,92+9*8(%r3) + lfd %f24,92+10*8(%r3) + lfd %f25,92+11*8(%r3) + lfd %f26,92+12*8(%r3) + lfd %f27,92+13*8(%r3) + lfd %f28,93+13*8(%r3) + lfd %f29,93+14*8(%r3) + lfd %f30,93+15*8(%r3) + lfd %f31,93+16*8(%r3) + mr %r6,%r4 /* save val param */ mtlr %r11 /* r11 -> link reg */ mtcr %r12 /* r12 -> condition reg */ Modified: projects/ifnet/lib/libc/powerpc/gen/sigsetjmp.S ============================================================================== --- projects/ifnet/lib/libc/powerpc/gen/sigsetjmp.S Wed Mar 11 10:43:14 2015 (r279882) +++ projects/ifnet/lib/libc/powerpc/gen/sigsetjmp.S Wed Mar 11 11:17:09 2015 (r279883) @@ -71,12 +71,54 @@ ENTRY(sigsetjmp) mr %r10,%r1 mr %r9,%r2 stmw %r9,20(%r6) + + /* FPRs */ + stfd %f14,92+0*8(%r6) + stfd %f15,92+1*8(%r6) + stfd %f16,92+2*8(%r6) + stfd %f17,92+3*8(%r6) + stfd %f18,92+4*8(%r6) + stfd %f19,92+5*8(%r6) + stfd %f20,92+6*8(%r6) + stfd %f21,92+7*8(%r6) + stfd %f22,92+8*8(%r6) + stfd %f23,92+9*8(%r6) + stfd %f24,92+10*8(%r6) + stfd %f25,92+11*8(%r6) + stfd %f26,92+12*8(%r6) + stfd %f27,92+13*8(%r6) + stfd %f28,93+13*8(%r6) + stfd %f29,93+14*8(%r6) + stfd %f30,93+15*8(%r6) + stfd %f31,93+16*8(%r6) + li %r3,0 blr END(sigsetjmp) ENTRY(siglongjmp) lmw %r9,20(%r3) + + /* FPRs */ + lfd %f14,92+0*8(%r3) + lfd %f15,92+1*8(%r3) + lfd %f16,92+2*8(%r3) + lfd %f17,92+3*8(%r3) + lfd %f18,92+4*8(%r3) + lfd %f19,92+5*8(%r3) + lfd %f20,92+6*8(%r3) + lfd %f21,92+7*8(%r3) + lfd %f22,92+8*8(%r3) + lfd %f23,92+9*8(%r3) + lfd %f24,92+10*8(%r3) + lfd %f25,92+11*8(%r3) + lfd %f26,92+12*8(%r3) + lfd %f27,92+13*8(%r3) + lfd %f28,93+13*8(%r3) + lfd %f29,93+14*8(%r3) + lfd %f30,93+15*8(%r3) + lfd %f31,93+16*8(%r3) + lwz %r7,0(%r3) mr %r6,%r4 mtlr %r11 Modified: projects/ifnet/lib/libc/powerpc64/gen/_setjmp.S ============================================================================== --- projects/ifnet/lib/libc/powerpc64/gen/_setjmp.S Wed Mar 11 10:43:14 2015 (r279882) +++ projects/ifnet/lib/libc/powerpc64/gen/_setjmp.S Wed Mar 11 11:17:09 2015 (r279883) @@ -56,23 +56,41 @@ ENTRY(_setjmp) mr %r10,%r1 mr %r9,%r2 std %r9,40 + 0*8(%r3) + stfd %f14,40 + 23*8(%r3) std %r10,40 + 1*8(%r3) + stfd %f15,40 + 24*8(%r3) std %r11,40 + 2*8(%r3) + stfd %f16,40 + 25*8(%r3) std %r12,40 + 3*8(%r3) + stfd %f17,40 + 26*8(%r3) std %r13,40 + 4*8(%r3) + stfd %f18,40 + 27*8(%r3) std %r14,40 + 5*8(%r3) + stfd %f19,40 + 28*8(%r3) std %r15,40 + 6*8(%r3) + stfd %f20,40 + 29*8(%r3) std %r16,40 + 7*8(%r3) + stfd %f21,40 + 30*8(%r3) std %r17,40 + 8*8(%r3) + stfd %f22,40 + 31*8(%r3) std %r18,40 + 9*8(%r3) + stfd %f23,40 + 32*8(%r3) std %r19,40 + 10*8(%r3) + stfd %f24,40 + 33*8(%r3) std %r20,40 + 11*8(%r3) + stfd %f25,40 + 34*8(%r3) std %r21,40 + 12*8(%r3) + stfd %f26,40 + 35*8(%r3) std %r22,40 + 13*8(%r3) + stfd %f27,40 + 36*8(%r3) std %r23,40 + 14*8(%r3) + stfd %f28,40 + 37*8(%r3) std %r24,40 + 15*8(%r3) + stfd %f29,40 + 38*8(%r3) std %r25,40 + 16*8(%r3) + stfd %f30,40 + 39*8(%r3) std %r26,40 + 17*8(%r3) + stfd %f31,40 + 40*8(%r3) std %r27,40 + 18*8(%r3) std %r28,40 + 19*8(%r3) std %r29,40 + 20*8(%r3) @@ -84,23 +102,41 @@ END(_setjmp) ENTRY(_longjmp) ld %r9,40 + 0*8(%r3) + lfd %f14,40 + 23*8(%r3) ld %r10,40 + 1*8(%r3) + lfd %f15,40 + 24*8(%r3) ld %r11,40 + 2*8(%r3) + lfd %f16,40 + 25*8(%r3) ld %r12,40 + 3*8(%r3) + lfd %f17,40 + 26*8(%r3) ld %r14,40 + 5*8(%r3) + lfd %f18,40 + 27*8(%r3) ld %r15,40 + 6*8(%r3) + lfd %f19,40 + 28*8(%r3) ld %r16,40 + 7*8(%r3) + lfd %f20,40 + 29*8(%r3) ld %r17,40 + 8*8(%r3) + lfd %f21,40 + 30*8(%r3) ld %r18,40 + 9*8(%r3) + lfd %f22,40 + 31*8(%r3) ld %r19,40 + 10*8(%r3) + lfd %f23,40 + 32*8(%r3) ld %r20,40 + 11*8(%r3) + lfd %f24,40 + 33*8(%r3) ld %r21,40 + 12*8(%r3) + lfd %f25,40 + 34*8(%r3) ld %r22,40 + 13*8(%r3) + lfd %f26,40 + 35*8(%r3) ld %r23,40 + 14*8(%r3) + lfd %f27,40 + 36*8(%r3) ld %r24,40 + 15*8(%r3) + lfd %f28,40 + 37*8(%r3) ld %r25,40 + 16*8(%r3) + lfd %f29,40 + 38*8(%r3) ld %r26,40 + 17*8(%r3) + lfd %f30,40 + 39*8(%r3) ld %r27,40 + 18*8(%r3) + lfd %f31,40 + 40*8(%r3) ld %r28,40 + 19*8(%r3) ld %r29,40 + 20*8(%r3) ld %r30,40 + 21*8(%r3) Modified: projects/ifnet/lib/libc/powerpc64/gen/setjmp.S ============================================================================== --- projects/ifnet/lib/libc/powerpc64/gen/setjmp.S Wed Mar 11 10:43:14 2015 (r279882) +++ projects/ifnet/lib/libc/powerpc64/gen/setjmp.S Wed Mar 11 11:17:09 2015 (r279883) @@ -67,29 +67,49 @@ ENTRY(setjmp) mr %r9,%r2 /* r9 <- global ptr */ std %r9,40 + 0*8(%r6) + stfd %f14,40 + 23*8(%r6) std %r10,40 + 1*8(%r6) + stfd %f15,40 + 24*8(%r6) std %r11,40 + 2*8(%r6) + stfd %f16,40 + 25*8(%r6) std %r12,40 + 3*8(%r6) + stfd %f17,40 + 26*8(%r6) std %r13,40 + 4*8(%r6) + stfd %f18,40 + 27*8(%r6) std %r14,40 + 5*8(%r6) + stfd %f19,40 + 28*8(%r6) std %r15,40 + 6*8(%r6) + stfd %f20,40 + 29*8(%r6) std %r16,40 + 7*8(%r6) + stfd %f21,40 + 30*8(%r6) std %r17,40 + 8*8(%r6) + stfd %f22,40 + 31*8(%r6) std %r18,40 + 9*8(%r6) + stfd %f23,40 + 32*8(%r6) std %r19,40 + 10*8(%r6) + stfd %f24,40 + 33*8(%r6) std %r20,40 + 11*8(%r6) + stfd %f25,40 + 34*8(%r6) std %r21,40 + 12*8(%r6) + stfd %f26,40 + 35*8(%r6) std %r22,40 + 13*8(%r6) + stfd %f27,40 + 36*8(%r6) std %r23,40 + 14*8(%r6) + stfd %f28,40 + 37*8(%r6) std %r24,40 + 15*8(%r6) + stfd %f29,40 + 38*8(%r6) std %r25,40 + 16*8(%r6) + stfd %f30,40 + 39*8(%r6) std %r26,40 + 17*8(%r6) + stfd %f31,40 + 40*8(%r6) std %r27,40 + 18*8(%r6) std %r28,40 + 19*8(%r6) std %r29,40 + 20*8(%r6) std %r30,40 + 21*8(%r6) std %r31,40 + 22*8(%r6) + /* XXX Altivec regs */ + li %r3,0 /* return (0) */ blr END(setjmp) @@ -97,23 +117,41 @@ END(setjmp) WEAK_REFERENCE(__longjmp, longjmp) ENTRY(__longjmp) ld %r9,40 + 0*8(%r3) + lfd %f14,40 + 23*8(%r3) ld %r10,40 + 1*8(%r3) + lfd %f15,40 + 24*8(%r3) ld %r11,40 + 2*8(%r3) + lfd %f16,40 + 25*8(%r3) ld %r12,40 + 3*8(%r3) + lfd %f17,40 + 26*8(%r3) ld %r14,40 + 5*8(%r3) + lfd %f18,40 + 27*8(%r3) ld %r15,40 + 6*8(%r3) + lfd %f19,40 + 28*8(%r3) ld %r16,40 + 7*8(%r3) + lfd %f20,40 + 29*8(%r3) ld %r17,40 + 8*8(%r3) + lfd %f21,40 + 30*8(%r3) ld %r18,40 + 9*8(%r3) + lfd %f22,40 + 31*8(%r3) ld %r19,40 + 10*8(%r3) + lfd %f23,40 + 32*8(%r3) ld %r20,40 + 11*8(%r3) + lfd %f24,40 + 33*8(%r3) ld %r21,40 + 12*8(%r3) + lfd %f25,40 + 34*8(%r3) ld %r22,40 + 13*8(%r3) + lfd %f26,40 + 35*8(%r3) ld %r23,40 + 14*8(%r3) + lfd %f27,40 + 36*8(%r3) ld %r24,40 + 15*8(%r3) + lfd %f28,40 + 37*8(%r3) ld %r25,40 + 16*8(%r3) + lfd %f29,40 + 38*8(%r3) ld %r26,40 + 17*8(%r3) + lfd %f30,40 + 39*8(%r3) ld %r27,40 + 18*8(%r3) + lfd %f31,40 + 40*8(%r3) ld %r28,40 + 19*8(%r3) ld %r29,40 + 20*8(%r3) ld %r30,40 + 21*8(%r3) Modified: projects/ifnet/lib/libc/powerpc64/gen/sigsetjmp.S ============================================================================== --- projects/ifnet/lib/libc/powerpc64/gen/sigsetjmp.S Wed Mar 11 10:43:14 2015 (r279882) +++ projects/ifnet/lib/libc/powerpc64/gen/sigsetjmp.S Wed Mar 11 11:17:09 2015 (r279883) @@ -72,23 +72,41 @@ ENTRY(sigsetjmp) mr %r9,%r2 std %r9,40 + 0*8(%r6) + stfd %f14,40 + 23*8(%r6) std %r10,40 + 1*8(%r6) + stfd %f15,40 + 24*8(%r6) std %r11,40 + 2*8(%r6) + stfd %f16,40 + 25*8(%r6) std %r12,40 + 3*8(%r6) + stfd %f17,40 + 26*8(%r6) std %r13,40 + 4*8(%r6) + stfd %f18,40 + 27*8(%r6) std %r14,40 + 5*8(%r6) + stfd %f19,40 + 28*8(%r6) std %r15,40 + 6*8(%r6) + stfd %f20,40 + 29*8(%r6) std %r16,40 + 7*8(%r6) + stfd %f21,40 + 30*8(%r6) std %r17,40 + 8*8(%r6) + stfd %f22,40 + 31*8(%r6) std %r18,40 + 9*8(%r6) + stfd %f23,40 + 32*8(%r6) std %r19,40 + 10*8(%r6) + stfd %f24,40 + 33*8(%r6) std %r20,40 + 11*8(%r6) + stfd %f25,40 + 34*8(%r6) std %r21,40 + 12*8(%r6) + stfd %f26,40 + 35*8(%r6) std %r22,40 + 13*8(%r6) + stfd %f27,40 + 36*8(%r6) std %r23,40 + 14*8(%r6) + stfd %f28,40 + 37*8(%r6) std %r24,40 + 15*8(%r6) + stfd %f29,40 + 38*8(%r6) std %r25,40 + 16*8(%r6) + stfd %f30,40 + 39*8(%r6) std %r26,40 + 17*8(%r6) + stfd %f31,40 + 40*8(%r6) std %r27,40 + 18*8(%r6) std %r28,40 + 19*8(%r6) std %r29,40 + 20*8(%r6) @@ -101,23 +119,41 @@ END(sigsetjmp) ENTRY(siglongjmp) ld %r9,40 + 0*8(%r3) + lfd %f14,40 + 23*8(%r3) ld %r10,40 + 1*8(%r3) + lfd %f15,40 + 24*8(%r3) ld %r11,40 + 2*8(%r3) + lfd %f16,40 + 25*8(%r3) ld %r12,40 + 3*8(%r3) + lfd %f17,40 + 26*8(%r3) ld %r14,40 + 5*8(%r3) + lfd %f18,40 + 27*8(%r3) ld %r15,40 + 6*8(%r3) + lfd %f19,40 + 28*8(%r3) ld %r16,40 + 7*8(%r3) + lfd %f20,40 + 29*8(%r3) ld %r17,40 + 8*8(%r3) + lfd %f21,40 + 30*8(%r3) ld %r18,40 + 9*8(%r3) + lfd %f22,40 + 31*8(%r3) ld %r19,40 + 10*8(%r3) + lfd %f23,40 + 32*8(%r3) ld %r20,40 + 11*8(%r3) + lfd %f24,40 + 33*8(%r3) ld %r21,40 + 12*8(%r3) + lfd %f25,40 + 34*8(%r3) ld %r22,40 + 13*8(%r3) + lfd %f26,40 + 35*8(%r3) ld %r23,40 + 14*8(%r3) + lfd %f27,40 + 36*8(%r3) ld %r24,40 + 15*8(%r3) + lfd %f28,40 + 37*8(%r3) ld %r25,40 + 16*8(%r3) + lfd %f29,40 + 38*8(%r3) ld %r26,40 + 17*8(%r3) + lfd %f30,40 + 39*8(%r3) ld %r27,40 + 18*8(%r3) + lfd %f31,40 + 40*8(%r3) ld %r28,40 + 19*8(%r3) ld %r29,40 + 20*8(%r3) ld %r30,40 + 21*8(%r3) Modified: projects/ifnet/lib/libc/sys/cap_ioctls_limit.2 ============================================================================== --- projects/ifnet/lib/libc/sys/cap_ioctls_limit.2 Wed Mar 11 10:43:14 2015 (r279882) +++ projects/ifnet/lib/libc/sys/cap_ioctls_limit.2 Wed Mar 11 11:17:09 2015 (r279883) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 27, 2014 +.Dd March 6, 2015 .Dt CAP_IOCTLS_LIMIT 2 .Os .Sh NAME @@ -61,6 +61,8 @@ argument specifies the number of element There can be up to .Va 256 elements in the array. +Including an element that has been previously revoked will generate an error. +After a successful call only those listed in the array may be used. .Pp The list of allowed ioctl commands for a given file descriptor can be obtained with the @@ -92,7 +94,7 @@ system call was never called for this fi .Fn cap_ioctls_get system call will return .Dv CAP_IOCTLS_ALL -and won't modify the buffer pointed to by the +and will not modify the buffer pointed to by the .Fa cmds argument. .Sh RETURN VALUES Modified: projects/ifnet/lib/libgpio/gpio.3 ============================================================================== --- projects/ifnet/lib/libgpio/gpio.3 Wed Mar 11 10:43:14 2015 (r279882) +++ projects/ifnet/lib/libgpio/gpio.3 Wed Mar 11 11:17:09 2015 (r279883) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 17, 2014 +.Dd March 8, 2015 .Dt GPIO 3 .Os .Sh NAME @@ -43,41 +43,43 @@ .Ft void .Fn gpio_close "gpio_handle_t handle" .Ft int *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503111117.t2BBHAM3042918>