Date: Sun, 15 Mar 2015 10:58:48 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r280022 - in projects/release-pkg: . bin/rcp cddl/contrib/dtracetoolkit/Proc cddl/contrib/opensolaris/common/ctf cddl/contrib/opensolaris/tools/ctf/cvt contrib/bmake contrib/compiler-rt... Message-ID: <201503151058.t2FAwmtv079153@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sun Mar 15 10:58:47 2015 New Revision: 280022 URL: https://svnweb.freebsd.org/changeset/base/280022 Log: Merge from head Added: projects/release-pkg/contrib/compiler-rt/lib/builtins/fixtfdi.c - copied unchanged from r280021, head/contrib/compiler-rt/lib/builtins/fixtfdi.c projects/release-pkg/contrib/compiler-rt/lib/builtins/fixtfsi.c - copied unchanged from r280021, head/contrib/compiler-rt/lib/builtins/fixtfsi.c projects/release-pkg/contrib/compiler-rt/lib/builtins/fixtfti.c - copied unchanged from r280021, head/contrib/compiler-rt/lib/builtins/fixtfti.c projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunstfdi.c - copied unchanged from r280021, head/contrib/compiler-rt/lib/builtins/fixunstfdi.c projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunstfsi.c - copied unchanged from r280021, head/contrib/compiler-rt/lib/builtins/fixunstfsi.c projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunstfti.c - copied unchanged from r280021, head/contrib/compiler-rt/lib/builtins/fixunstfti.c projects/release-pkg/contrib/compiler-rt/lib/builtins/fp_fixint_impl.inc - copied unchanged from r280021, head/contrib/compiler-rt/lib/builtins/fp_fixint_impl.inc projects/release-pkg/contrib/compiler-rt/lib/builtins/fp_fixuint_impl.inc - copied unchanged from r280021, head/contrib/compiler-rt/lib/builtins/fp_fixuint_impl.inc projects/release-pkg/etc/autofs/special_noauto - copied unchanged from r280021, head/etc/autofs/special_noauto projects/release-pkg/lib/libpmc/pmc.haswellxeon.3 - copied unchanged from r280021, head/lib/libpmc/pmc.haswellxeon.3 projects/release-pkg/lib/libstand/powerpc/syncicache.c - copied unchanged from r280021, head/lib/libstand/powerpc/syncicache.c projects/release-pkg/share/dtrace/tcpconn - copied unchanged from r280021, head/share/dtrace/tcpconn projects/release-pkg/share/dtrace/tcpstate - copied unchanged from r280021, head/share/dtrace/tcpstate projects/release-pkg/share/dtrace/tcptrack - copied unchanged from r280021, head/share/dtrace/tcptrack projects/release-pkg/share/dtrace/udptrack - copied unchanged from r280021, head/share/dtrace/udptrack projects/release-pkg/sys/arm/broadcom/bcm2835/bcm283x_dwc_fdt.c - copied unchanged from r280021, head/sys/arm/broadcom/bcm2835/bcm283x_dwc_fdt.c projects/release-pkg/sys/boot/powerpc/ofw/ofwfdt.c - copied unchanged from r280021, head/sys/boot/powerpc/ofw/ofwfdt.c projects/release-pkg/sys/dev/uart/uart_cpu_fdt.h - copied unchanged from r280021, head/sys/dev/uart/uart_cpu_fdt.h projects/release-pkg/sys/dev/usb/controller/dwc_otg_fdt.h - copied unchanged from r280021, head/sys/dev/usb/controller/dwc_otg_fdt.h projects/release-pkg/sys/kern/uipc_mbufhash.c - copied unchanged from r280021, head/sys/kern/uipc_mbufhash.c projects/release-pkg/sys/mips/conf/TL-WR1043NDv2 - copied unchanged from r280021, head/sys/mips/conf/TL-WR1043NDv2 projects/release-pkg/sys/mips/conf/TL-WR1043NDv2.hints - copied unchanged from r280021, head/sys/mips/conf/TL-WR1043NDv2.hints projects/release-pkg/sys/modules/dtb/am335x/ - copied from r280021, head/sys/modules/dtb/am335x/ projects/release-pkg/sys/sys/gzio.h - copied unchanged from r280021, head/sys/sys/gzio.h projects/release-pkg/usr.bin/procstat/procstat_cs.c - copied unchanged from r280021, head/usr.bin/procstat/procstat_cs.c Deleted: projects/release-pkg/sys/amd64/vmm/vmm_ipi.c projects/release-pkg/sys/amd64/vmm/vmm_ipi.h projects/release-pkg/sys/amd64/vmm/vmm_support.S projects/release-pkg/sys/gnu/dts/arm/alphascale-asm9260-devkit.dts projects/release-pkg/sys/gnu/dts/arm/alphascale-asm9260.dtsi projects/release-pkg/sys/gnu/dts/arm/axm5516-amarillo.dts projects/release-pkg/sys/gnu/dts/arm/axm55xx.dtsi projects/release-pkg/sys/gnu/dts/arm/exynos5250-snow.dts projects/release-pkg/sys/gnu/dts/arm/exynos5420-peach-pit.dts projects/release-pkg/sys/gnu/dts/arm/exynos5800-peach-pi.dts projects/release-pkg/sys/gnu/dts/arm/mmp2-brownstone.dts projects/release-pkg/sys/gnu/dts/arm/mmp2.dtsi projects/release-pkg/sys/gnu/dts/arm/pxa168-aspenite.dts projects/release-pkg/sys/gnu/dts/arm/pxa168.dtsi projects/release-pkg/sys/gnu/dts/arm/pxa910-dkb.dts projects/release-pkg/sys/gnu/dts/arm/pxa910.dtsi projects/release-pkg/sys/gnu/dts/arm/qcom-apq8064-cm-qs600.dts projects/release-pkg/sys/gnu/dts/arm/qcom-apq8064-ifc6410.dts projects/release-pkg/sys/gnu/dts/arm/qcom-apq8064-v2.0.dtsi projects/release-pkg/sys/gnu/dts/arm/qcom-apq8064.dtsi projects/release-pkg/sys/gnu/dts/arm/qcom-apq8074-dragonboard.dts projects/release-pkg/sys/gnu/dts/arm/qcom-apq8084-ifc6540.dts projects/release-pkg/sys/gnu/dts/arm/qcom-apq8084-mtp.dts projects/release-pkg/sys/gnu/dts/arm/qcom-apq8084.dtsi projects/release-pkg/sys/gnu/dts/arm/qcom-ipq8064-ap148.dts projects/release-pkg/sys/gnu/dts/arm/qcom-ipq8064-v1.0.dtsi projects/release-pkg/sys/gnu/dts/arm/qcom-ipq8064.dtsi projects/release-pkg/sys/gnu/dts/arm/qcom-msm8660-surf.dts projects/release-pkg/sys/gnu/dts/arm/qcom-msm8660.dtsi projects/release-pkg/sys/gnu/dts/arm/qcom-msm8960-cdp.dts projects/release-pkg/sys/gnu/dts/arm/qcom-msm8960.dtsi projects/release-pkg/sys/gnu/dts/arm/qcom-msm8974-sony-xperia-honami.dts projects/release-pkg/sys/gnu/dts/arm/qcom-msm8974.dtsi projects/release-pkg/sys/gnu/dts/arm/s3c6400.dtsi projects/release-pkg/sys/gnu/dts/arm/s3c6410-mini6410.dts projects/release-pkg/sys/gnu/dts/arm/s3c6410-smdk6410.dts projects/release-pkg/sys/gnu/dts/arm/s3c6410.dtsi projects/release-pkg/sys/gnu/dts/arm/s3c64xx-pinctrl.dtsi projects/release-pkg/sys/gnu/dts/arm/s3c64xx.dtsi projects/release-pkg/sys/gnu/dts/arm/socfpga.dtsi projects/release-pkg/sys/gnu/dts/arm/socfpga_arria10.dtsi projects/release-pkg/sys/gnu/dts/arm/socfpga_arria10_socdk.dts projects/release-pkg/sys/gnu/dts/arm/socfpga_arria5.dtsi projects/release-pkg/sys/gnu/dts/arm/socfpga_arria5_socdk.dts projects/release-pkg/sys/gnu/dts/arm/socfpga_cyclone5.dtsi projects/release-pkg/sys/gnu/dts/arm/socfpga_cyclone5_socdk.dts projects/release-pkg/sys/gnu/dts/arm/socfpga_cyclone5_sockit.dts projects/release-pkg/sys/gnu/dts/arm/socfpga_cyclone5_socrates.dts projects/release-pkg/sys/gnu/dts/arm/socfpga_vt.dts projects/release-pkg/sys/gnu/dts/include/dt-bindings/clock/alphascale,asm9260.h projects/release-pkg/sys/gnu/dts/include/dt-bindings/clock/lsi,axm5516-clks.h projects/release-pkg/sys/gnu/dts/include/dt-bindings/clock/marvell,mmp2.h projects/release-pkg/sys/gnu/dts/include/dt-bindings/clock/marvell,pxa168.h projects/release-pkg/sys/gnu/dts/include/dt-bindings/clock/marvell,pxa910.h projects/release-pkg/sys/gnu/dts/include/dt-bindings/clock/maxim,max77686.h projects/release-pkg/sys/gnu/dts/include/dt-bindings/clock/maxim,max77802.h projects/release-pkg/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-apq8084.h projects/release-pkg/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-ipq806x.h projects/release-pkg/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8660.h projects/release-pkg/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8960.h projects/release-pkg/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8974.h projects/release-pkg/sys/gnu/dts/include/dt-bindings/clock/qcom,lcc-ipq806x.h projects/release-pkg/sys/gnu/dts/include/dt-bindings/clock/qcom,lcc-msm8960.h projects/release-pkg/sys/gnu/dts/include/dt-bindings/clock/qcom,mmcc-apq8084.h projects/release-pkg/sys/gnu/dts/include/dt-bindings/clock/qcom,mmcc-msm8960.h projects/release-pkg/sys/gnu/dts/include/dt-bindings/clock/qcom,mmcc-msm8974.h projects/release-pkg/sys/gnu/dts/include/dt-bindings/clock/rockchip,rk808.h projects/release-pkg/sys/gnu/dts/include/dt-bindings/clock/samsung,s3c64xx-clock.h projects/release-pkg/sys/gnu/dts/include/dt-bindings/iio/ projects/release-pkg/sys/gnu/dts/include/dt-bindings/pinctrl/qcom,pmic-gpio.h projects/release-pkg/sys/gnu/dts/include/dt-bindings/pinctrl/qcom,pmic-mpp.h projects/release-pkg/sys/gnu/dts/include/dt-bindings/regulator/ projects/release-pkg/sys/gnu/dts/include/dt-bindings/reset/ projects/release-pkg/sys/gnu/dts/include/dt-bindings/soc/ projects/release-pkg/sys/ofed/drivers/net/mlx4/utils.c projects/release-pkg/sys/ofed/drivers/net/mlx4/utils.h Modified: projects/release-pkg/Makefile.inc1 projects/release-pkg/UPDATING projects/release-pkg/bin/rcp/Makefile projects/release-pkg/cddl/contrib/dtracetoolkit/Proc/pidpersec.d projects/release-pkg/cddl/contrib/opensolaris/common/ctf/ctf_create.c projects/release-pkg/cddl/contrib/opensolaris/tools/ctf/cvt/output.c projects/release-pkg/contrib/bmake/meta.c projects/release-pkg/contrib/compiler-rt/lib/builtins/fixdfdi.c projects/release-pkg/contrib/compiler-rt/lib/builtins/fixdfsi.c projects/release-pkg/contrib/compiler-rt/lib/builtins/fixdfti.c projects/release-pkg/contrib/compiler-rt/lib/builtins/fixsfdi.c projects/release-pkg/contrib/compiler-rt/lib/builtins/fixsfsi.c projects/release-pkg/contrib/compiler-rt/lib/builtins/fixsfti.c projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunsdfdi.c projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunsdfsi.c projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunsdfti.c projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunssfdi.c projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunssfsi.c projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunssfti.c projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunsxfdi.c projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunsxfsi.c projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunsxfti.c projects/release-pkg/contrib/compiler-rt/lib/builtins/fixxfdi.c projects/release-pkg/contrib/compiler-rt/lib/builtins/fixxfti.c projects/release-pkg/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h projects/release-pkg/contrib/libc++/include/__bit_reference projects/release-pkg/contrib/libc++/include/__tree projects/release-pkg/contrib/libc++/include/algorithm projects/release-pkg/contrib/libxo/libxo/xo.h projects/release-pkg/contrib/tzdata/antarctica projects/release-pkg/contrib/tzdata/asia projects/release-pkg/contrib/tzdata/backward projects/release-pkg/contrib/tzdata/europe projects/release-pkg/contrib/tzdata/leap-seconds.list projects/release-pkg/contrib/tzdata/northamerica projects/release-pkg/contrib/tzdata/southamerica projects/release-pkg/contrib/tzdata/zone.tab projects/release-pkg/contrib/tzdata/zone1970.tab projects/release-pkg/etc/auto_master projects/release-pkg/etc/autofs/Makefile projects/release-pkg/etc/defaults/periodic.conf projects/release-pkg/lib/libc/gen/getpwent.c projects/release-pkg/lib/libc/net/sctp_sys_calls.c projects/release-pkg/lib/libc/posix1e/acl_calc_mask.c projects/release-pkg/lib/libc/posix1e/acl_strip.c projects/release-pkg/lib/libc/powerpc/gen/_setjmp.S projects/release-pkg/lib/libc/powerpc/gen/setjmp.S projects/release-pkg/lib/libc/powerpc/gen/sigsetjmp.S projects/release-pkg/lib/libc/powerpc64/gen/_setjmp.S projects/release-pkg/lib/libc/powerpc64/gen/setjmp.S projects/release-pkg/lib/libc/powerpc64/gen/sigsetjmp.S projects/release-pkg/lib/libc/stdlib/qsort.c projects/release-pkg/lib/libc/sys/cap_ioctls_limit.2 projects/release-pkg/lib/libcompiler_rt/Makefile projects/release-pkg/lib/libgpio/gpio.3 projects/release-pkg/lib/libgpio/gpio.c projects/release-pkg/lib/libgpio/libgpio.h projects/release-pkg/lib/libnv/tests/dnv_tests.cc projects/release-pkg/lib/libnv/tests/nv_tests.cc projects/release-pkg/lib/libpmc/libpmc.c projects/release-pkg/lib/libpmc/pmc.3 projects/release-pkg/lib/libpmc/pmc.haswell.3 projects/release-pkg/lib/libpmc/pmc.ivybridge.3 projects/release-pkg/lib/libpmc/pmc.ivybridgexeon.3 projects/release-pkg/lib/libpmc/pmc.sandybridge.3 projects/release-pkg/lib/libpmc/pmc.sandybridgexeon.3 projects/release-pkg/lib/libproc/proc_sym.c projects/release-pkg/lib/libstand/Makefile projects/release-pkg/lib/libstand/dosfs.c projects/release-pkg/lib/libstand/powerpc/_setjmp.S projects/release-pkg/lib/libthr/thread/thr_private.h projects/release-pkg/lib/msun/man/j0.3 projects/release-pkg/lib/msun/src/e_j0.c projects/release-pkg/lib/msun/src/e_j0f.c projects/release-pkg/lib/msun/src/e_j1.c projects/release-pkg/lib/msun/src/e_j1f.c projects/release-pkg/lib/msun/src/e_jn.c projects/release-pkg/lib/msun/src/e_jnf.c projects/release-pkg/sbin/geom/class/part/gpart.8 projects/release-pkg/sbin/ifconfig/af_inet6.c projects/release-pkg/sbin/ifconfig/af_nd6.c projects/release-pkg/sbin/ifconfig/ifconfig.8 projects/release-pkg/sbin/ifconfig/ifconfig.c projects/release-pkg/sbin/ipfw/ipfw.8 projects/release-pkg/sbin/ipfw/ipfw2.c projects/release-pkg/sbin/ipfw/tables.c projects/release-pkg/sbin/restore/dirs.c projects/release-pkg/sbin/restore/tape.c projects/release-pkg/share/doc/psd/title/Title projects/release-pkg/share/doc/smm/title/Title projects/release-pkg/share/doc/usd/title/Title projects/release-pkg/share/dtrace/Makefile projects/release-pkg/share/examples/bhyve/vmrun.sh projects/release-pkg/share/man/man4/Makefile projects/release-pkg/share/man/man4/ds3231.4 projects/release-pkg/share/man/man5/core.5 projects/release-pkg/share/man/man5/periodic.conf.5 projects/release-pkg/share/man/man9/SDT.9 projects/release-pkg/share/man/man9/VOP_VPTOCNP.9 projects/release-pkg/share/man/man9/mbuf.9 projects/release-pkg/share/man/man9/sbuf.9 projects/release-pkg/share/misc/committers-src.dot projects/release-pkg/share/mk/bsd.mkopt.mk projects/release-pkg/share/mk/bsd.obj.mk projects/release-pkg/share/mk/sys.mk projects/release-pkg/sys/amd64/amd64/apic_vector.S projects/release-pkg/sys/amd64/amd64/mp_machdep.c projects/release-pkg/sys/amd64/include/smp.h projects/release-pkg/sys/amd64/vmm/intel/ept.c projects/release-pkg/sys/amd64/vmm/intel/vmx.c projects/release-pkg/sys/amd64/vmm/io/vatpic.c projects/release-pkg/sys/amd64/vmm/io/vlapic.c projects/release-pkg/sys/amd64/vmm/vmm.c projects/release-pkg/sys/amd64/vmm/vmm_lapic.c projects/release-pkg/sys/arm/arm/cpufunc_asm_armv7.S projects/release-pkg/sys/arm/arm/cpuinfo.c projects/release-pkg/sys/arm/arm/db_trace.c projects/release-pkg/sys/arm/arm/exception.S projects/release-pkg/sys/arm/arm/genassym.c projects/release-pkg/sys/arm/arm/physmem.c projects/release-pkg/sys/arm/arm/undefined.c projects/release-pkg/sys/arm/at91/uart_bus_at91usart.c projects/release-pkg/sys/arm/at91/uart_cpu_at91usart.c projects/release-pkg/sys/arm/at91/uart_dev_at91usart.c projects/release-pkg/sys/arm/broadcom/bcm2835/bcm2835_fb.c projects/release-pkg/sys/arm/broadcom/bcm2835/bcm2835_fbd.c projects/release-pkg/sys/arm/broadcom/bcm2835/files.bcm2835 projects/release-pkg/sys/arm/conf/ARMADAXP projects/release-pkg/sys/arm/conf/BEAGLEBONE projects/release-pkg/sys/arm/conf/CUBIEBOARD projects/release-pkg/sys/arm/conf/CUBIEBOARD2 projects/release-pkg/sys/arm/conf/DB-78XXX projects/release-pkg/sys/arm/conf/DB-88F5XXX projects/release-pkg/sys/arm/conf/DB-88F6XXX projects/release-pkg/sys/arm/conf/DOCKSTAR projects/release-pkg/sys/arm/conf/DREAMPLUG-1001 projects/release-pkg/sys/arm/conf/EXYNOS5.common projects/release-pkg/sys/arm/conf/PANDABOARD projects/release-pkg/sys/arm/conf/SHEEVAPLUG projects/release-pkg/sys/arm/conf/TS7800 projects/release-pkg/sys/arm/conf/VYBRID projects/release-pkg/sys/arm/conf/ZEDBOARD projects/release-pkg/sys/arm/freescale/vybrid/vf_uart.c projects/release-pkg/sys/arm/include/cpu-v6.h projects/release-pkg/sys/arm/include/cpuinfo.h projects/release-pkg/sys/arm/include/in_cksum.h projects/release-pkg/sys/arm/samsung/exynos/exynos_uart.c projects/release-pkg/sys/arm/samsung/s3c2xx0/uart_bus_s3c2410.c projects/release-pkg/sys/arm/samsung/s3c2xx0/uart_cpu_s3c2410.c projects/release-pkg/sys/arm/ti/aintc.c projects/release-pkg/sys/arm/ti/am335x/am335x_dmtimer.c projects/release-pkg/sys/arm/ti/omap4/omap4_prcm_clks.c projects/release-pkg/sys/arm/xilinx/uart_dev_cdnc.c projects/release-pkg/sys/arm/xilinx/zy7_devcfg.c projects/release-pkg/sys/arm/xilinx/zy7_slcr.c projects/release-pkg/sys/arm/xilinx/zy7_slcr.h projects/release-pkg/sys/boot/amd64/Makefile.inc projects/release-pkg/sys/boot/amd64/boot1.efi/boot1.c projects/release-pkg/sys/boot/amd64/efi/Makefile projects/release-pkg/sys/boot/amd64/efi/conf.c projects/release-pkg/sys/boot/amd64/efi/copy.c projects/release-pkg/sys/boot/efi/libefi/Makefile projects/release-pkg/sys/boot/efi/libefi/libefi.c projects/release-pkg/sys/boot/ficl/Makefile projects/release-pkg/sys/boot/libstand32/Makefile projects/release-pkg/sys/boot/ofw/common/main.c projects/release-pkg/sys/boot/ofw/libofw/elf_freebsd.c projects/release-pkg/sys/boot/ofw/libofw/openfirm.c projects/release-pkg/sys/boot/ofw/libofw/openfirm.h projects/release-pkg/sys/boot/ofw/libofw/ppc64_elf_freebsd.c projects/release-pkg/sys/boot/powerpc/ofw/Makefile projects/release-pkg/sys/boot/powerpc/ofw/metadata.c projects/release-pkg/sys/boot/sparc64/loader/metadata.c projects/release-pkg/sys/cam/scsi/scsi_da.c projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/release-pkg/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h projects/release-pkg/sys/cddl/dev/dtrace/arm/dtrace_asm.S projects/release-pkg/sys/cddl/dev/dtrace/arm/dtrace_subr.c projects/release-pkg/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c projects/release-pkg/sys/cddl/dev/fbt/arm/fbt_isa.c projects/release-pkg/sys/conf/Makefile.powerpc projects/release-pkg/sys/conf/NOTES projects/release-pkg/sys/conf/files projects/release-pkg/sys/conf/files.i386 projects/release-pkg/sys/conf/kern.opts.mk projects/release-pkg/sys/conf/options projects/release-pkg/sys/dev/acpica/acpi.c projects/release-pkg/sys/dev/ahci/ahci.h projects/release-pkg/sys/dev/ata/ata-all.h projects/release-pkg/sys/dev/bge/if_bge.c projects/release-pkg/sys/dev/cadence/if_cgem.c projects/release-pkg/sys/dev/cxgb/cxgb_sge.c projects/release-pkg/sys/dev/cxgbe/t4_main.c projects/release-pkg/sys/dev/cxgbe/t4_netmap.c projects/release-pkg/sys/dev/cxgbe/tom/t4_ddp.c projects/release-pkg/sys/dev/drm2/drm_pci.c projects/release-pkg/sys/dev/etherswitch/arswitch/arswitch.c projects/release-pkg/sys/dev/etherswitch/arswitch/arswitch_8327.c projects/release-pkg/sys/dev/etherswitch/arswitch/arswitch_phy.c projects/release-pkg/sys/dev/etherswitch/arswitch/arswitch_phy.h projects/release-pkg/sys/dev/etherswitch/arswitch/arswitch_reg.c projects/release-pkg/sys/dev/etherswitch/arswitch/arswitch_vlans.c projects/release-pkg/sys/dev/etherswitch/arswitch/arswitch_vlans.h projects/release-pkg/sys/dev/etherswitch/arswitch/arswitchreg.h projects/release-pkg/sys/dev/etherswitch/arswitch/arswitchvar.h projects/release-pkg/sys/dev/fb/fbd.c projects/release-pkg/sys/dev/gpio/gpiobus.c projects/release-pkg/sys/dev/gpio/gpiobus_if.m projects/release-pkg/sys/dev/gpio/gpiobusvar.h projects/release-pkg/sys/dev/gpio/gpioc.c projects/release-pkg/sys/dev/gpio/ofw_gpiobus.c projects/release-pkg/sys/dev/hwpmc/hwpmc_core.c projects/release-pkg/sys/dev/hwpmc/hwpmc_logging.c projects/release-pkg/sys/dev/hwpmc/pmc_events.h projects/release-pkg/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c projects/release-pkg/sys/dev/iicbus/ds3231.c projects/release-pkg/sys/dev/iicbus/lm75.c projects/release-pkg/sys/dev/iscsi_initiator/isc_sm.c projects/release-pkg/sys/dev/ixgbe/ixgbe.c projects/release-pkg/sys/dev/ixl/i40e_adminq_cmd.h projects/release-pkg/sys/dev/ixl/i40e_common.c projects/release-pkg/sys/dev/ixl/i40e_prototype.h projects/release-pkg/sys/dev/ixl/i40e_type.h projects/release-pkg/sys/dev/ixl/if_ixl.c projects/release-pkg/sys/dev/ixl/if_ixlv.c projects/release-pkg/sys/dev/ixl/ixl.h projects/release-pkg/sys/dev/ixl/ixl_pf.h projects/release-pkg/sys/dev/ixl/ixl_txrx.c projects/release-pkg/sys/dev/ixl/ixlv.h projects/release-pkg/sys/dev/ixl/ixlvc.c projects/release-pkg/sys/dev/mii/rgephy.c projects/release-pkg/sys/dev/mii/rgephyreg.h projects/release-pkg/sys/dev/mps/mps_sas.c projects/release-pkg/sys/dev/mvs/mvs.h projects/release-pkg/sys/dev/pci/pci_iov.c projects/release-pkg/sys/dev/siis/siis.h projects/release-pkg/sys/dev/uart/uart.h projects/release-pkg/sys/dev/uart/uart_bus_fdt.c projects/release-pkg/sys/dev/uart/uart_cpu_fdt.c projects/release-pkg/sys/dev/uart/uart_dev_imx.c projects/release-pkg/sys/dev/uart/uart_dev_lpc.c projects/release-pkg/sys/dev/uart/uart_dev_msm.c projects/release-pkg/sys/dev/uart/uart_dev_ns8250.c projects/release-pkg/sys/dev/uart/uart_dev_pl011.c projects/release-pkg/sys/dev/uart/uart_dev_ti8250.c projects/release-pkg/sys/dev/uart/uart_subr.c projects/release-pkg/sys/dev/usb/controller/dwc_otg_fdt.c projects/release-pkg/sys/dev/usb/input/uhid.c projects/release-pkg/sys/dev/usb/net/usb_ethernet.c projects/release-pkg/sys/dev/usb/quirk/usb_quirk.c projects/release-pkg/sys/dev/usb/serial/u3g.c projects/release-pkg/sys/dev/usb/serial/usb_serial.c projects/release-pkg/sys/dev/usb/serial/usb_serial.h projects/release-pkg/sys/dev/usb/usbdevs projects/release-pkg/sys/dev/usb/video/udl.c projects/release-pkg/sys/dev/virtio/block/virtio_blk.c projects/release-pkg/sys/dev/virtio/block/virtio_blk.h projects/release-pkg/sys/dev/vt/hw/fb/vt_fb.c projects/release-pkg/sys/dev/vt/hw/ofwfb/ofwfb.c projects/release-pkg/sys/dev/wpi/if_wpi.c projects/release-pkg/sys/geom/mirror/g_mirror.c projects/release-pkg/sys/geom/part/g_part.c projects/release-pkg/sys/geom/part/g_part.h projects/release-pkg/sys/geom/part/g_part_gpt.c projects/release-pkg/sys/i386/i386/mp_machdep.c projects/release-pkg/sys/i386/isa/npx.c projects/release-pkg/sys/kern/imgact_elf.c projects/release-pkg/sys/kern/kern_cons.c projects/release-pkg/sys/kern/kern_descrip.c projects/release-pkg/sys/kern/kern_et.c projects/release-pkg/sys/kern/kern_fail.c projects/release-pkg/sys/kern/kern_gzio.c projects/release-pkg/sys/kern/kern_malloc.c projects/release-pkg/sys/kern/kern_proc.c projects/release-pkg/sys/kern/kern_sig.c projects/release-pkg/sys/kern/kern_sysctl.c projects/release-pkg/sys/kern/kern_tc.c projects/release-pkg/sys/kern/link_elf.c projects/release-pkg/sys/kern/sched_ule.c projects/release-pkg/sys/kern/subr_bus.c projects/release-pkg/sys/kern/subr_param.c projects/release-pkg/sys/kern/subr_prf.c projects/release-pkg/sys/kern/subr_sbuf.c projects/release-pkg/sys/mips/atheros/if_arge.c projects/release-pkg/sys/mips/conf/AP135.hints projects/release-pkg/sys/mips/conf/QCA955X_BASE projects/release-pkg/sys/mips/nlm/cms.c projects/release-pkg/sys/mips/rmi/dev/iic/at24co2n.c projects/release-pkg/sys/mips/rmi/fmn.c projects/release-pkg/sys/modules/Makefile projects/release-pkg/sys/modules/dtrace/dtraceall/dtraceall.c projects/release-pkg/sys/modules/mlxen/Makefile projects/release-pkg/sys/modules/vmm/Makefile projects/release-pkg/sys/net/ieee8023ad_lacp.c projects/release-pkg/sys/net/if.c projects/release-pkg/sys/net/if_lagg.c projects/release-pkg/sys/net/if_lagg.h projects/release-pkg/sys/net/zlib.h projects/release-pkg/sys/net80211/ieee80211_freebsd.c projects/release-pkg/sys/netinet/if_ether.c projects/release-pkg/sys/netinet/ip_fw.h projects/release-pkg/sys/netinet/sctp.h projects/release-pkg/sys/netinet/sctp_cc_functions.c projects/release-pkg/sys/netinet/sctp_input.c projects/release-pkg/sys/netinet/sctp_os_bsd.h projects/release-pkg/sys/netinet/sctp_pcb.c projects/release-pkg/sys/netinet/sctp_pcb.h projects/release-pkg/sys/netinet/sctp_peeloff.c projects/release-pkg/sys/netinet/sctp_structs.h projects/release-pkg/sys/netinet/sctp_timer.c projects/release-pkg/sys/netinet/sctp_usrreq.c projects/release-pkg/sys/netinet/sctputil.c projects/release-pkg/sys/netinet/tcp_hostcache.c projects/release-pkg/sys/netinet/tcp_usrreq.c projects/release-pkg/sys/netinet6/in6.c projects/release-pkg/sys/netinet6/in6_pcb.c projects/release-pkg/sys/netinet6/nd6.h projects/release-pkg/sys/netinet6/nd6_nbr.c projects/release-pkg/sys/netipsec/key.c projects/release-pkg/sys/netpfil/ipfw/ip_fw2.c projects/release-pkg/sys/netpfil/ipfw/ip_fw_pfil.c projects/release-pkg/sys/netpfil/ipfw/ip_fw_private.h projects/release-pkg/sys/netpfil/ipfw/ip_fw_table_value.c projects/release-pkg/sys/netpfil/pf/pf.c projects/release-pkg/sys/ofed/drivers/net/mlx4/en_netdev.c projects/release-pkg/sys/ofed/drivers/net/mlx4/en_tx.c projects/release-pkg/sys/powerpc/aim/locore32.S projects/release-pkg/sys/powerpc/aim/machdep.c projects/release-pkg/sys/powerpc/aim/mmu_oea64.c projects/release-pkg/sys/powerpc/aim/trap_subr32.S projects/release-pkg/sys/powerpc/aim/trap_subr64.S projects/release-pkg/sys/powerpc/booke/locore.S projects/release-pkg/sys/powerpc/booke/machdep.c projects/release-pkg/sys/powerpc/booke/pmap.c projects/release-pkg/sys/powerpc/booke/trap_subr.S projects/release-pkg/sys/powerpc/include/slb.h projects/release-pkg/sys/powerpc/include/ucontext.h projects/release-pkg/sys/powerpc/ofw/ofwcall32.S projects/release-pkg/sys/powerpc/powermac/platform_powermac.c projects/release-pkg/sys/powerpc/powerpc/elf32_machdep.c projects/release-pkg/sys/powerpc/powerpc/exec_machdep.c projects/release-pkg/sys/powerpc/powerpc/swtch32.S projects/release-pkg/sys/powerpc/powerpc/syncicache.c projects/release-pkg/sys/powerpc/ps3/ps3_syscons.c projects/release-pkg/sys/powerpc/pseries/mmu_phyp.c projects/release-pkg/sys/powerpc/pseries/phyp_llan.c projects/release-pkg/sys/sys/buf.h projects/release-pkg/sys/sys/bus.h projects/release-pkg/sys/sys/elf_common.h projects/release-pkg/sys/sys/gpio.h projects/release-pkg/sys/sys/gpt.h projects/release-pkg/sys/sys/mbuf.h projects/release-pkg/sys/sys/param.h projects/release-pkg/sys/sys/sbuf.h projects/release-pkg/sys/sys/sysctl.h projects/release-pkg/sys/sys/timepps.h projects/release-pkg/sys/vm/uma_core.c projects/release-pkg/sys/vm/vm_object.c projects/release-pkg/sys/vm/vm_pager.c projects/release-pkg/sys/vm/vm_reserv.c projects/release-pkg/sys/vm/vnode_pager.c projects/release-pkg/sys/x86/include/apicvar.h projects/release-pkg/sys/x86/x86/local_apic.c projects/release-pkg/sys/x86/xen/xen_apic.c projects/release-pkg/sys/xen/xenbus/xenbusb.c projects/release-pkg/tools/regression/usr.bin/env/regress-env.rgdata projects/release-pkg/tools/regression/usr.bin/env/regress-sb.rb projects/release-pkg/usr.bin/Makefile projects/release-pkg/usr.bin/ctlstat/ctlstat.8 projects/release-pkg/usr.bin/env/envopts.c projects/release-pkg/usr.bin/m4/misc.c projects/release-pkg/usr.bin/procstat/Makefile projects/release-pkg/usr.bin/procstat/procstat.1 projects/release-pkg/usr.bin/procstat/procstat.c projects/release-pkg/usr.bin/procstat/procstat.h projects/release-pkg/usr.bin/rlogin/Makefile projects/release-pkg/usr.bin/rlogin/rlogin.c projects/release-pkg/usr.bin/rsh/Makefile projects/release-pkg/usr.bin/touch/touch.1 projects/release-pkg/usr.bin/w/w.c projects/release-pkg/usr.bin/xlint/Makefile.inc projects/release-pkg/usr.sbin/autofs/auto_master.5 projects/release-pkg/usr.sbin/autofs/automount.c projects/release-pkg/usr.sbin/autofs/automountd.8 projects/release-pkg/usr.sbin/autofs/automountd.c projects/release-pkg/usr.sbin/autofs/common.c projects/release-pkg/usr.sbin/autofs/common.h projects/release-pkg/usr.sbin/autofs/popen.c projects/release-pkg/usr.sbin/bhyve/ahci.h projects/release-pkg/usr.sbin/bhyve/block_if.c projects/release-pkg/usr.sbin/bhyve/block_if.h projects/release-pkg/usr.sbin/bhyve/pci_ahci.c projects/release-pkg/usr.sbin/bhyve/pci_virtio_block.c projects/release-pkg/usr.sbin/freebsd-update/freebsd-update.sh projects/release-pkg/usr.sbin/gpioctl/gpioctl.8 projects/release-pkg/usr.sbin/gpioctl/gpioctl.c projects/release-pkg/usr.sbin/sysrc/sysrc projects/release-pkg/usr.sbin/sysrc/sysrc.8 Directory Properties: projects/release-pkg/ (props changed) projects/release-pkg/cddl/ (props changed) projects/release-pkg/cddl/contrib/opensolaris/ (props changed) projects/release-pkg/contrib/bmake/ (props changed) projects/release-pkg/contrib/compiler-rt/ (props changed) projects/release-pkg/contrib/libc++/ (props changed) projects/release-pkg/contrib/tzdata/ (props changed) projects/release-pkg/etc/ (props changed) projects/release-pkg/lib/libc/ (props changed) projects/release-pkg/sbin/ (props changed) projects/release-pkg/sbin/ipfw/ (props changed) projects/release-pkg/share/ (props changed) projects/release-pkg/share/man/man4/ (props changed) projects/release-pkg/sys/ (props changed) projects/release-pkg/sys/amd64/vmm/ (props changed) projects/release-pkg/sys/boot/ (props changed) projects/release-pkg/sys/boot/powerpc/ofw/ (props changed) projects/release-pkg/sys/cddl/contrib/opensolaris/ (props changed) projects/release-pkg/sys/conf/ (props changed) projects/release-pkg/sys/dev/hyperv/ (props changed) projects/release-pkg/sys/gnu/dts/ (props changed) projects/release-pkg/sys/gnu/dts/arm/ (props changed) projects/release-pkg/sys/gnu/dts/include/ (props changed) projects/release-pkg/sys/modules/vmm/ (props changed) projects/release-pkg/usr.bin/procstat/ (props changed) projects/release-pkg/usr.sbin/bhyve/ (props changed) Modified: projects/release-pkg/Makefile.inc1 ============================================================================== --- projects/release-pkg/Makefile.inc1 Sun Mar 15 09:20:45 2015 (r280021) +++ projects/release-pkg/Makefile.inc1 Sun Mar 15 10:58:47 2015 (r280022) @@ -333,6 +333,19 @@ LOCALBASE?= /usr/local CROSS_COMPILER_PREFIX?=${CROSS_TOOLCHAIN_PREFIX} CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN_PREFIX} .endif + +# If we do not have a bootstrap binutils (because the in-tree one does not +# support the target architecture), provide a default cross-binutils prefix. +# This allows aarch64 builds, for example, to automatically use the +# aarch64-binutils port or package. +.if !empty(BROKEN_OPTIONS:MBINUTILS_BOOTSTRAP) && \ + !defined(CROSS_BINUTILS_PREFIX) +CROSS_BINUTILS_PREFIX=/usr/local/${TARGET_ARCH}-freebsd/bin/ +.if !exists(${CROSS_BINUTILS_PREFIX}) +.error In-tree binutils does not support the ${TARGET_ARCH} architecture. Install the ${TARGET_ARCH}-binutils port or package or set CROSS_BINUTILS_PREFIX. +.endif +.endif + XCOMPILERS= CC CXX CPP .for COMPILER in ${XCOMPILERS} .if defined(CROSS_COMPILER_PREFIX) @@ -1599,7 +1612,6 @@ cross-tools: .MAKE ${_binutils} \ ${_elftctools} \ ${_cc} \ - usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \ ${_btxld} \ ${_crunchide} \ ${_kgzip} \ Modified: projects/release-pkg/UPDATING ============================================================================== --- projects/release-pkg/UPDATING Sun Mar 15 09:20:45 2015 (r280021) +++ projects/release-pkg/UPDATING Sun Mar 15 10:58:47 2015 (r280022) @@ -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/release-pkg/bin/rcp/Makefile ============================================================================== --- projects/release-pkg/bin/rcp/Makefile Sun Mar 15 09:20:45 2015 (r280021) +++ projects/release-pkg/bin/rcp/Makefile Sun Mar 15 10:58:47 2015 (r280022) @@ -7,6 +7,5 @@ CFLAGS+=-DBINDIR=${BINDIR} BINOWN= root BINMODE=4555 -PRECIOUSPROG= .include <bsd.prog.mk> Modified: projects/release-pkg/cddl/contrib/dtracetoolkit/Proc/pidpersec.d ============================================================================== --- projects/release-pkg/cddl/contrib/dtracetoolkit/Proc/pidpersec.d Sun Mar 15 09:20:45 2015 (r280021) +++ projects/release-pkg/cddl/contrib/dtracetoolkit/Proc/pidpersec.d Sun Mar 15 10:58:47 2015 (r280022) @@ -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/release-pkg/cddl/contrib/opensolaris/common/ctf/ctf_create.c ============================================================================== --- projects/release-pkg/cddl/contrib/opensolaris/common/ctf/ctf_create.c Sun Mar 15 09:20:45 2015 (r280021) +++ projects/release-pkg/cddl/contrib/opensolaris/common/ctf/ctf_create.c Sun Mar 15 10:58:47 2015 (r280022) @@ -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/release-pkg/cddl/contrib/opensolaris/tools/ctf/cvt/output.c ============================================================================== --- projects/release-pkg/cddl/contrib/opensolaris/tools/ctf/cvt/output.c Sun Mar 15 09:20:45 2015 (r280021) +++ projects/release-pkg/cddl/contrib/opensolaris/tools/ctf/cvt/output.c Sun Mar 15 10:58:47 2015 (r280022) @@ -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/release-pkg/contrib/bmake/meta.c ============================================================================== --- projects/release-pkg/contrib/bmake/meta.c Sun Mar 15 09:20:45 2015 (r280021) +++ projects/release-pkg/contrib/bmake/meta.c Sun Mar 15 10:58:47 2015 (r280022) @@ -169,7 +169,7 @@ filemon_read(FILE *mfp, int fd) if ((fp = fdopen(fd, "r")) == NULL) err(1, "Could not read build monitor file '%d'", fd); - fprintf(mfp, "-- filemon acquired metadata --\n"); + fprintf(mfp, "\n-- filemon acquired metadata --\n"); while (fgets(buf, sizeof(buf), fp)) { fprintf(mfp, "%s", buf); Modified: projects/release-pkg/contrib/compiler-rt/lib/builtins/fixdfdi.c ============================================================================== --- projects/release-pkg/contrib/compiler-rt/lib/builtins/fixdfdi.c Sun Mar 15 09:20:45 2015 (r280021) +++ projects/release-pkg/contrib/compiler-rt/lib/builtins/fixdfdi.c Sun Mar 15 10:58:47 2015 (r280022) @@ -6,40 +6,17 @@ * Source Licenses. See LICENSE.TXT for details. * * ===----------------------------------------------------------------------=== - * - * This file implements __fixdfdi for the compiler_rt library. - * - * ===----------------------------------------------------------------------=== */ -#include "int_lib.h" - -/* Returns: convert a to a signed long long, rounding toward zero. */ - -/* Assumption: double is a IEEE 64 bit floating point type - * su_int is a 32 bit integral type - * value in double is representable in di_int (no range checking performed) - */ - -/* seee eeee eeee mmmm mmmm mmmm mmmm mmmm | mmmm mmmm mmmm mmmm mmmm mmmm mmmm mmmm */ - +#define DOUBLE_PRECISION +#include "fp_lib.h" ARM_EABI_FNALIAS(d2lz, fixdfdi) +typedef di_int fixint_t; +typedef du_int fixuint_t; +#include "fp_fixint_impl.inc" + COMPILER_RT_ABI di_int -__fixdfdi(double a) -{ - double_bits fb; - fb.f = a; - int e = ((fb.u.s.high & 0x7FF00000) >> 20) - 1023; - if (e < 0) - return 0; - di_int s = (si_int)(fb.u.s.high & 0x80000000) >> 31; - dwords r; - r.s.high = (fb.u.s.high & 0x000FFFFF) | 0x00100000; - r.s.low = fb.u.s.low; - if (e > 52) - r.all <<= (e - 52); - else - r.all >>= (52 - e); - return (r.all ^ s) - s; -} +__fixdfdi(fp_t a) { + return __fixint(a); +} Modified: projects/release-pkg/contrib/compiler-rt/lib/builtins/fixdfsi.c ============================================================================== --- projects/release-pkg/contrib/compiler-rt/lib/builtins/fixdfsi.c Sun Mar 15 09:20:45 2015 (r280021) +++ projects/release-pkg/contrib/compiler-rt/lib/builtins/fixdfsi.c Sun Mar 15 10:58:47 2015 (r280022) @@ -1,50 +1,22 @@ -//===-- lib/fixdfsi.c - Double-precision -> integer conversion ----*- C -*-===// -// -// The LLVM Compiler Infrastructure -// -// This file is dual licensed under the MIT and the University of Illinois Open -// Source Licenses. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// -// -// This file implements double-precision to integer conversion for the -// compiler-rt library. No range checking is performed; the behavior of this -// conversion is undefined for out of range values in the C standard. -// -//===----------------------------------------------------------------------===// +/* ===-- fixdfsi.c - Implement __fixdfsi -----------------------------------=== + * + * The LLVM Compiler Infrastructure + * + * This file is dual licensed under the MIT and the University of Illinois Open + * Source Licenses. See LICENSE.TXT for details. + * + * ===----------------------------------------------------------------------=== + */ #define DOUBLE_PRECISION #include "fp_lib.h" - -#include "int_lib.h" +typedef si_int fixint_t; +typedef su_int fixuint_t; +#include "fp_fixint_impl.inc" ARM_EABI_FNALIAS(d2iz, fixdfsi) -COMPILER_RT_ABI int +COMPILER_RT_ABI si_int __fixdfsi(fp_t a) { - - // Break a into sign, exponent, significand - const rep_t aRep = toRep(a); - const rep_t aAbs = aRep & absMask; - const int sign = aRep & signBit ? -1 : 1; - const int exponent = (aAbs >> significandBits) - exponentBias; - const rep_t significand = (aAbs & significandMask) | implicitBit; - - // If 0 < exponent < significandBits, right shift to get the result. - if ((unsigned int)exponent < significandBits) { - return sign * (significand >> (significandBits - exponent)); - } - - // If exponent is negative, the result is zero. - else if (exponent < 0) { - return 0; - } - - // If significandBits < exponent, left shift to get the result. This shift - // may end up being larger than the type width, which incurs undefined - // behavior, but the conversion itself is undefined in that case, so - // whatever the compiler decides to do is fine. - else { - return sign * (significand << (exponent - significandBits)); - } + return __fixint(a); } Modified: projects/release-pkg/contrib/compiler-rt/lib/builtins/fixdfti.c ============================================================================== --- projects/release-pkg/contrib/compiler-rt/lib/builtins/fixdfti.c Sun Mar 15 09:20:45 2015 (r280021) +++ projects/release-pkg/contrib/compiler-rt/lib/builtins/fixdfti.c Sun Mar 15 10:58:47 2015 (r280022) @@ -6,40 +6,21 @@ * Source Licenses. See LICENSE.TXT for details. * * ===----------------------------------------------------------------------=== - * - * This file implements __fixdfti for the compiler_rt library. - * - * ===----------------------------------------------------------------------=== */ #include "int_lib.h" #ifdef CRT_HAS_128BIT +#define DOUBLE_PRECISION +#include "fp_lib.h" -/* Returns: convert a to a signed long long, rounding toward zero. */ - -/* Assumption: double is a IEEE 64 bit floating point type - * su_int is a 32 bit integral type - * value in double is representable in ti_int (no range checking performed) - */ - -/* seee eeee eeee mmmm mmmm mmmm mmmm mmmm | mmmm mmmm mmmm mmmm mmmm mmmm mmmm mmmm */ +typedef ti_int fixint_t; +typedef tu_int fixuint_t; +#include "fp_fixint_impl.inc" COMPILER_RT_ABI ti_int -__fixdfti(double a) -{ - double_bits fb; - fb.f = a; - int e = ((fb.u.s.high & 0x7FF00000) >> 20) - 1023; - if (e < 0) - return 0; - ti_int s = (si_int)(fb.u.s.high & 0x80000000) >> 31; - ti_int r = 0x0010000000000000uLL | (0x000FFFFFFFFFFFFFuLL & fb.u.all); - if (e > 52) - r <<= (e - 52); - else - r >>= (52 - e); - return (r ^ s) - s; +__fixdfti(fp_t a) { + return __fixint(a); } #endif /* CRT_HAS_128BIT */ Modified: projects/release-pkg/contrib/compiler-rt/lib/builtins/fixsfdi.c ============================================================================== --- projects/release-pkg/contrib/compiler-rt/lib/builtins/fixsfdi.c Sun Mar 15 09:20:45 2015 (r280021) +++ projects/release-pkg/contrib/compiler-rt/lib/builtins/fixsfdi.c Sun Mar 15 10:58:47 2015 (r280022) @@ -1,43 +1,23 @@ /* ===-- fixsfdi.c - Implement __fixsfdi -----------------------------------=== * - * The LLVM Compiler Infrastructure + * The LLVM Compiler Infrastructure * * This file is dual licensed under the MIT and the University of Illinois Open * Source Licenses. See LICENSE.TXT for details. * * ===----------------------------------------------------------------------=== - * - * This file implements __fixsfdi for the compiler_rt library. - * - * ===----------------------------------------------------------------------=== - */ - -#include "int_lib.h" - -/* Returns: convert a to a signed long long, rounding toward zero. */ - -/* Assumption: float is a IEEE 32 bit floating point type - * su_int is a 32 bit integral type - * value in float is representable in di_int (no range checking performed) */ -/* seee eeee emmm mmmm mmmm mmmm mmmm mmmm */ +#define SINGLE_PRECISION +#include "fp_lib.h" ARM_EABI_FNALIAS(f2lz, fixsfdi) +typedef di_int fixint_t; +typedef du_int fixuint_t; +#include "fp_fixint_impl.inc" + COMPILER_RT_ABI di_int -__fixsfdi(float a) -{ - float_bits fb; - fb.f = a; - int e = ((fb.u & 0x7F800000) >> 23) - 127; - if (e < 0) - return 0; - di_int s = (si_int)(fb.u & 0x80000000) >> 31; - di_int r = (fb.u & 0x007FFFFF) | 0x00800000; - if (e > 23) - r <<= (e - 23); - else - r >>= (23 - e); - return (r ^ s) - s; +__fixsfdi(fp_t a) { + return __fixint(a); } Modified: projects/release-pkg/contrib/compiler-rt/lib/builtins/fixsfsi.c ============================================================================== --- projects/release-pkg/contrib/compiler-rt/lib/builtins/fixsfsi.c Sun Mar 15 09:20:45 2015 (r280021) +++ projects/release-pkg/contrib/compiler-rt/lib/builtins/fixsfsi.c Sun Mar 15 10:58:47 2015 (r280022) @@ -1,47 +1,22 @@ -//===-- lib/fixsfsi.c - Single-precision -> integer conversion ----*- C -*-===// -// -// The LLVM Compiler Infrastructure -// -// This file is dual licensed under the MIT and the University of Illinois Open -// Source Licenses. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// -// -// This file implements single-precision to integer conversion for the -// compiler-rt library. No range checking is performed; the behavior of this -// conversion is undefined for out of range values in the C standard. -// -//===----------------------------------------------------------------------===// +/* ===-- fixsfsi.c - Implement __fixsfsi -----------------------------------=== + * + * The LLVM Compiler Infrastructure + * + * This file is dual licensed under the MIT and the University of Illinois Open + * Source Licenses. See LICENSE.TXT for details. + * + * ===----------------------------------------------------------------------=== + */ #define SINGLE_PRECISION #include "fp_lib.h" +typedef si_int fixint_t; +typedef su_int fixuint_t; +#include "fp_fixint_impl.inc" ARM_EABI_FNALIAS(f2iz, fixsfsi) -COMPILER_RT_ABI int +COMPILER_RT_ABI si_int __fixsfsi(fp_t a) { - // Break a into sign, exponent, significand - const rep_t aRep = toRep(a); - const rep_t aAbs = aRep & absMask; - const int sign = aRep & signBit ? -1 : 1; - const int exponent = (aAbs >> significandBits) - exponentBias; - const rep_t significand = (aAbs & significandMask) | implicitBit; - - // If 0 < exponent < significandBits, right shift to get the result. - if ((unsigned int)exponent < significandBits) { - return sign * (significand >> (significandBits - exponent)); - } - - // If exponent is negative, the result is zero. - else if (exponent < 0) { - return 0; - } - - // If significandBits < exponent, left shift to get the result. This shift - // may end up being larger than the type width, which incurs undefined - // behavior, but the conversion itself is undefined in that case, so - // whatever the compiler decides to do is fine. - else { - return sign * (significand << (exponent - significandBits)); - } + return __fixint(a); } Modified: projects/release-pkg/contrib/compiler-rt/lib/builtins/fixsfti.c ============================================================================== --- projects/release-pkg/contrib/compiler-rt/lib/builtins/fixsfti.c Sun Mar 15 09:20:45 2015 (r280021) +++ projects/release-pkg/contrib/compiler-rt/lib/builtins/fixsfti.c Sun Mar 15 10:58:47 2015 (r280022) @@ -6,40 +6,21 @@ * Source Licenses. See LICENSE.TXT for details. * * ===----------------------------------------------------------------------=== - * - * This file implements __fixsfti for the compiler_rt library. - * - * ===----------------------------------------------------------------------=== */ #include "int_lib.h" #ifdef CRT_HAS_128BIT +#define SINGLE_PRECISION +#include "fp_lib.h" -/* Returns: convert a to a signed long long, rounding toward zero. */ - -/* Assumption: float is a IEEE 32 bit floating point type - * su_int is a 32 bit integral type - * value in float is representable in ti_int (no range checking performed) - */ - -/* seee eeee emmm mmmm mmmm mmmm mmmm mmmm */ +typedef ti_int fixint_t; +typedef tu_int fixuint_t; +#include "fp_fixint_impl.inc" COMPILER_RT_ABI ti_int -__fixsfti(float a) -{ - float_bits fb; - fb.f = a; - int e = ((fb.u & 0x7F800000) >> 23) - 127; - if (e < 0) - return 0; - ti_int s = (si_int)(fb.u & 0x80000000) >> 31; - ti_int r = (fb.u & 0x007FFFFF) | 0x00800000; - if (e > 23) - r <<= (e - 23); - else - r >>= (23 - e); - return (r ^ s) - s; +__fixsfti(fp_t a) { + return __fixint(a); } #endif /* CRT_HAS_128BIT */ Copied: projects/release-pkg/contrib/compiler-rt/lib/builtins/fixtfdi.c (from r280021, head/contrib/compiler-rt/lib/builtins/fixtfdi.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/contrib/compiler-rt/lib/builtins/fixtfdi.c Sun Mar 15 10:58:47 2015 (r280022, copy of r280021, head/contrib/compiler-rt/lib/builtins/fixtfdi.c) @@ -0,0 +1,23 @@ +/* ===-- fixtfdi.c - Implement __fixtfdi -----------------------------------=== + * + * The LLVM Compiler Infrastructure + * + * This file is dual licensed under the MIT and the University of Illinois Open + * Source Licenses. See LICENSE.TXT for details. + * + * ===----------------------------------------------------------------------=== + */ + +#define QUAD_PRECISION +#include "fp_lib.h" + +#if defined(CRT_HAS_128BIT) && defined(CRT_LDBL_128BIT) +typedef di_int fixint_t; +typedef du_int fixuint_t; +#include "fp_fixint_impl.inc" + +COMPILER_RT_ABI di_int +__fixtfdi(fp_t a) { + return __fixint(a); +} +#endif Copied: projects/release-pkg/contrib/compiler-rt/lib/builtins/fixtfsi.c (from r280021, head/contrib/compiler-rt/lib/builtins/fixtfsi.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/contrib/compiler-rt/lib/builtins/fixtfsi.c Sun Mar 15 10:58:47 2015 (r280022, copy of r280021, head/contrib/compiler-rt/lib/builtins/fixtfsi.c) @@ -0,0 +1,23 @@ +/* ===-- fixtfsi.c - Implement __fixtfsi -----------------------------------=== + * + * The LLVM Compiler Infrastructure + * + * This file is dual licensed under the MIT and the University of Illinois Open + * Source Licenses. See LICENSE.TXT for details. + * + * ===----------------------------------------------------------------------=== + */ + +#define QUAD_PRECISION +#include "fp_lib.h" + +#if defined(CRT_HAS_128BIT) && defined(CRT_LDBL_128BIT) +typedef si_int fixint_t; +typedef su_int fixuint_t; +#include "fp_fixint_impl.inc" + +COMPILER_RT_ABI si_int +__fixtfsi(fp_t a) { + return __fixint(a); +} +#endif Copied: projects/release-pkg/contrib/compiler-rt/lib/builtins/fixtfti.c (from r280021, head/contrib/compiler-rt/lib/builtins/fixtfti.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/contrib/compiler-rt/lib/builtins/fixtfti.c Sun Mar 15 10:58:47 2015 (r280022, copy of r280021, head/contrib/compiler-rt/lib/builtins/fixtfti.c) @@ -0,0 +1,23 @@ +/* ===-- fixtfti.c - Implement __fixtfti -----------------------------------=== + * + * The LLVM Compiler Infrastructure + * + * This file is dual licensed under the MIT and the University of Illinois Open + * Source Licenses. See LICENSE.TXT for details. + * + * ===----------------------------------------------------------------------=== + */ + +#define QUAD_PRECISION +#include "fp_lib.h" + +#if defined(CRT_HAS_128BIT) && defined(CRT_LDBL_128BIT) +typedef ti_int fixint_t; +typedef tu_int fixuint_t; +#include "fp_fixint_impl.inc" + +COMPILER_RT_ABI ti_int +__fixtfti(fp_t a) { + return __fixint(a); +} +#endif Modified: projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunsdfdi.c ============================================================================== --- projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunsdfdi.c Sun Mar 15 09:20:45 2015 (r280021) +++ projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunsdfdi.c Sun Mar 15 10:58:47 2015 (r280022) @@ -6,42 +6,16 @@ * Source Licenses. See LICENSE.TXT for details. * * ===----------------------------------------------------------------------=== - * - * This file implements __fixunsdfdi for the compiler_rt library. - * - * ===----------------------------------------------------------------------=== - */ - -#include "int_lib.h" - -/* Returns: convert a to a unsigned long long, rounding toward zero. - * Negative values all become zero. - */ - -/* Assumption: double is a IEEE 64 bit floating point type - * du_int is a 64 bit integral type - * value in double is representable in du_int or is negative - * (no range checking performed) */ -/* seee eeee eeee mmmm mmmm mmmm mmmm mmmm | mmmm mmmm mmmm mmmm mmmm mmmm mmmm mmmm */ +#define DOUBLE_PRECISION +#include "fp_lib.h" +typedef du_int fixuint_t; +#include "fp_fixuint_impl.inc" ARM_EABI_FNALIAS(d2ulz, fixunsdfdi) COMPILER_RT_ABI du_int -__fixunsdfdi(double a) -{ - double_bits fb; - fb.f = a; - int e = ((fb.u.s.high & 0x7FF00000) >> 20) - 1023; - if (e < 0 || (fb.u.s.high & 0x80000000)) - return 0; - udwords r; - r.s.high = (fb.u.s.high & 0x000FFFFF) | 0x00100000; - r.s.low = fb.u.s.low; - if (e > 52) - r.all <<= (e - 52); - else - r.all >>= (52 - e); - return r.all; +__fixunsdfdi(fp_t a) { + return __fixuint(a); } Modified: projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunsdfsi.c ============================================================================== --- projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunsdfsi.c Sun Mar 15 09:20:45 2015 (r280021) +++ projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunsdfsi.c Sun Mar 15 10:58:47 2015 (r280022) @@ -6,39 +6,16 @@ * Source Licenses. See LICENSE.TXT for details. * * ===----------------------------------------------------------------------=== - * - * This file implements __fixunsdfsi for the compiler_rt library. - * - * ===----------------------------------------------------------------------=== - */ - -#include "int_lib.h" - -/* Returns: convert a to a unsigned int, rounding toward zero. - * Negative values all become zero. - */ - -/* Assumption: double is a IEEE 64 bit floating point type - * su_int is a 32 bit integral type - * value in double is representable in su_int or is negative - * (no range checking performed) */ -/* seee eeee eeee mmmm mmmm mmmm mmmm mmmm | mmmm mmmm mmmm mmmm mmmm mmmm mmmm mmmm */ +#define DOUBLE_PRECISION +#include "fp_lib.h" +typedef su_int fixuint_t; +#include "fp_fixuint_impl.inc" ARM_EABI_FNALIAS(d2uiz, fixunsdfsi) COMPILER_RT_ABI su_int -__fixunsdfsi(double a) -{ - double_bits fb; - fb.f = a; - int e = ((fb.u.s.high & 0x7FF00000) >> 20) - 1023; - if (e < 0 || (fb.u.s.high & 0x80000000)) - return 0; - return ( - 0x80000000u | - ((fb.u.s.high & 0x000FFFFF) << 11) | - (fb.u.s.low >> 21) - ) >> (31 - e); +__fixunsdfsi(fp_t a) { + return __fixuint(a); } Modified: projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunsdfti.c ============================================================================== --- projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunsdfti.c Sun Mar 15 09:20:45 2015 (r280021) +++ projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunsdfti.c Sun Mar 15 10:58:47 2015 (r280022) @@ -6,42 +6,18 @@ * Source Licenses. See LICENSE.TXT for details. * * ===----------------------------------------------------------------------=== - * - * This file implements __fixunsdfti for the compiler_rt library. - * - * ===----------------------------------------------------------------------=== */ #include "int_lib.h" #ifdef CRT_HAS_128BIT - -/* Returns: convert a to a unsigned long long, rounding toward zero. - * Negative values all become zero. - */ - -/* Assumption: double is a IEEE 64 bit floating point type - * tu_int is a 64 bit integral type - * value in double is representable in tu_int or is negative - * (no range checking performed) - */ - -/* seee eeee eeee mmmm mmmm mmmm mmmm mmmm | mmmm mmmm mmmm mmmm mmmm mmmm mmmm mmmm */ +#define DOUBLE_PRECISION +#include "fp_lib.h" +typedef tu_int fixuint_t; +#include "fp_fixuint_impl.inc" COMPILER_RT_ABI tu_int -__fixunsdfti(double a) -{ - double_bits fb; - fb.f = a; - int e = ((fb.u.s.high & 0x7FF00000) >> 20) - 1023; - if (e < 0 || (fb.u.s.high & 0x80000000)) - return 0; - tu_int r = 0x0010000000000000uLL | (fb.u.all & 0x000FFFFFFFFFFFFFuLL); - if (e > 52) - r <<= (e - 52); - else - r >>= (52 - e); - return r; +__fixunsdftti(fp_t a) { + return __fixuint(a); } - #endif /* CRT_HAS_128BIT */ Modified: projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunssfdi.c ============================================================================== --- projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunssfdi.c Sun Mar 15 09:20:45 2015 (r280021) +++ projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunssfdi.c Sun Mar 15 10:58:47 2015 (r280022) @@ -6,39 +6,16 @@ * Source Licenses. See LICENSE.TXT for details. * * ===----------------------------------------------------------------------=== - * - * This file implements __fixunssfdi for the compiler_rt library. - * - * ===----------------------------------------------------------------------=== - */ - -#include "int_lib.h" -/* Returns: convert a to a unsigned long long, rounding toward zero. - * Negative values all become zero. - */ - -/* Assumption: float is a IEEE 32 bit floating point type - * du_int is a 64 bit integral type - * value in float is representable in du_int or is negative - * (no range checking performed) */ -/* seee eeee emmm mmmm mmmm mmmm mmmm mmmm */ +#define SINGLE_PRECISION +#include "fp_lib.h" +typedef du_int fixuint_t; +#include "fp_fixuint_impl.inc" ARM_EABI_FNALIAS(f2ulz, fixunssfdi) COMPILER_RT_ABI du_int -__fixunssfdi(float a) -{ - float_bits fb; - fb.f = a; - int e = ((fb.u & 0x7F800000) >> 23) - 127; - if (e < 0 || (fb.u & 0x80000000)) - return 0; - du_int r = (fb.u & 0x007FFFFF) | 0x00800000; - if (e > 23) - r <<= (e - 23); - else - r >>= (23 - e); - return r; +__fixunssfdi(fp_t a) { + return __fixuint(a); } Modified: projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunssfsi.c ============================================================================== --- projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunssfsi.c Sun Mar 15 09:20:45 2015 (r280021) +++ projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunssfsi.c Sun Mar 15 10:58:47 2015 (r280022) @@ -12,34 +12,14 @@ * ===----------------------------------------------------------------------=== */ -#include "int_lib.h" - -/* Returns: convert a to a unsigned int, rounding toward zero. - * Negative values all become zero. - */ - -/* Assumption: float is a IEEE 32 bit floating point type - * su_int is a 32 bit integral type - * value in float is representable in su_int or is negative - * (no range checking performed) - */ - -/* seee eeee emmm mmmm mmmm mmmm mmmm mmmm */ +#define SINGLE_PRECISION +#include "fp_lib.h" +typedef su_int fixuint_t; +#include "fp_fixuint_impl.inc" ARM_EABI_FNALIAS(f2uiz, fixunssfsi) COMPILER_RT_ABI su_int -__fixunssfsi(float a) -{ - float_bits fb; - fb.f = a; - int e = ((fb.u & 0x7F800000) >> 23) - 127; - if (e < 0 || (fb.u & 0x80000000)) - return 0; - su_int r = (fb.u & 0x007FFFFF) | 0x00800000; - if (e > 23) - r <<= (e - 23); - else - r >>= (23 - e); - return r; +__fixunssfsi(fp_t a) { + return __fixuint(a); } Modified: projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunssfti.c ============================================================================== --- projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunssfti.c Sun Mar 15 09:20:45 2015 (r280021) +++ projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunssfti.c Sun Mar 15 10:58:47 2015 (r280022) @@ -12,36 +12,12 @@ * ===----------------------------------------------------------------------=== */ -#include "int_lib.h" - -#ifdef CRT_HAS_128BIT - -/* Returns: convert a to a unsigned long long, rounding toward zero. - * Negative values all become zero. - */ - -/* Assumption: float is a IEEE 32 bit floating point type - * tu_int is a 64 bit integral type - * value in float is representable in tu_int or is negative - * (no range checking performed) - */ - -/* seee eeee emmm mmmm mmmm mmmm mmmm mmmm */ +#if defined(CRT_HAS_128BIT) +typedef tu_int fixuint_t; +#include "fp_fixuint_impl.inc" COMPILER_RT_ABI tu_int -__fixunssfti(float a) -{ - float_bits fb; - fb.f = a; - int e = ((fb.u & 0x7F800000) >> 23) - 127; - if (e < 0 || (fb.u & 0x80000000)) - return 0; - tu_int r = (fb.u & 0x007FFFFF) | 0x00800000; - if (e > 23) - r <<= (e - 23); - else - r >>= (23 - e); - return r; +__fixunssfti(fp_t a) { + return __fixuint(a); } - -#endif /* CRT_HAS_128BIT */ +#endif Copied: projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunstfdi.c (from r280021, head/contrib/compiler-rt/lib/builtins/fixunstfdi.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunstfdi.c Sun Mar 15 10:58:47 2015 (r280022, copy of r280021, head/contrib/compiler-rt/lib/builtins/fixunstfdi.c) @@ -0,0 +1,22 @@ +/* ===-- fixunstfdi.c - Implement __fixunstfdi -----------------------------=== + * + * The LLVM Compiler Infrastructure + * + * This file is dual licensed under the MIT and the University of Illinois Open + * Source Licenses. See LICENSE.TXT for details. + * + * ===----------------------------------------------------------------------=== + */ + +#define QUAD_PRECISION +#include "fp_lib.h" + +#if defined(CRT_HAS_128BIT) && defined(CRT_LDBL_128BIT) +typedef du_int fixuint_t; +#include "fp_fixuint_impl.inc" + +COMPILER_RT_ABI du_int +__fixunstfdi(fp_t a) { + return __fixuint(a); +} +#endif Copied: projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunstfsi.c (from r280021, head/contrib/compiler-rt/lib/builtins/fixunstfsi.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunstfsi.c Sun Mar 15 10:58:47 2015 (r280022, copy of r280021, head/contrib/compiler-rt/lib/builtins/fixunstfsi.c) @@ -0,0 +1,22 @@ +/* ===-- fixunstfsi.c - Implement __fixunstfsi -----------------------------=== + * + * The LLVM Compiler Infrastructure + * + * This file is dual licensed under the MIT and the University of Illinois Open + * Source Licenses. See LICENSE.TXT for details. + * + * ===----------------------------------------------------------------------=== + */ + +#define QUAD_PRECISION +#include "fp_lib.h" + +#if defined(CRT_HAS_128BIT) && defined(CRT_LDBL_128BIT) +typedef su_int fixuint_t; +#include "fp_fixuint_impl.inc" + +COMPILER_RT_ABI su_int +__fixunstfsi(fp_t a) { + return __fixuint(a); +} +#endif Copied: projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunstfti.c (from r280021, head/contrib/compiler-rt/lib/builtins/fixunstfti.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunstfti.c Sun Mar 15 10:58:47 2015 (r280022, copy of r280021, head/contrib/compiler-rt/lib/builtins/fixunstfti.c) @@ -0,0 +1,22 @@ +/* ===-- fixunstfsi.c - Implement __fixunstfsi -----------------------------=== + * + * The LLVM Compiler Infrastructure + * + * This file is dual licensed under the MIT and the University of Illinois Open + * Source Licenses. See LICENSE.TXT for details. + * + * ===----------------------------------------------------------------------=== + */ + +#define QUAD_PRECISION +#include "fp_lib.h" + +#if defined(CRT_HAS_128BIT) && defined(CRT_LDBL_128BIT) +typedef tu_int fixuint_t; +#include "fp_fixuint_impl.inc" + +COMPILER_RT_ABI tu_int +__fixunstfti(fp_t a) { + return __fixuint(a); +} +#endif Modified: projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunsxfdi.c ============================================================================== --- projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunsxfdi.c Sun Mar 15 09:20:45 2015 (r280021) +++ projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunsxfdi.c Sun Mar 15 10:58:47 2015 (r280022) @@ -38,6 +38,8 @@ __fixunsxfdi(long double a) int e = (fb.u.high.s.low & 0x00007FFF) - 16383; if (e < 0 || (fb.u.high.s.low & 0x00008000)) return 0; + if ((unsigned)e > sizeof(du_int) * CHAR_BIT) + return ~(du_int)0; return fb.u.low.all >> (63 - e); } Modified: projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunsxfsi.c ============================================================================== --- projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunsxfsi.c Sun Mar 15 09:20:45 2015 (r280021) +++ projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunsxfsi.c Sun Mar 15 10:58:47 2015 (r280022) @@ -23,7 +23,6 @@ /* Assumption: long double is an intel 80 bit floating point type padded with 6 bytes * su_int is a 32 bit integral type * value in long double is representable in su_int or is negative - * (no range checking performed) */ /* gggg gggg gggg gggg gggg gggg gggg gggg | gggg gggg gggg gggg seee eeee eeee eeee | @@ -38,6 +37,8 @@ __fixunsxfsi(long double a) int e = (fb.u.high.s.low & 0x00007FFF) - 16383; if (e < 0 || (fb.u.high.s.low & 0x00008000)) return 0; + if ((unsigned)e > sizeof(su_int) * CHAR_BIT) + return ~(su_int)0; return fb.u.low.s.high >> (31 - e); } Modified: projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunsxfti.c ============================================================================== --- projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunsxfti.c Sun Mar 15 09:20:45 2015 (r280021) +++ projects/release-pkg/contrib/compiler-rt/lib/builtins/fixunsxfti.c Sun Mar 15 10:58:47 2015 (r280022) @@ -21,9 +21,8 @@ */ /* Assumption: long double is an intel 80 bit floating point type padded with 6 bytes - * tu_int is a 64 bit integral type + * tu_int is a 128 bit integral type * value in long double is representable in tu_int or is negative - * (no range checking performed) */ /* gggg gggg gggg gggg gggg gggg gggg gggg | gggg gggg gggg gggg seee eeee eeee eeee | @@ -38,6 +37,8 @@ __fixunsxfti(long double a) int e = (fb.u.high.s.low & 0x00007FFF) - 16383; if (e < 0 || (fb.u.high.s.low & 0x00008000)) return 0; + if ((unsigned)e > sizeof(tu_int) * CHAR_BIT) + return ~(tu_int)0; tu_int r = fb.u.low.all; if (e > 63) r <<= (e - 63); Modified: projects/release-pkg/contrib/compiler-rt/lib/builtins/fixxfdi.c ============================================================================== --- projects/release-pkg/contrib/compiler-rt/lib/builtins/fixxfdi.c Sun Mar 15 09:20:45 2015 (r280021) +++ projects/release-pkg/contrib/compiler-rt/lib/builtins/fixxfdi.c Sun Mar 15 10:58:47 2015 (r280022) @@ -19,7 +19,7 @@ /* Returns: convert a to a signed long long, rounding toward zero. */ /* Assumption: long double is an intel 80 bit floating point type padded with 6 bytes - * su_int is a 32 bit integral type + * di_int is a 64 bit integral type * value in long double is representable in di_int (no range checking performed) */ @@ -30,11 +30,15 @@ COMPILER_RT_ABI di_int __fixxfdi(long double a) { + const di_int di_max = (di_int)((~(du_int)0) / 2); + const di_int di_min = -di_max - 1; long_double_bits fb; fb.f = a; int e = (fb.u.high.s.low & 0x00007FFF) - 16383; if (e < 0) return 0; + if ((unsigned)e >= sizeof(di_int) * CHAR_BIT) + return a > 0 ? di_max : di_min; di_int s = -(si_int)((fb.u.high.s.low & 0x00008000) >> 15); di_int r = fb.u.low.all; r = (du_int)r >> (63 - e); Modified: projects/release-pkg/contrib/compiler-rt/lib/builtins/fixxfti.c ============================================================================== --- projects/release-pkg/contrib/compiler-rt/lib/builtins/fixxfti.c Sun Mar 15 09:20:45 2015 (r280021) +++ projects/release-pkg/contrib/compiler-rt/lib/builtins/fixxfti.c Sun Mar 15 10:58:47 2015 (r280022) @@ -19,8 +19,8 @@ /* Returns: convert a to a signed long long, rounding toward zero. */ /* Assumption: long double is an intel 80 bit floating point type padded with 6 bytes - * su_int is a 32 bit integral type *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503151058.t2FAwmtv079153>