svn commit: r281144 - in projects/ifnet: contrib/binutils/bfd contrib/binutils/include/elf contrib/ipfilter/ipsend contrib/ipfilter/lib contrib/ipfilter/tools contrib/llvm contrib/llvm/patches cont...
Gleb Smirnoff
glebius at FreeBSD.org
Mon Apr 6 09:52:31 UTC 2015
Author: glebius
Date: Mon Apr 6 09:52:16 2015
New Revision: 281144
URL: https://svnweb.freebsd.org/changeset/base/281144
Log:
Merge head r257698 through r281143.
Added:
projects/ifnet/contrib/llvm/patches/patch-12-clang-r227115-constantarraytype.diff
- copied unchanged from r281143, head/contrib/llvm/patches/patch-12-clang-r227115-constantarraytype.diff
projects/ifnet/contrib/llvm/tools/llvm-cov/
- copied from r281143, head/contrib/llvm/tools/llvm-cov/
projects/ifnet/contrib/llvm/tools/llvm-profdata/
- copied from r281143, head/contrib/llvm/tools/llvm-profdata/
projects/ifnet/sys/boot/efi/fdt/
- copied from r281143, head/sys/boot/efi/fdt/
projects/ifnet/sys/boot/forth/Makefile
- copied unchanged from r281143, head/sys/boot/forth/Makefile
projects/ifnet/sys/boot/i386/libi386/smbios.h
- copied unchanged from r281143, head/sys/boot/i386/libi386/smbios.h
projects/ifnet/sys/dev/hwpmc/hwpmc_mips74k.c
- copied unchanged from r281143, head/sys/dev/hwpmc/hwpmc_mips74k.c
projects/ifnet/sys/powerpc/mpc85xx/mpc85xx_gpio.c
- copied unchanged from r281143, head/sys/powerpc/mpc85xx/mpc85xx_gpio.c
projects/ifnet/sys/powerpc/powerpc/trap.c
- copied unchanged from r281143, head/sys/powerpc/powerpc/trap.c
projects/ifnet/usr.bin/clang/llvm-cov/
- copied from r281143, head/usr.bin/clang/llvm-cov/
projects/ifnet/usr.bin/clang/llvm-profdata/
- copied from r281143, head/usr.bin/clang/llvm-profdata/
Deleted:
projects/ifnet/sys/powerpc/aim/trap.c
projects/ifnet/sys/powerpc/booke/trap.c
Modified:
projects/ifnet/contrib/binutils/bfd/elf-bfd.h
projects/ifnet/contrib/binutils/bfd/elf32-arm.c
projects/ifnet/contrib/binutils/include/elf/arm.h
projects/ifnet/contrib/ipfilter/ipsend/44arp.c
projects/ifnet/contrib/ipfilter/ipsend/ip.c
projects/ifnet/contrib/ipfilter/ipsend/resend.c
projects/ifnet/contrib/ipfilter/lib/kmem.c
projects/ifnet/contrib/ipfilter/tools/ipfs.c
projects/ifnet/contrib/ipfilter/tools/ipnat.c
projects/ifnet/contrib/ipfilter/tools/ipnat_y.y
projects/ifnet/contrib/ipfilter/tools/ippool.c
projects/ifnet/contrib/ipfilter/tools/ippool_y.y
projects/ifnet/contrib/llvm/FREEBSD-Xlist
projects/ifnet/contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp
projects/ifnet/etc/Makefile
projects/ifnet/etc/login.conf
projects/ifnet/etc/rc.d/pflog
projects/ifnet/include/pthread.h
projects/ifnet/include/signal.h
projects/ifnet/include/stdlib.h
projects/ifnet/lib/libc/gen/fts.c
projects/ifnet/lib/libc/net/getaddrinfo.c
projects/ifnet/lib/libc/net/name6.c
projects/ifnet/lib/libc/string/strlcat.c
projects/ifnet/lib/libc/string/strlcpy.c
projects/ifnet/lib/libpmc/libpmc.c
projects/ifnet/libexec/rtld-elf/mips/reloc.c
projects/ifnet/sbin/ifconfig/af_inet.c
projects/ifnet/sbin/ifconfig/af_inet6.c
projects/ifnet/sbin/ifconfig/af_nd6.c
projects/ifnet/sbin/ifconfig/carp.c
projects/ifnet/sbin/ifconfig/ifconfig.c
projects/ifnet/sbin/ifconfig/ifvlan.c
projects/ifnet/sbin/ifconfig/ifvxlan.c
projects/ifnet/share/man/man4/inet.4
projects/ifnet/share/man/man5/src.conf.5
projects/ifnet/share/mk/bsd.progs.mk
projects/ifnet/sys/arm/allwinner/a10_clk.c
projects/ifnet/sys/arm/allwinner/a10_common.c
projects/ifnet/sys/arm/allwinner/a10_gpio.c
projects/ifnet/sys/arm/allwinner/a10_sramc.c
projects/ifnet/sys/arm/allwinner/a10_wdog.c
projects/ifnet/sys/arm/allwinner/a20/a20_cpu_cfg.c
projects/ifnet/sys/arm/allwinner/a20/a20_mp.c
projects/ifnet/sys/arm/allwinner/timer.c
projects/ifnet/sys/arm/altera/socfpga/socfpga_gpio.c
projects/ifnet/sys/arm/altera/socfpga/socfpga_manager.c
projects/ifnet/sys/arm/altera/socfpga/socfpga_mp.c
projects/ifnet/sys/arm/amlogic/aml8726/aml8726_fb.c
projects/ifnet/sys/arm/amlogic/aml8726/aml8726_mp.c
projects/ifnet/sys/arm/arm/generic_timer.c
projects/ifnet/sys/arm/arm/intr.c
projects/ifnet/sys/arm/arm/mpcore_timer.c
projects/ifnet/sys/arm/arm/pmu.c
projects/ifnet/sys/arm/at91/at91_common.c
projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_common.c
projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_fbd.c
projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_spi.c
projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_systimer.c
projects/ifnet/sys/arm/broadcom/bcm2835/bcm2835_wdog.c
projects/ifnet/sys/arm/freescale/imx/imx51_ccm.c
projects/ifnet/sys/arm/freescale/imx/imx51_ipuv3.c
projects/ifnet/sys/arm/freescale/imx/imx51_ipuv3_fbd.c
projects/ifnet/sys/arm/freescale/imx/imx6_anatop.c
projects/ifnet/sys/arm/freescale/imx/imx6_audmux.c
projects/ifnet/sys/arm/freescale/imx/imx6_mp.c
projects/ifnet/sys/arm/freescale/imx/imx6_sdma.c
projects/ifnet/sys/arm/freescale/imx/imx6_ssi.c
projects/ifnet/sys/arm/freescale/imx/imx_common.c
projects/ifnet/sys/arm/freescale/imx/imx_gpt.c
projects/ifnet/sys/arm/freescale/imx/imx_iomux.c
projects/ifnet/sys/arm/freescale/imx/imx_wdog.c
projects/ifnet/sys/arm/freescale/vybrid/vf_adc.c
projects/ifnet/sys/arm/freescale/vybrid/vf_anadig.c
projects/ifnet/sys/arm/freescale/vybrid/vf_ccm.c
projects/ifnet/sys/arm/freescale/vybrid/vf_dcu4.c
projects/ifnet/sys/arm/freescale/vybrid/vf_dmamux.c
projects/ifnet/sys/arm/freescale/vybrid/vf_edma.c
projects/ifnet/sys/arm/freescale/vybrid/vf_gpio.c
projects/ifnet/sys/arm/freescale/vybrid/vf_i2c.c
projects/ifnet/sys/arm/freescale/vybrid/vf_iomuxc.c
projects/ifnet/sys/arm/freescale/vybrid/vf_mscm.c
projects/ifnet/sys/arm/freescale/vybrid/vf_nfc.c
projects/ifnet/sys/arm/freescale/vybrid/vf_port.c
projects/ifnet/sys/arm/freescale/vybrid/vf_sai.c
projects/ifnet/sys/arm/freescale/vybrid/vf_spi.c
projects/ifnet/sys/arm/freescale/vybrid/vf_src.c
projects/ifnet/sys/arm/freescale/vybrid/vf_tcon.c
projects/ifnet/sys/arm/freescale/vybrid/vf_uart.c
projects/ifnet/sys/arm/include/fdt.h
projects/ifnet/sys/arm/mv/armadaxp/armadaxp_mp.c
projects/ifnet/sys/arm/mv/gpio.c
projects/ifnet/sys/arm/mv/mv_localbus.c
projects/ifnet/sys/arm/mv/mv_ts.c
projects/ifnet/sys/arm/mv/mvvar.h
projects/ifnet/sys/arm/rockchip/rk30xx_common.c
projects/ifnet/sys/arm/rockchip/rk30xx_gpio.c
projects/ifnet/sys/arm/rockchip/rk30xx_grf.c
projects/ifnet/sys/arm/rockchip/rk30xx_mp.c
projects/ifnet/sys/arm/rockchip/rk30xx_pmu.c
projects/ifnet/sys/arm/samsung/exynos/exynos5_mp.c
projects/ifnet/sys/arm/ti/am335x/am335x_dmtimer.c
projects/ifnet/sys/arm/ti/am335x/am335x_prcm.c
projects/ifnet/sys/arm/ti/omap4/omap4_mp.c
projects/ifnet/sys/arm/ti/ti_common.c
projects/ifnet/sys/arm/ti/ti_mbox.c
projects/ifnet/sys/arm/ti/ti_pruss.c
projects/ifnet/sys/arm/ti/ti_wdt.c
projects/ifnet/sys/arm/versatile/pl050.c
projects/ifnet/sys/arm/versatile/sp804.c
projects/ifnet/sys/arm/versatile/versatile_clcd.c
projects/ifnet/sys/arm/versatile/versatile_common.c
projects/ifnet/sys/arm/versatile/versatile_pci.c
projects/ifnet/sys/arm/versatile/versatile_timer.c
projects/ifnet/sys/arm/xilinx/zy7_mp.c
projects/ifnet/sys/boot/Makefile
projects/ifnet/sys/boot/common/Makefile.inc
projects/ifnet/sys/boot/efi/Makefile
projects/ifnet/sys/boot/efi/Makefile.inc
projects/ifnet/sys/boot/efi/boot1/Makefile
projects/ifnet/sys/boot/efi/boot1/boot1.c
projects/ifnet/sys/boot/efi/loader/Makefile
projects/ifnet/sys/boot/efi/loader/bootinfo.c
projects/ifnet/sys/boot/efi/loader/main.c
projects/ifnet/sys/boot/i386/libi386/libi386.h
projects/ifnet/sys/boot/i386/libi386/smbios.c
projects/ifnet/sys/boot/i386/loader/main.c
projects/ifnet/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
projects/ifnet/sys/conf/files.mips
projects/ifnet/sys/conf/files.powerpc
projects/ifnet/sys/dev/ath/ath_hal/ar5212/ar5212.h
projects/ifnet/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
projects/ifnet/sys/dev/atkbdc/psm.c
projects/ifnet/sys/dev/hwpmc/hwpmc_core.c
projects/ifnet/sys/dev/hwpmc/hwpmc_intel.c
projects/ifnet/sys/dev/hwpmc/pmc_events.h
projects/ifnet/sys/dev/ichsmb/ichsmb_pci.c
projects/ifnet/sys/dev/iscsi/icl_conn_if.m
projects/ifnet/sys/dev/iscsi/icl_soft.c
projects/ifnet/sys/dev/iscsi/icl_wrappers.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_cpu_fdt.h
projects/ifnet/sys/dev/usb/wlan/if_urtwn.c
projects/ifnet/sys/fs/msdosfs/msdosfs_fat.c
projects/ifnet/sys/fs/msdosfs/msdosfs_vfsops.c
projects/ifnet/sys/kern/subr_vmem.c
projects/ifnet/sys/kern/sysv_shm.c
projects/ifnet/sys/kern/vfs_syscalls.c
projects/ifnet/sys/mips/conf/DIR-655A1.hints
projects/ifnet/sys/mips/conf/DIR-825C1.hints
projects/ifnet/sys/modules/i2c/iicbb/Makefile
projects/ifnet/sys/powerpc/aim/machdep.c
projects/ifnet/sys/powerpc/include/trap.h
projects/ifnet/sys/sys/mbuf.h
projects/ifnet/sys/sys/mouse.h
projects/ifnet/sys/sys/pmc.h
projects/ifnet/sys/sys/vmem.h
projects/ifnet/sys/vm/uma_core.c
projects/ifnet/sys/vm/vm_fault.c
projects/ifnet/tools/build/options/WITHOUT_CXX
projects/ifnet/tools/tools/ath/athratestats/main.c
projects/ifnet/tools/tools/ath/athstats/athstats.c
projects/ifnet/tools/tools/cxgbtool/cxgbtool.c
projects/ifnet/tools/tools/iwn/iwnstats/iwn_ioctl.c
projects/ifnet/usr.bin/bluetooth/btsockstat/btsockstat.c
projects/ifnet/usr.bin/clang/Makefile
projects/ifnet/usr.bin/kdump/mkioctls
projects/ifnet/usr.bin/netstat/bpf.c
projects/ifnet/usr.bin/netstat/if.c
projects/ifnet/usr.bin/netstat/inet6.c
projects/ifnet/usr.bin/sort/bwstring.c
projects/ifnet/usr.bin/sort/coll.c
projects/ifnet/usr.bin/sort/file.c
projects/ifnet/usr.bin/sort/file.h
projects/ifnet/usr.bin/sort/mem.c
projects/ifnet/usr.bin/sort/radixsort.c
projects/ifnet/usr.bin/sort/sort.1.in
projects/ifnet/usr.bin/sort/sort.c
projects/ifnet/usr.sbin/amd/include/config.h
projects/ifnet/usr.sbin/ancontrol/ancontrol.c
projects/ifnet/usr.sbin/bluetooth/bthidd/hid.c
projects/ifnet/usr.sbin/ctld/ctld.c
projects/ifnet/usr.sbin/ifmcstat/ifmcstat.c
projects/ifnet/usr.sbin/ip6addrctl/ip6addrctl.c
projects/ifnet/usr.sbin/mld6query/mld6.c
projects/ifnet/usr.sbin/ndp/ndp.c
projects/ifnet/usr.sbin/ntp/config.h
projects/ifnet/usr.sbin/pkg/pkg.c
projects/ifnet/usr.sbin/ppp/iface.c
projects/ifnet/usr.sbin/rip6query/rip6query.c
projects/ifnet/usr.sbin/route6d/route6d.c
projects/ifnet/usr.sbin/rrenumd/lexer.l
projects/ifnet/usr.sbin/rrenumd/parser.y
projects/ifnet/usr.sbin/rtadvctl/rtadvctl.c
projects/ifnet/usr.sbin/rtadvd/config.c
projects/ifnet/usr.sbin/rtadvd/if.c
projects/ifnet/usr.sbin/rtadvd/rrenum.c
projects/ifnet/usr.sbin/rtadvd/rtadvd.c
projects/ifnet/usr.sbin/rtsold/if.c
projects/ifnet/usr.sbin/rtsold/probe.c
projects/ifnet/usr.sbin/rtsold/rtsold.c
projects/ifnet/usr.sbin/uhsoctl/uhsoctl.c
projects/ifnet/usr.sbin/wpa/ndis_events/ndis_events.c
projects/ifnet/usr.sbin/wpa/wpa_supplicant/Packet32.c
Directory Properties:
projects/ifnet/ (props changed)
projects/ifnet/contrib/binutils/ (props changed)
projects/ifnet/contrib/ipfilter/ (props changed)
projects/ifnet/contrib/llvm/ (props changed)
projects/ifnet/contrib/llvm/tools/clang/ (props changed)
projects/ifnet/etc/ (props changed)
projects/ifnet/include/ (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/boot/ (props changed)
projects/ifnet/sys/cddl/contrib/opensolaris/ (props changed)
projects/ifnet/sys/conf/ (props changed)
projects/ifnet/usr.sbin/rtadvctl/ (props changed)
projects/ifnet/usr.sbin/rtadvd/ (props changed)
projects/ifnet/usr.sbin/rtsold/ (props changed)
Modified: projects/ifnet/contrib/binutils/bfd/elf-bfd.h
==============================================================================
--- projects/ifnet/contrib/binutils/bfd/elf-bfd.h Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/contrib/binutils/bfd/elf-bfd.h Mon Apr 6 09:52:16 2015 (r281144)
@@ -1286,7 +1286,7 @@ struct elf_find_verdep_info
};
/* The maximum number of known object attributes for any target. */
-#define NUM_KNOWN_OBJ_ATTRIBUTES 32
+#define NUM_KNOWN_OBJ_ATTRIBUTES 71
/* The value of an object attribute. type & 1 indicates whether there
is an integer value; type & 2 indicates whether there is a string
Modified: projects/ifnet/contrib/binutils/bfd/elf32-arm.c
==============================================================================
--- projects/ifnet/contrib/binutils/bfd/elf32-arm.c Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/contrib/binutils/bfd/elf32-arm.c Mon Apr 6 09:52:16 2015 (r281144)
@@ -6835,6 +6835,8 @@ elf32_arm_merge_eabi_attributes (bfd *ib
case Tag_ABI_FP_number_model:
case Tag_ABI_align8_preserved:
case Tag_ABI_HardFP_use:
+ case Tag_CPU_unaligned_access:
+ case Tag_FP_HP_extension:
/* Use the largest value specified. */
if (in_attr[i].i > out_attr[i].i)
out_attr[i].i = in_attr[i].i;
@@ -6951,7 +6953,9 @@ elf32_arm_merge_eabi_attributes (bfd *ib
}
break;
default: /* All known attributes should be explicitly covered. */
- abort ();
+ /* XXX Not now */
+ /* abort (); */
+ break;
}
}
Modified: projects/ifnet/contrib/binutils/include/elf/arm.h
==============================================================================
--- projects/ifnet/contrib/binutils/include/elf/arm.h Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/contrib/binutils/include/elf/arm.h Mon Apr 6 09:52:16 2015 (r281144)
@@ -271,7 +271,11 @@ enum
Tag_ABI_optimization_goals,
Tag_ABI_FP_optimization_goals,
/* 32 is generic. */
-
+ Tag_CPU_unaligned_access = 34,
+ Tag_FP_HP_extension = 36,
+ Tag_ABI_FP_16bit_format = 38,
+ Tag_MPextension_use = 42,
+ Tag_DIV_use = 44,
Tag_Virtualization_use = 68,
};
Modified: projects/ifnet/contrib/ipfilter/ipsend/44arp.c
==============================================================================
--- projects/ifnet/contrib/ipfilter/ipsend/44arp.c Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/contrib/ipfilter/ipsend/44arp.c Mon Apr 6 09:52:16 2015 (r281144)
@@ -8,9 +8,6 @@
#include <sys/socket.h>
#include <sys/sysctl.h>
#include <net/if.h>
-#if __FreeBSD_version >= 300000
-# include <net/if_var.h>
-#endif
#include <net/if_dl.h>
#include <net/if_types.h>
#ifndef __osf__
Modified: projects/ifnet/contrib/ipfilter/ipsend/ip.c
==============================================================================
--- projects/ifnet/contrib/ipfilter/ipsend/ip.c Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/contrib/ipfilter/ipsend/ip.c Mon Apr 6 09:52:16 2015 (r281144)
@@ -21,9 +21,6 @@ static const char rcsid[] = "@(#)$Id$";
# include <net/route.h>
# include <netinet/if_ether.h>
# include <netinet/ip_var.h>
-# if __FreeBSD_version >= 300000
-# include <net/if_var.h>
-# endif
#endif
#include <errno.h>
#include <stdio.h>
Modified: projects/ifnet/contrib/ipfilter/ipsend/resend.c
==============================================================================
--- projects/ifnet/contrib/ipfilter/ipsend/resend.c Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/contrib/ipfilter/ipsend/resend.c Mon Apr 6 09:52:16 2015 (r281144)
@@ -22,9 +22,6 @@ static const char rcsid[] = "@(#)$Id$";
#ifndef linux
# include <netinet/ip_var.h>
# include <netinet/if_ether.h>
-# if __FreeBSD_version >= 300000
-# include <net/if_var.h>
-# endif
#endif
#include <stdio.h>
#include <netdb.h>
Modified: projects/ifnet/contrib/ipfilter/lib/kmem.c
==============================================================================
--- projects/ifnet/contrib/ipfilter/lib/kmem.c Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/contrib/ipfilter/lib/kmem.c Mon Apr 6 09:52:16 2015 (r281144)
@@ -29,9 +29,6 @@
#include <netinet/in_systm.h>
#include <netinet/ip.h>
#include <net/if.h>
-#if __FreeBSD_version >= 300000
-# include <net/if_var.h>
-#endif
#if defined(linux) || defined(__osf__) || defined(__sgi) || defined(__hpux)
# include <stdlib.h>
#endif
Modified: projects/ifnet/contrib/ipfilter/tools/ipfs.c
==============================================================================
--- projects/ifnet/contrib/ipfilter/tools/ipfs.c Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/contrib/ipfilter/tools/ipfs.c Mon Apr 6 09:52:16 2015 (r281144)
@@ -33,9 +33,6 @@
#include <netinet/in_systm.h>
#include <sys/time.h>
#include <net/if.h>
-#if __FreeBSD_version >= 300000
-# include <net/if_var.h>
-#endif
#include <netinet/ip.h>
#include <netdb.h>
#include <arpa/nameser.h>
Modified: projects/ifnet/contrib/ipfilter/tools/ipnat.c
==============================================================================
--- projects/ifnet/contrib/ipfilter/tools/ipnat.c Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/contrib/ipfilter/tools/ipnat.c Mon Apr 6 09:52:16 2015 (r281144)
@@ -37,9 +37,6 @@
#include <netinet/ip.h>
#include <netinet/tcp.h>
#include <net/if.h>
-#if __FreeBSD_version >= 300000
-# include <net/if_var.h>
-#endif
#include <netdb.h>
#include <arpa/nameser.h>
#include <arpa/inet.h>
Modified: projects/ifnet/contrib/ipfilter/tools/ipnat_y.y
==============================================================================
--- projects/ifnet/contrib/ipfilter/tools/ipnat_y.y Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/contrib/ipfilter/tools/ipnat_y.y Mon Apr 6 09:52:16 2015 (r281144)
@@ -35,9 +35,6 @@
#include <sys/time.h>
#include <syslog.h>
#include <net/if.h>
-#if __FreeBSD_version >= 300000
-# include <net/if_var.h>
-#endif
#include <netdb.h>
#include <arpa/nameser.h>
#include <resolv.h>
Modified: projects/ifnet/contrib/ipfilter/tools/ippool.c
==============================================================================
--- projects/ifnet/contrib/ipfilter/tools/ippool.c Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/contrib/ipfilter/tools/ippool.c Mon Apr 6 09:52:16 2015 (r281144)
@@ -15,9 +15,6 @@
#include <sys/ioctl.h>
#include <net/if.h>
-#if __FreeBSD_version >= 300000
-# include <net/if_var.h>
-#endif
#include <netinet/in.h>
#include <arpa/inet.h>
Modified: projects/ifnet/contrib/ipfilter/tools/ippool_y.y
==============================================================================
--- projects/ifnet/contrib/ipfilter/tools/ippool_y.y Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/contrib/ipfilter/tools/ippool_y.y Mon Apr 6 09:52:16 2015 (r281144)
@@ -16,9 +16,6 @@
#include <sys/ioctl.h>
#include <net/if.h>
-#if __FreeBSD_version >= 300000
-# include <net/if_var.h>
-#endif
#include <netinet/in.h>
#include <arpa/inet.h>
Modified: projects/ifnet/contrib/llvm/FREEBSD-Xlist
==============================================================================
--- projects/ifnet/contrib/llvm/FREEBSD-Xlist Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/contrib/llvm/FREEBSD-Xlist Mon Apr 6 09:52:16 2015 (r281144)
@@ -397,7 +397,9 @@ tools/llvm-bcanalyzer/LLVMBuild.txt
tools/llvm-bcanalyzer/Makefile
tools/llvm-c-test/
tools/llvm-config/
-tools/llvm-cov/
+tools/llvm-cov/CMakeLists.txt
+tools/llvm-cov/LLVMBuild.txt
+tools/llvm-cov/Makefile
tools/llvm-diff/CMakeLists.txt
tools/llvm-diff/LLVMBuild.txt
tools/llvm-diff/Makefile
@@ -424,7 +426,9 @@ tools/llvm-nm/Makefile
tools/llvm-objdump/CMakeLists.txt
tools/llvm-objdump/LLVMBuild.txt
tools/llvm-objdump/Makefile
-tools/llvm-profdata/
+tools/llvm-profdata/CMakeLists.txt
+tools/llvm-profdata/LLVMBuild.txt
+tools/llvm-profdata/Makefile
tools/llvm-readobj/CMakeLists.txt
tools/llvm-readobj/LLVMBuild.txt
tools/llvm-readobj/Makefile
Copied: projects/ifnet/contrib/llvm/patches/patch-12-clang-r227115-constantarraytype.diff (from r281143, head/contrib/llvm/patches/patch-12-clang-r227115-constantarraytype.diff)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/ifnet/contrib/llvm/patches/patch-12-clang-r227115-constantarraytype.diff Mon Apr 6 09:52:16 2015 (r281144, copy of r281143, head/contrib/llvm/patches/patch-12-clang-r227115-constantarraytype.diff)
@@ -0,0 +1,50 @@
+Pull in r227115 from upstream clang trunk (by Ben Langmuir):
+
+ Fix assert instantiating string init of static variable
+
+ ... when the variable's type is a typedef of a ConstantArrayType. Just
+ look through the typedef (and any other sugar). We only use the
+ constant array type here to get the element count.
+
+This fixes an assertion failure when building the games/redeclipse port.
+
+Introduced here: http://svnweb.freebsd.org/changeset/base/281046
+
+Index: tools/clang/lib/Sema/SemaInit.cpp
+===================================================================
+--- tools/clang/lib/Sema/SemaInit.cpp
++++ tools/clang/lib/Sema/SemaInit.cpp
+@@ -149,10 +149,10 @@ static void updateStringLiteralType(Expr *E, QualT
+ static void CheckStringInit(Expr *Str, QualType &DeclT, const ArrayType *AT,
+ Sema &S) {
+ // Get the length of the string as parsed.
+- uint64_t StrLength =
+- cast<ConstantArrayType>(Str->getType())->getSize().getZExtValue();
++ auto *ConstantArrayTy =
++ cast<ConstantArrayType>(Str->getType()->getUnqualifiedDesugaredType());
++ uint64_t StrLength = ConstantArrayTy->getSize().getZExtValue();
+
+-
+ if (const IncompleteArrayType *IAT = dyn_cast<IncompleteArrayType>(AT)) {
+ // C99 6.7.8p14. We have an array of character type with unknown size
+ // being initialized to a string literal.
+Index: tools/clang/test/SemaTemplate/instantiate-static-var.cpp
+===================================================================
+--- tools/clang/test/SemaTemplate/instantiate-static-var.cpp
++++ tools/clang/test/SemaTemplate/instantiate-static-var.cpp
+@@ -114,3 +114,15 @@ namespace PR6449 {
+ template class X1<char>;
+
+ }
++
++typedef char MyString[100];
++template <typename T>
++struct StaticVarWithTypedefString {
++ static MyString str;
++};
++template <typename T>
++MyString StaticVarWithTypedefString<T>::str = "";
++
++void testStaticVarWithTypedefString() {
++ (void)StaticVarWithTypedefString<int>::str;
++}
Modified: projects/ifnet/contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp
==============================================================================
--- projects/ifnet/contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/contrib/llvm/tools/clang/lib/Sema/SemaInit.cpp Mon Apr 6 09:52:16 2015 (r281144)
@@ -149,9 +149,9 @@ static void updateStringLiteralType(Expr
static void CheckStringInit(Expr *Str, QualType &DeclT, const ArrayType *AT,
Sema &S) {
// Get the length of the string as parsed.
- uint64_t StrLength =
- cast<ConstantArrayType>(Str->getType())->getSize().getZExtValue();
-
+ auto *ConstantArrayTy =
+ cast<ConstantArrayType>(Str->getType()->getUnqualifiedDesugaredType());
+ uint64_t StrLength = ConstantArrayTy->getSize().getZExtValue();
if (const IncompleteArrayType *IAT = dyn_cast<IncompleteArrayType>(AT)) {
// C99 6.7.8p14. We have an array of character type with unknown size
Modified: projects/ifnet/etc/Makefile
==============================================================================
--- projects/ifnet/etc/Makefile Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/etc/Makefile Mon Apr 6 09:52:16 2015 (r281144)
@@ -379,7 +379,7 @@ distrib-dirs: ${MTREES:N/*}
test "$$d" == "/" && d=""; \
d=${DISTBASE}$$d; \
shift; \
- test -d $$d || mkdir -p $$d; \
+ test -d ${DESTDIR}/$$d || mkdir -p ${DESTDIR}/$$d; \
${ECHO} "${MTREE_CMD:N-W} -C -f $$m -K uname,gname | " \
"sed s#^\.#.$$d# | ${METALOG.add}" ; \
${MTREE_CMD:N-W} -C -f $$m -K uname,gname | sed s#^\.#.$$d# | \
Modified: projects/ifnet/etc/login.conf
==============================================================================
--- projects/ifnet/etc/login.conf Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/etc/login.conf Mon Apr 6 09:52:16 2015 (r281144)
@@ -26,7 +26,7 @@ default:\
:passwd_format=sha512:\
:copyright=/etc/COPYRIGHT:\
:welcome=/etc/motd:\
- :setenv=MAIL=/var/mail/$,BLOCKSIZE=K:\
+ :setenv=MAIL=/var/mail/$,BLOCKSIZE=K:LC_COLLATE=C:\
:path=/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin ~/bin:\
:nologin=/var/run/nologin:\
:cputime=unlimited:\
@@ -81,8 +81,8 @@ root:\
# Russian Users Accounts. Setup proper environment variables.
#
russian|Russian Users Accounts:\
- :charset=KOI8-R:\
- :lang=ru_RU.KOI8-R:\
+ :charset=UTF-8:\
+ :lang=ru_RU.UTF-8:\
:tc=default:
Modified: projects/ifnet/etc/rc.d/pflog
==============================================================================
--- projects/ifnet/etc/rc.d/pflog Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/etc/rc.d/pflog Mon Apr 6 09:52:16 2015 (r281144)
@@ -24,30 +24,30 @@ pflog_prestart()
{
load_kld pflog || return 1
+ # create pflog_dev interface if needed
+ if ! ifconfig $pflog_dev > /dev/null 2>&1; then
+ if ! ifconfig $pflog_dev create; then
+ warn "could not create $pflog_dev."
+ return 1
+ fi
+ fi
+
# set pflog_dev interface to up state
if ! ifconfig $pflog_dev up; then
warn "could not bring up $pflog_dev."
return 1
fi
+ # -p flag requires striping pidfile's leading /var/run and trailing .pid
+ pidfile=$(echo $pidfile | sed -e 's|/var/run/||' -e 's|.pid$||')
+
# prepare the command line for pflogd
- rc_flags="-f $pflog_logfile -i $pflog_dev $rc_flags"
+ rc_flags="-p $pidfile -f $pflog_logfile -i $pflog_dev $rc_flags"
# report we're ready to run pflogd
return 0
}
-pflog_poststart() {
- # Allow child pflogd to settle
- sleep 0.10
- # More elegant(?) method for getting a unique pid
- if [ -f /var/run/pflogd.pid ]; then
- mv /var/run/pflogd.pid $pidfile
- else
- warn "/var/run/pflogd.pid does not exist. Too fast."
- fi
-}
-
pflog_poststop()
{
if ! ifconfig $pflog_dev down; then
@@ -70,29 +70,33 @@ pflog_resync()
load_rc_config $name
-# Check if spawning multiple pflogd
-echo "Starting pflogd: $pflog_instances"
-if [ "$pflog_instances" ] && [ -n "$pflog_instances" ]; then
- start_postcmd="pflog_poststart"
+# Check if spawning multiple pflogd and told what to spawn
+if [ -n "$2" ]; then
+ # Set required variables
+ eval pflog_dev=\$pflog_${2}_dev
+ eval pflog_logfile=\$pflog_${2}_logfile
+ eval pflog_flags=\$pflog_${2}_flags
+ # Check that required vars have non-zero length, warn if not.
+ if [ -z $pflog_dev ]; then
+ warn "pflog_dev not set"
+ continue
+ fi
+ if [ -z $pflog_logfile ]; then
+ warn "pflog_logfile not set"
+ continue
+ fi
+
+ # Provide a unique pidfile name for pflogd -p <pidfile> flag
+ pidfile="/var/run/pflogd.$2.pid"
+
+ # Override service name and execute command
+ name=$pflog_dev
+ run_rc_command "$1"
+# Check if spawning multiple pflogd and not told what to spawn
+elif [ "$pflog_instances" ] && [ -n "$pflog_instances" ]; then
# Interate through requested instances.
for i in $pflog_instances; do
- # Set required variables
- eval pflog_dev=\$pflog_${i}_dev
- eval pflog_logfile=\$pflog_${i}_logfile
- eval pflog_flags=\$pflog_${i}_flags
- # Check that required vars have non-zero length, warn if not.
- if [ -z $pflog_dev ]; then
- warn "pflog_dev not set"
- continue
- fi
- if [ -z $pflog_logfile ]; then
- warn "pflog_logfile not set"
- continue
- fi
- # pflogd sets a pidfile, but the name is hardcoded. Concoct a
- # unique pidfile name.
- pidfile="/var/run/pflogd.$i.pid"
- run_rc_command "$1"
+ /etc/rc.d/pflog $1 $i
done
else
# Typical case, spawn single instance only.
Modified: projects/ifnet/include/pthread.h
==============================================================================
--- projects/ifnet/include/pthread.h Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/include/pthread.h Mon Apr 6 09:52:16 2015 (r281144)
@@ -144,19 +144,25 @@ struct _pthread_cleanup_info {
*/
__BEGIN_DECLS
int pthread_atfork(void (*)(void), void (*)(void), void (*)(void));
-int pthread_attr_destroy(pthread_attr_t *);
+int pthread_attr_destroy(pthread_attr_t *) __nonnull(1);
int pthread_attr_getstack(const pthread_attr_t * __restrict,
- void ** __restrict, size_t * __restrict);
-int pthread_attr_getstacksize(const pthread_attr_t *, size_t *);
+ void ** __restrict, size_t * __restrict)
+ __nonnull_all;
+int pthread_attr_getstacksize(const pthread_attr_t *, size_t *)
+ __nonnull_all;
int pthread_attr_getguardsize(const pthread_attr_t *, size_t *);
int pthread_attr_getstackaddr(const pthread_attr_t *, void **);
-int pthread_attr_getdetachstate(const pthread_attr_t *, int *);
-int pthread_attr_init(pthread_attr_t *);
-int pthread_attr_setstacksize(pthread_attr_t *, size_t);
-int pthread_attr_setguardsize(pthread_attr_t *, size_t);
-int pthread_attr_setstack(pthread_attr_t *, void *, size_t);
+int pthread_attr_getdetachstate(const pthread_attr_t *, int *)
+ __nonnull_all;
+int pthread_attr_init(pthread_attr_t *) __nonnull(1);
+int pthread_attr_setstacksize(pthread_attr_t *, size_t)
+ __nonnull(1);
+int pthread_attr_setguardsize(pthread_attr_t *, size_t)
+ __nonnull(1);
+int pthread_attr_setstack(pthread_attr_t *, void *, size_t)
+ __nonnull(1);
int pthread_attr_setstackaddr(pthread_attr_t *, void *);
-int pthread_attr_setdetachstate(pthread_attr_t *, int);
+int pthread_attr_setdetachstate(pthread_attr_t *, int) __nonnull(1);
int pthread_barrier_destroy(pthread_barrier_t *);
int pthread_barrier_init(pthread_barrier_t *,
const pthread_barrierattr_t *, unsigned);
@@ -164,7 +170,7 @@ int pthread_barrier_wait(pthread_barrie
int pthread_barrierattr_destroy(pthread_barrierattr_t *);
int pthread_barrierattr_getpshared(const pthread_barrierattr_t *,
int *);
-int pthread_barrierattr_init(pthread_barrierattr_t *);
+int pthread_barrierattr_init(pthread_barrierattr_t *) __nonnull(1);
int pthread_barrierattr_setpshared(pthread_barrierattr_t *, int);
#define pthread_cleanup_push(cleanup_routine, cleanup_arg) \
@@ -180,98 +186,109 @@ int pthread_barrierattr_setpshared(pthr
__pthread_cleanup_pop_imp(execute); \
}
-int pthread_condattr_destroy(pthread_condattr_t *);
+int pthread_condattr_destroy(pthread_condattr_t *) __nonnull(1);
int pthread_condattr_getclock(const pthread_condattr_t *,
- clockid_t *);
-int pthread_condattr_getpshared(const pthread_condattr_t *, int *);
-int pthread_condattr_init(pthread_condattr_t *);
-int pthread_condattr_setclock(pthread_condattr_t *, clockid_t);
-int pthread_condattr_setpshared(pthread_condattr_t *, int);
-int pthread_cond_broadcast(pthread_cond_t *);
-int pthread_cond_destroy(pthread_cond_t *);
+ clockid_t *) __nonnull_all;
+int pthread_condattr_getpshared(const pthread_condattr_t *, int *)
+ __nonnull_all;
+int pthread_condattr_init(pthread_condattr_t *) __nonnull(1);
+int pthread_condattr_setclock(pthread_condattr_t *, clockid_t)
+ __nonnull(1);
+int pthread_condattr_setpshared(pthread_condattr_t *, int)
+ __nonnull(1);
+int pthread_cond_broadcast(pthread_cond_t *)
+ __nonnull(1);
+int pthread_cond_destroy(pthread_cond_t *)
+ __nonnull(1);
int pthread_cond_init(pthread_cond_t *,
- const pthread_condattr_t *);
-int pthread_cond_signal(pthread_cond_t *);
+ const pthread_condattr_t *) __nonnull(1);
+int pthread_cond_signal(pthread_cond_t *) __nonnull(1);
int pthread_cond_timedwait(pthread_cond_t *,
pthread_mutex_t *__mutex, const struct timespec *)
- __requires_exclusive(*__mutex);
+ __nonnull_all __requires_exclusive(*__mutex);
int pthread_cond_wait(pthread_cond_t *, pthread_mutex_t *__mutex)
- __requires_exclusive(*__mutex);
+ __nonnull_all __requires_exclusive(*__mutex);
int pthread_create(pthread_t *, const pthread_attr_t *,
- void *(*) (void *), void *);
+ void *(*) (void *), void *) __nonnull(1) __nonnull(3);
int pthread_detach(pthread_t);
int pthread_equal(pthread_t, pthread_t);
void pthread_exit(void *) __dead2;
void *pthread_getspecific(pthread_key_t);
-int pthread_getcpuclockid(pthread_t, clockid_t *);
+int pthread_getcpuclockid(pthread_t, clockid_t *) __nonnull(2);
int pthread_join(pthread_t, void **);
int pthread_key_create(pthread_key_t *,
- void (*) (void *));
+ void (*) (void *)) __nonnull(1);
int pthread_key_delete(pthread_key_t);
-int pthread_mutexattr_init(pthread_mutexattr_t *);
-int pthread_mutexattr_destroy(pthread_mutexattr_t *);
+int pthread_mutexattr_init(pthread_mutexattr_t *) __nonnull(1);
+int pthread_mutexattr_destroy(pthread_mutexattr_t *) __nonnull(1);
int pthread_mutexattr_getpshared(const pthread_mutexattr_t *,
- int *);
-int pthread_mutexattr_gettype(pthread_mutexattr_t *, int *);
-int pthread_mutexattr_settype(pthread_mutexattr_t *, int);
-int pthread_mutexattr_setpshared(pthread_mutexattr_t *, int);
+ int *) __nonnull_all;
+int pthread_mutexattr_gettype(pthread_mutexattr_t *, int *)
+ __nonnull_all;
+int pthread_mutexattr_settype(pthread_mutexattr_t *, int)
+ __nonnull(1);
+int pthread_mutexattr_setpshared(pthread_mutexattr_t *, int)
+ __nonnull(1);
int pthread_mutex_destroy(pthread_mutex_t *__mutex)
- __requires_unlocked(*__mutex);
+ __nonnull(1) __requires_unlocked(*__mutex);
int pthread_mutex_init(pthread_mutex_t *__mutex,
const pthread_mutexattr_t *)
- __requires_unlocked(*__mutex);
+ __nonnull(1) __requires_unlocked(*__mutex);
int pthread_mutex_lock(pthread_mutex_t *__mutex)
- __locks_exclusive(*__mutex);
+ __nonnull(1) __locks_exclusive(*__mutex);
int pthread_mutex_trylock(pthread_mutex_t *__mutex)
- __trylocks_exclusive(0, *__mutex);
+ __nonnull(1) __trylocks_exclusive(0, *__mutex);
int pthread_mutex_timedlock(pthread_mutex_t *__mutex,
const struct timespec *)
- __trylocks_exclusive(0, *__mutex);
+ __nonnull_all __trylocks_exclusive(0, *__mutex);
int pthread_mutex_unlock(pthread_mutex_t *__mutex)
- __unlocks(*__mutex);
-int pthread_once(pthread_once_t *, void (*) (void));
+ __nonnull(1) __unlocks(*__mutex);
+int pthread_once(pthread_once_t *, void (*) (void)) __nonnull_all;
int pthread_rwlock_destroy(pthread_rwlock_t *__rwlock)
- __requires_unlocked(*__rwlock);
+ __nonnull(1) __requires_unlocked(*__rwlock);
int pthread_rwlock_init(pthread_rwlock_t *__rwlock,
const pthread_rwlockattr_t *)
- __requires_unlocked(*__rwlock);
+ __nonnull(1) __requires_unlocked(*__rwlock);
int pthread_rwlock_rdlock(pthread_rwlock_t *__rwlock)
- __locks_shared(*__rwlock);
+ __nonnull(1) __locks_shared(*__rwlock);
int pthread_rwlock_timedrdlock(pthread_rwlock_t *__rwlock,
const struct timespec *)
- __trylocks_shared(0, *__rwlock);
+ __nonnull_all __trylocks_shared(0, *__rwlock);
int pthread_rwlock_timedwrlock(pthread_rwlock_t *__rwlock,
const struct timespec *)
- __trylocks_exclusive(0, *__rwlock);
+ __nonnull_all __trylocks_exclusive(0, *__rwlock);
int pthread_rwlock_tryrdlock(pthread_rwlock_t *__rwlock)
- __trylocks_shared(0, *__rwlock);
+ __nonnull(1) __trylocks_shared(0, *__rwlock);
int pthread_rwlock_trywrlock(pthread_rwlock_t *__rwlock)
- __trylocks_exclusive(0, *__rwlock);
+ __nonnull(1) __trylocks_exclusive(0, *__rwlock);
int pthread_rwlock_unlock(pthread_rwlock_t *__rwlock)
- __unlocks(*__rwlock);
+ __nonnull(1) __unlocks(*__rwlock);
int pthread_rwlock_wrlock(pthread_rwlock_t *__rwlock)
- __locks_exclusive(*__rwlock);
-int pthread_rwlockattr_destroy(pthread_rwlockattr_t *);
+ __nonnull(1) __locks_exclusive(*__rwlock);
+int pthread_rwlockattr_destroy(pthread_rwlockattr_t *)
+ __nonnull(1);
int pthread_rwlockattr_getkind_np(const pthread_rwlockattr_t *,
int *);
int pthread_rwlockattr_getpshared(const pthread_rwlockattr_t *,
- int *);
-int pthread_rwlockattr_init(pthread_rwlockattr_t *);
+ int *) __nonnull_all;
+int pthread_rwlockattr_init(pthread_rwlockattr_t *)
+ __nonnull(1);
int pthread_rwlockattr_setkind_np(pthread_rwlockattr_t *, int);
-int pthread_rwlockattr_setpshared(pthread_rwlockattr_t *, int);
+int pthread_rwlockattr_setpshared(pthread_rwlockattr_t *, int)
+ __nonnull(1);
pthread_t pthread_self(void);
int pthread_setspecific(pthread_key_t, const void *);
int pthread_spin_init(pthread_spinlock_t *__spin, int)
- __requires_unlocked(*__spin);
+ __requires_unlocked(*__spin);
int pthread_spin_destroy(pthread_spinlock_t *__spin)
- __requires_unlocked(*__spin);
+ __requires_unlocked(*__spin);
int pthread_spin_lock(pthread_spinlock_t *__spin)
- __locks_exclusive(*__spin);
+ __locks_exclusive(*__spin);
int pthread_spin_trylock(pthread_spinlock_t *__spin)
- __trylocks_exclusive(0, *__spin);
+ __trylocks_exclusive(0, *__spin);
int pthread_spin_unlock(pthread_spinlock_t *__spin)
- __unlocks(*__spin);
+ __unlocks(*__spin);
int pthread_cancel(pthread_t);
int pthread_setcancelstate(int, int *);
int pthread_setcanceltype(int, int *);
@@ -295,18 +312,20 @@ int pthread_mutexattr_setprotocol(pthre
int pthread_attr_getinheritsched(const pthread_attr_t *, int *);
int pthread_attr_getschedparam(const pthread_attr_t *,
- struct sched_param *);
-int pthread_attr_getschedpolicy(const pthread_attr_t *, int *);
-int pthread_attr_getscope(const pthread_attr_t *, int *);
+ struct sched_param *) __nonnull_all;
+int pthread_attr_getschedpolicy(const pthread_attr_t *, int *)
+ __nonnull_all;
+int pthread_attr_getscope(const pthread_attr_t *, int *)
+ __nonnull_all;
int pthread_attr_setinheritsched(pthread_attr_t *, int);
int pthread_attr_setschedparam(pthread_attr_t *,
- const struct sched_param *);
-int pthread_attr_setschedpolicy(pthread_attr_t *, int);
-int pthread_attr_setscope(pthread_attr_t *, int);
+ const struct sched_param *) __nonnull(1) __nonnull(2);
+int pthread_attr_setschedpolicy(pthread_attr_t *, int) __nonnull(1);
+int pthread_attr_setscope(pthread_attr_t *, int) __nonnull(1);
int pthread_getschedparam(pthread_t pthread, int *,
- struct sched_param *);
+ struct sched_param *) __nonnull(2) __nonnull(3);
int pthread_setschedparam(pthread_t, int,
- const struct sched_param *);
+ const struct sched_param *) __nonnull(3);
#if __XSI_VISIBLE
int pthread_getconcurrency(void);
int pthread_setconcurrency(int);
Modified: projects/ifnet/include/signal.h
==============================================================================
--- projects/ifnet/include/signal.h Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/include/signal.h Mon Apr 6 09:52:16 2015 (r281144)
@@ -78,10 +78,10 @@ int sigdelset(sigset_t *, int);
int sigemptyset(sigset_t *);
int sigfillset(sigset_t *);
int sigismember(const sigset_t *, int);
-int sigpending(sigset_t *);
+int sigpending(sigset_t *) __nonnull(1);
int sigprocmask(int, const sigset_t * __restrict, sigset_t * __restrict);
-int sigsuspend(const sigset_t *);
-int sigwait(const sigset_t * __restrict, int * __restrict);
+int sigsuspend(const sigset_t *) __nonnull(1);
+int sigwait(const sigset_t * __restrict, int * __restrict) __nonnull_all;
#endif
#if __POSIX_VISIBLE >= 199506 || __XSI_VISIBLE >= 600
Modified: projects/ifnet/include/stdlib.h
==============================================================================
--- projects/ifnet/include/stdlib.h Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/include/stdlib.h Mon Apr 6 09:52:16 2015 (r281144)
@@ -87,21 +87,22 @@ int atoi(const char *);
long atol(const char *);
void *bsearch(const void *, const void *, size_t,
size_t, int (*)(const void *, const void *));
-void *calloc(size_t, size_t) __malloc_like;
+void *calloc(size_t, size_t) __malloc_like __result_use_check
+ __alloc_size(1) __alloc_size(2);
div_t div(int, int) __pure2;
_Noreturn void exit(int);
void free(void *);
char *getenv(const char *);
long labs(long) __pure2;
ldiv_t ldiv(long, long) __pure2;
-void *malloc(size_t) __malloc_like;
+void *malloc(size_t) __malloc_like __result_use_check __alloc_size(1);
int mblen(const char *, size_t);
size_t mbstowcs(wchar_t * __restrict , const char * __restrict, size_t);
int mbtowc(wchar_t * __restrict, const char * __restrict, size_t);
void qsort(void *, size_t, size_t,
int (*)(const void *, const void *));
int rand(void);
-void *realloc(void *, size_t);
+void *realloc(void *, size_t) __result_use_check __alloc_size(2);
void srand(unsigned);
double strtod(const char * __restrict, char ** __restrict);
float strtof(const char * __restrict, char ** __restrict);
@@ -155,7 +156,7 @@ _Noreturn void _Exit(int);
* If we're in a mode greater than C99, expose C11 functions.
*/
#if __ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L
-void * aligned_alloc(size_t, size_t) __malloc_like;
+void * aligned_alloc(size_t, size_t) __malloc_like __alloc_size(2);
int at_quick_exit(void (*)(void));
_Noreturn void
quick_exit(int);
@@ -170,7 +171,8 @@ char *realpath(const char * __restrict,
int rand_r(unsigned *); /* (TSF) */
#endif
#if __POSIX_VISIBLE >= 200112
-int posix_memalign(void **, size_t, size_t); /* (ADV) */
+int posix_memalign(void **, size_t, size_t) __nonnull(1)
+ __alloc_size(3); /* (ADV) */
int setenv(const char *, const char *, int);
int unsetenv(const char *);
#endif
@@ -301,7 +303,7 @@ void qsort_r(void *, size_t, size_t, vo
int (*)(void *, const void *, const void *));
int radixsort(const unsigned char **, int, const unsigned char *,
unsigned);
-void *reallocf(void *, size_t);
+void *reallocf(void *, size_t) __result_use_check __alloc_size(2);
int rpmatch(const char *);
void setprogname(const char *);
int sradixsort(const unsigned char **, int, const unsigned char *,
Modified: projects/ifnet/lib/libc/gen/fts.c
==============================================================================
--- projects/ifnet/lib/libc/gen/fts.c Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/lib/libc/gen/fts.c Mon Apr 6 09:52:16 2015 (r281144)
@@ -905,12 +905,13 @@ fts_stat(FTS *sp, FTSENT *p, int follow,
if (ISSET(FTS_LOGICAL) || follow) {
if (fstatat(dfd, path, sbp, 0)) {
saved_errno = errno;
- if (!fstatat(dfd, path, sbp, AT_SYMLINK_NOFOLLOW)) {
- errno = 0;
- return (FTS_SLNONE);
+ if (fstatat(dfd, path, sbp, AT_SYMLINK_NOFOLLOW)) {
+ p->fts_errno = saved_errno;
+ goto err;
}
- p->fts_errno = saved_errno;
- goto err;
+ errno = 0;
+ if (S_ISLNK(sbp->st_mode))
+ return (FTS_SLNONE);
}
} else if (fstatat(dfd, path, sbp, AT_SYMLINK_NOFOLLOW)) {
p->fts_errno = errno;
Modified: projects/ifnet/lib/libc/net/getaddrinfo.c
==============================================================================
--- projects/ifnet/lib/libc/net/getaddrinfo.c Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/lib/libc/net/getaddrinfo.c Mon Apr 6 09:52:16 2015 (r281144)
@@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$");
#include <ifaddrs.h>
#include <sys/queue.h>
#ifdef INET6
-#include <net/if_var.h>
#include <sys/sysctl.h>
#include <sys/ioctl.h>
#include <netinet6/in6_var.h>
Modified: projects/ifnet/lib/libc/net/name6.c
==============================================================================
--- projects/ifnet/lib/libc/net/name6.c Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/lib/libc/net/name6.c Mon Apr 6 09:52:16 2015 (r281144)
@@ -94,7 +94,6 @@ __FBSDID("$FreeBSD$");
#include <netinet/in.h>
#ifdef INET6
#include <net/if.h>
-#include <net/if_var.h>
#include <sys/sysctl.h>
#include <sys/ioctl.h>
#include <netinet6/in6_var.h> /* XXX */
Modified: projects/ifnet/lib/libc/string/strlcat.c
==============================================================================
--- projects/ifnet/lib/libc/string/strlcat.c Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/lib/libc/string/strlcat.c Mon Apr 6 09:52:16 2015 (r281144)
@@ -1,7 +1,7 @@
-/* $OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $ */
+/* $OpenBSD: strlcat.c,v 1.15 2015/03/02 21:41:08 millert Exp $ */
/*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller at courtesan.com>
+ * Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller at courtesan.com>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -23,36 +23,36 @@ __FBSDID("$FreeBSD$");
#include <string.h>
/*
- * Appends src to string dst of size siz (unlike strncat, siz is the
- * full size of dst, not space left). At most siz-1 characters
- * will be copied. Always NUL terminates (unless siz <= strlen(dst)).
- * Returns strlen(src) + MIN(siz, strlen(initial dst)).
- * If retval >= siz, truncation occurred.
+ * Appends src to string dst of size dsize (unlike strncat, dsize is the
+ * full size of dst, not space left). At most dsize-1 characters
+ * will be copied. Always NUL terminates (unless dsize <= strlen(dst)).
+ * Returns strlen(src) + MIN(dsize, strlen(initial dst)).
+ * If retval >= dsize, truncation occurred.
*/
size_t
-strlcat(char * __restrict dst, const char * __restrict src, size_t siz)
+strlcat(char * __restrict dst, const char * __restrict src, size_t dsize)
{
- char *d = dst;
- const char *s = src;
- size_t n = siz;
+ const char *odst = dst;
+ const char *osrc = src;
+ size_t n = dsize;
size_t dlen;
- /* Find the end of dst and adjust bytes left but don't go past end */
- while (n-- != 0 && *d != '\0')
- d++;
- dlen = d - dst;
- n = siz - dlen;
-
- if (n == 0)
- return(dlen + strlen(s));
- while (*s != '\0') {
- if (n != 1) {
- *d++ = *s;
+ /* Find the end of dst and adjust bytes left but don't go past end. */
+ while (n-- != 0 && *dst != '\0')
+ dst++;
+ dlen = dst - odst;
+ n = dsize - dlen;
+
+ if (n-- == 0)
+ return(dlen + strlen(src));
+ while (*src != '\0') {
+ if (n != 0) {
+ *dst++ = *src;
n--;
}
- s++;
+ src++;
}
- *d = '\0';
+ *dst = '\0';
- return(dlen + (s - src)); /* count does not include NUL */
+ return(dlen + (src - osrc)); /* count does not include NUL */
}
Modified: projects/ifnet/lib/libc/string/strlcpy.c
==============================================================================
--- projects/ifnet/lib/libc/string/strlcpy.c Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/lib/libc/string/strlcpy.c Mon Apr 6 09:52:16 2015 (r281144)
@@ -1,7 +1,7 @@
-/* $OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $ */
+/* $OpenBSD: strlcpy.c,v 1.12 2015/01/15 03:54:12 millert Exp $ */
/*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller at courtesan.com>
+ * Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller at courtesan.com>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -23,32 +23,31 @@ __FBSDID("$FreeBSD$");
#include <string.h>
/*
- * Copy src to string dst of size siz. At most siz-1 characters
- * will be copied. Always NUL terminates (unless siz == 0).
- * Returns strlen(src); if retval >= siz, truncation occurred.
+ * Copy string src to buffer dst of size dsize. At most dsize-1
+ * chars will be copied. Always NUL terminates (unless dsize == 0).
+ * Returns strlen(src); if retval >= dsize, truncation occurred.
*/
size_t
-strlcpy(char * __restrict dst, const char * __restrict src, size_t siz)
+strlcpy(char * __restrict dst, const char * __restrict src, size_t dsize)
{
- char *d = dst;
- const char *s = src;
- size_t n = siz;
-
- /* Copy as many bytes as will fit */
- if (n != 0) {
- while (--n != 0) {
- if ((*d++ = *s++) == '\0')
+ const char *osrc = src;
+ size_t nleft = dsize;
+
+ /* Copy as many bytes as will fit. */
+ if (nleft != 0) {
+ while (--nleft != 0) {
+ if ((*dst++ = *src++) == '\0')
break;
}
}
- /* Not enough room in dst, add NUL and traverse rest of src */
- if (n == 0) {
- if (siz != 0)
- *d = '\0'; /* NUL-terminate dst */
- while (*s++)
+ /* Not enough room in dst, add NUL and traverse rest of src. */
+ if (nleft == 0) {
+ if (dsize != 0)
+ *dst = '\0'; /* NUL-terminate dst */
+ while (*src++)
;
}
- return(s - src - 1); /* count does not include NUL */
+ return(src - osrc - 1); /* count does not include NUL */
}
Modified: projects/ifnet/lib/libpmc/libpmc.c
==============================================================================
--- projects/ifnet/lib/libpmc/libpmc.c Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/lib/libpmc/libpmc.c Mon Apr 6 09:52:16 2015 (r281144)
@@ -159,6 +159,7 @@ PMC_CLASSDEP_TABLE(p6, P6);
PMC_CLASSDEP_TABLE(xscale, XSCALE);
PMC_CLASSDEP_TABLE(armv7, ARMV7);
PMC_CLASSDEP_TABLE(mips24k, MIPS24K);
+PMC_CLASSDEP_TABLE(mips74k, MIPS74K);
PMC_CLASSDEP_TABLE(octeon, OCTEON);
PMC_CLASSDEP_TABLE(ucf, UCF);
PMC_CLASSDEP_TABLE(ppc7450, PPC7450);
@@ -293,6 +294,7 @@ PMC_MDEP_TABLE(p6, P6, PMC_CLASS_SOFT, P
PMC_MDEP_TABLE(xscale, XSCALE, PMC_CLASS_SOFT, PMC_CLASS_XSCALE);
PMC_MDEP_TABLE(armv7, ARMV7, PMC_CLASS_SOFT, PMC_CLASS_ARMV7);
PMC_MDEP_TABLE(mips24k, MIPS24K, PMC_CLASS_SOFT, PMC_CLASS_MIPS24K);
+PMC_MDEP_TABLE(mips74k, MIPS74K, PMC_CLASS_SOFT, PMC_CLASS_MIPS74K);
PMC_MDEP_TABLE(octeon, OCTEON, PMC_CLASS_SOFT, PMC_CLASS_OCTEON);
PMC_MDEP_TABLE(ppc7450, PPC7450, PMC_CLASS_SOFT, PMC_CLASS_PPC7450);
PMC_MDEP_TABLE(ppc970, PPC970, PMC_CLASS_SOFT, PMC_CLASS_PPC970);
@@ -360,6 +362,7 @@ PMC_CLASS_TABLE_DESC(armv7, ARMV7, armv7
#endif
#if defined(__mips__)
PMC_CLASS_TABLE_DESC(mips24k, MIPS24K, mips24k, mips);
+PMC_CLASS_TABLE_DESC(mips74k, MIPS74K, mips74k, mips);
PMC_CLASS_TABLE_DESC(octeon, OCTEON, octeon, mips);
#endif /* __mips__ */
#if defined(__powerpc__)
@@ -2432,6 +2435,13 @@ static struct pmc_event_alias mips24k_al
EV_ALIAS(NULL, NULL)
};
+static struct pmc_event_alias mips74k_aliases[] = {
+ EV_ALIAS("instructions", "INSTR_EXECUTED"),
+ EV_ALIAS("branches", "BRANCH_INSNS"),
+ EV_ALIAS("branch-mispredicts", "MISPREDICTED_BRANCH_INSNS"),
+ EV_ALIAS(NULL, NULL)
+};
+
static struct pmc_event_alias octeon_aliases[] = {
EV_ALIAS("instructions", "RET"),
EV_ALIAS("branches", "BR"),
@@ -2923,6 +2933,10 @@ pmc_event_names_of_class(enum pmc_class
ev = mips24k_event_table;
count = PMC_EVENT_TABLE_SIZE(mips24k);
break;
+ case PMC_CLASS_MIPS74K:
+ ev = mips74k_event_table;
+ count = PMC_EVENT_TABLE_SIZE(mips74k);
+ break;
case PMC_CLASS_OCTEON:
ev = octeon_event_table;
count = PMC_EVENT_TABLE_SIZE(octeon);
@@ -3213,6 +3227,10 @@ pmc_init(void)
PMC_MDEP_INIT(mips24k);
pmc_class_table[n] = &mips24k_class_table_descr;
break;
+ case PMC_CPU_MIPS_74K:
+ PMC_MDEP_INIT(mips74k);
+ pmc_class_table[n] = &mips74k_class_table_descr;
+ break;
case PMC_CPU_MIPS_OCTEON:
PMC_MDEP_INIT(octeon);
pmc_class_table[n] = &octeon_class_table_descr;
@@ -3414,6 +3432,9 @@ _pmc_name_of_event(enum pmc_event pe, en
} else if (pe >= PMC_EV_MIPS24K_FIRST && pe <= PMC_EV_MIPS24K_LAST) {
ev = mips24k_event_table;
evfence = mips24k_event_table + PMC_EVENT_TABLE_SIZE(mips24k);
+ } else if (pe >= PMC_EV_MIPS74K_FIRST && pe <= PMC_EV_MIPS74K_LAST) {
+ ev = mips74k_event_table;
+ evfence = mips74k_event_table + PMC_EVENT_TABLE_SIZE(mips74k);
} else if (pe >= PMC_EV_OCTEON_FIRST && pe <= PMC_EV_OCTEON_LAST) {
ev = octeon_event_table;
evfence = octeon_event_table + PMC_EVENT_TABLE_SIZE(octeon);
Modified: projects/ifnet/libexec/rtld-elf/mips/reloc.c
==============================================================================
--- projects/ifnet/libexec/rtld-elf/mips/reloc.c Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/libexec/rtld-elf/mips/reloc.c Mon Apr 6 09:52:16 2015 (r281144)
@@ -245,7 +245,7 @@ _mips_rtld_bind(Obj_Entry *obj, Elf_Size
def = find_symdef(reloff, obj, &defobj, SYMLOOK_IN_PLT, NULL,
NULL);
if (def == NULL)
- _rtld_error("bind failed no symbol");
+ rtld_die();
target = (Elf_Addr)(defobj->relocbase + def->st_value);
dbg("bind now/fixup at %s sym # %jd in %s --> was=%p new=%p",
Modified: projects/ifnet/sbin/ifconfig/af_inet.c
==============================================================================
--- projects/ifnet/sbin/ifconfig/af_inet.c Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/sbin/ifconfig/af_inet.c Mon Apr 6 09:52:16 2015 (r281144)
@@ -46,7 +46,6 @@ static const char rcsid[] =
#include <ifaddrs.h>
#include <netinet/in.h>
-#include <net/if_var.h> /* for struct ifaddr */
#include <netinet/in_var.h>
#include <arpa/inet.h>
#include <netdb.h>
Modified: projects/ifnet/sbin/ifconfig/af_inet6.c
==============================================================================
--- projects/ifnet/sbin/ifconfig/af_inet6.c Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/sbin/ifconfig/af_inet6.c Mon Apr 6 09:52:16 2015 (r281144)
@@ -48,7 +48,6 @@ static const char rcsid[] =
#include <arpa/inet.h>
#include <netinet/in.h>
-#include <net/if_var.h> /* for struct ifaddr */
#include <netinet/in_var.h>
#include <arpa/inet.h>
#include <netdb.h>
Modified: projects/ifnet/sbin/ifconfig/af_nd6.c
==============================================================================
--- projects/ifnet/sbin/ifconfig/af_nd6.c Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/sbin/ifconfig/af_nd6.c Mon Apr 6 09:52:16 2015 (r281144)
@@ -46,7 +46,6 @@ static const char rcsid[] =
#include <arpa/inet.h>
#include <netinet/in.h>
-#include <net/if_var.h>
#include <netinet/in_var.h>
#include <arpa/inet.h>
#include <netdb.h>
Modified: projects/ifnet/sbin/ifconfig/carp.c
==============================================================================
--- projects/ifnet/sbin/ifconfig/carp.c Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/sbin/ifconfig/carp.c Mon Apr 6 09:52:16 2015 (r281144)
@@ -36,7 +36,6 @@
#include <unistd.h>
#include <net/if.h>
-#include <net/if_var.h>
#include <netinet/in.h>
#include <netinet/in_var.h>
#include <netinet/ip_carp.h>
Modified: projects/ifnet/sbin/ifconfig/ifconfig.c
==============================================================================
--- projects/ifnet/sbin/ifconfig/ifconfig.c Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/sbin/ifconfig/ifconfig.c Mon Apr 6 09:52:16 2015 (r281144)
@@ -51,7 +51,6 @@ static const char rcsid[] =
#include <net/ethernet.h>
#include <net/if.h>
-#include <net/if_var.h>
#include <net/if_dl.h>
#include <net/if_types.h>
#include <net/route.h>
Modified: projects/ifnet/sbin/ifconfig/ifvlan.c
==============================================================================
--- projects/ifnet/sbin/ifconfig/ifvlan.c Mon Apr 6 09:42:23 2015 (r281143)
+++ projects/ifnet/sbin/ifconfig/ifvlan.c Mon Apr 6 09:52:16 2015 (r281144)
@@ -40,7 +40,6 @@
#include <net/ethernet.h>
#include <net/if.h>
-#include <net/if_var.h>
#include <net/if_vlan_var.h>
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list