svn commit: r272826 - in projects/ipfw: . bin/sleep bin/sleep/tests cddl/contrib/opensolaris/cmd/zdb cddl/contrib/opensolaris/lib/libdtrace/common contrib/byacc contrib/byacc/package contrib/byacc/...
Alexander V. Chernikov
melifaro at FreeBSD.org
Thu Oct 9 15:35:33 UTC 2014
Author: melifaro
Date: Thu Oct 9 15:35:28 2014
New Revision: 272826
URL: https://svnweb.freebsd.org/changeset/base/272826
Log:
Sync to HEAD at r272825.
Added:
projects/ipfw/bin/sleep/tests/
- copied from r272825, head/bin/sleep/tests/
projects/ipfw/contrib/byacc/test/btyacc/btyacc_demo2.error
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_demo2.error
projects/ipfw/contrib/byacc/test/btyacc/btyacc_demo2.output
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_demo2.output
projects/ipfw/contrib/byacc/test/btyacc/btyacc_demo2.tab.c
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_demo2.tab.c
projects/ipfw/contrib/byacc/test/btyacc/btyacc_demo2.tab.h
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_demo2.tab.h
projects/ipfw/contrib/byacc/test/btyacc/btyacc_destroy1.error
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_destroy1.error
projects/ipfw/contrib/byacc/test/btyacc/btyacc_destroy1.output
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_destroy1.output
projects/ipfw/contrib/byacc/test/btyacc/btyacc_destroy1.tab.c
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_destroy1.tab.c
projects/ipfw/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_destroy1.tab.h
projects/ipfw/contrib/byacc/test/btyacc/btyacc_destroy2.error
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_destroy2.error
projects/ipfw/contrib/byacc/test/btyacc/btyacc_destroy2.output
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_destroy2.output
projects/ipfw/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_destroy2.tab.c
projects/ipfw/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_destroy2.tab.h
projects/ipfw/contrib/byacc/test/btyacc/btyacc_destroy3.error
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_destroy3.error
projects/ipfw/contrib/byacc/test/btyacc/btyacc_destroy3.output
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_destroy3.output
projects/ipfw/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_destroy3.tab.c
projects/ipfw/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h
- copied unchanged from r272825, head/contrib/byacc/test/btyacc/btyacc_destroy3.tab.h
projects/ipfw/contrib/byacc/test/btyacc_destroy1.y
- copied unchanged from r272825, head/contrib/byacc/test/btyacc_destroy1.y
projects/ipfw/contrib/byacc/test/btyacc_destroy2.y
- copied unchanged from r272825, head/contrib/byacc/test/btyacc_destroy2.y
projects/ipfw/contrib/byacc/test/btyacc_destroy3.y
- copied unchanged from r272825, head/contrib/byacc/test/btyacc_destroy3.y
projects/ipfw/etc/devd/ulpt.conf
- copied unchanged from r272825, head/etc/devd/ulpt.conf
projects/ipfw/gnu/usr.bin/diff/tests/
- copied from r272825, head/gnu/usr.bin/diff/tests/
projects/ipfw/lib/libc/string/explicit_bzero.c
- copied unchanged from r272825, head/lib/libc/string/explicit_bzero.c
projects/ipfw/lib/libpcap/pcap-netmap.c
- copied unchanged from r272825, head/lib/libpcap/pcap-netmap.c
projects/ipfw/sys/dev/mmc/host/
- copied from r272825, head/sys/dev/mmc/host/
projects/ipfw/sys/dev/mrsas/mrsas_linux.c
- copied unchanged from r272825, head/sys/dev/mrsas/mrsas_linux.c
projects/ipfw/sys/libkern/explicit_bzero.c
- copied unchanged from r272825, head/sys/libkern/explicit_bzero.c
projects/ipfw/sys/modules/mrsas/mrsas_linux/
- copied from r272825, head/sys/modules/mrsas/mrsas_linux/
projects/ipfw/sys/netinet/sctp_syscalls.c
- copied unchanged from r272825, head/sys/netinet/sctp_syscalls.c
projects/ipfw/usr.bin/basename/tests/
- copied from r272825, head/usr.bin/basename/tests/
projects/ipfw/usr.bin/cmp/tests/
- copied from r272825, head/usr.bin/cmp/tests/
projects/ipfw/usr.bin/cut/tests/
- copied from r272825, head/usr.bin/cut/tests/
projects/ipfw/usr.bin/dirname/tests/
- copied from r272825, head/usr.bin/dirname/tests/
projects/ipfw/usr.bin/grep/tests/
- copied from r272825, head/usr.bin/grep/tests/
projects/ipfw/usr.bin/gzip/tests/
- copied from r272825, head/usr.bin/gzip/tests/
projects/ipfw/usr.sbin/nmtree/tests/
- copied from r272825, head/usr.sbin/nmtree/tests/
Modified:
projects/ipfw/Makefile.inc1
projects/ipfw/bin/sleep/Makefile
projects/ipfw/cddl/contrib/opensolaris/cmd/zdb/zdb.c
projects/ipfw/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y
projects/ipfw/contrib/byacc/CHANGES
projects/ipfw/contrib/byacc/MANIFEST
projects/ipfw/contrib/byacc/VERSION
projects/ipfw/contrib/byacc/aclocal.m4
projects/ipfw/contrib/byacc/btyaccpar.c
projects/ipfw/contrib/byacc/closure.c
projects/ipfw/contrib/byacc/config.sub
projects/ipfw/contrib/byacc/configure
projects/ipfw/contrib/byacc/configure.in
projects/ipfw/contrib/byacc/defs.h
projects/ipfw/contrib/byacc/lalr.c
projects/ipfw/contrib/byacc/main.c
projects/ipfw/contrib/byacc/output.c
projects/ipfw/contrib/byacc/package/byacc.spec
projects/ipfw/contrib/byacc/package/debian/changelog
projects/ipfw/contrib/byacc/package/debian/source/format
projects/ipfw/contrib/byacc/package/mingw-byacc.spec
projects/ipfw/contrib/byacc/package/pkgsrc/Makefile
projects/ipfw/contrib/byacc/reader.c
projects/ipfw/contrib/byacc/test/btyacc/btyacc_calc1.tab.c
projects/ipfw/contrib/byacc/test/btyacc/btyacc_demo.tab.c
projects/ipfw/contrib/byacc/test/btyacc/calc.tab.c
projects/ipfw/contrib/byacc/test/btyacc/calc1.tab.c
projects/ipfw/contrib/byacc/test/btyacc/calc2.tab.c
projects/ipfw/contrib/byacc/test/btyacc/calc3.tab.c
projects/ipfw/contrib/byacc/test/btyacc/code_calc.code.c
projects/ipfw/contrib/byacc/test/btyacc/code_calc.tab.c
projects/ipfw/contrib/byacc/test/btyacc/code_error.code.c
projects/ipfw/contrib/byacc/test/btyacc/code_error.tab.c
projects/ipfw/contrib/byacc/test/btyacc/empty.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_inherit1.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_inherit2.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_inherit3.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_inherit4.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_inherit5.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax1.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax10.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax11.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax12.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax13.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax14.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax15.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax16.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax17.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax18.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax19.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax2.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax20.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax21.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax22.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax23.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax24.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax25.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax26.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax27.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax3.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax4.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax5.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax6.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax7.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax7a.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax7b.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax8.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax8a.tab.c
projects/ipfw/contrib/byacc/test/btyacc/err_syntax9.tab.c
projects/ipfw/contrib/byacc/test/btyacc/error.tab.c
projects/ipfw/contrib/byacc/test/btyacc/grammar.tab.c
projects/ipfw/contrib/byacc/test/btyacc/inherit0.tab.c
projects/ipfw/contrib/byacc/test/btyacc/inherit1.tab.c
projects/ipfw/contrib/byacc/test/btyacc/inherit2.tab.c
projects/ipfw/contrib/byacc/test/btyacc/ok_syntax1.tab.c
projects/ipfw/contrib/byacc/test/btyacc/pure_calc.tab.c
projects/ipfw/contrib/byacc/test/btyacc/pure_error.tab.c
projects/ipfw/contrib/byacc/test/btyacc/quote_calc-s.tab.c
projects/ipfw/contrib/byacc/test/btyacc/quote_calc.tab.c
projects/ipfw/contrib/byacc/test/btyacc/quote_calc2-s.tab.c
projects/ipfw/contrib/byacc/test/btyacc/quote_calc2.tab.c
projects/ipfw/contrib/byacc/test/btyacc/quote_calc3-s.tab.c
projects/ipfw/contrib/byacc/test/btyacc/quote_calc3.tab.c
projects/ipfw/contrib/byacc/test/btyacc/quote_calc4-s.tab.c
projects/ipfw/contrib/byacc/test/btyacc/quote_calc4.tab.c
projects/ipfw/contrib/byacc/test/btyacc/rename_debug.c
projects/ipfw/contrib/byacc/test/btyacc/varsyntax_calc1.tab.c
projects/ipfw/contrib/byacc/test/yacc/calc2.tab.c
projects/ipfw/contrib/byacc/test/yacc/calc3.tab.c
projects/ipfw/contrib/byacc/test/yacc/ok_syntax1.tab.c
projects/ipfw/contrib/byacc/yacc.1
projects/ipfw/contrib/libpcap/inet.c
projects/ipfw/contrib/libpcap/pcap.c
projects/ipfw/contrib/tcpdump/tcpdump.c
projects/ipfw/etc/devd/Makefile
projects/ipfw/etc/mtree/BSD.tests.dist
projects/ipfw/gnu/usr.bin/diff/Makefile
projects/ipfw/include/rpcsvc/nis.x
projects/ipfw/include/strings.h
projects/ipfw/lib/libc/stdtime/strptime.c
projects/ipfw/lib/libc/string/Makefile.inc
projects/ipfw/lib/libc/string/Symbol.map
projects/ipfw/lib/libc/string/bzero.3
projects/ipfw/lib/libpcap/Makefile
projects/ipfw/lib/libpcap/config.h
projects/ipfw/sbin/dumpon/dumpon.8
projects/ipfw/share/man/man4/alc.4
projects/ipfw/share/man/man9/timeout.9
projects/ipfw/sys/amd64/amd64/minidump_machdep.c
projects/ipfw/sys/amd64/amd64/pmap.c
projects/ipfw/sys/amd64/include/md_var.h
projects/ipfw/sys/amd64/include/pmap.h
projects/ipfw/sys/amd64/include/vmm.h (contents, props changed)
projects/ipfw/sys/amd64/vmm/intel/vmx.c
projects/ipfw/sys/amd64/vmm/vmm.c
projects/ipfw/sys/arm/altera/socfpga/files.socfpga
projects/ipfw/sys/arm/altera/socfpga/socfpga_machdep.c
projects/ipfw/sys/arm/arm/dump_machdep.c
projects/ipfw/sys/arm/arm/minidump_machdep.c
projects/ipfw/sys/arm/conf/EXYNOS5.common
projects/ipfw/sys/arm/conf/SOCKIT
projects/ipfw/sys/arm/include/md_var.h
projects/ipfw/sys/arm/samsung/exynos/exynos5_machdep.c
projects/ipfw/sys/arm/samsung/exynos/files.exynos5
projects/ipfw/sys/boot/common/disk.h
projects/ipfw/sys/boot/fdt/dts/arm/exynos5420-arndale-octa.dts
projects/ipfw/sys/boot/fdt/dts/arm/exynos5420-peach-pit.dts
projects/ipfw/sys/boot/fdt/dts/arm/exynos5420.dtsi
projects/ipfw/sys/boot/fdt/dts/arm/socfpga-sockit.dts
projects/ipfw/sys/boot/fdt/dts/arm/socfpga.dtsi
projects/ipfw/sys/boot/i386/gptboot/gptboot.c
projects/ipfw/sys/cam/cam_xpt.c
projects/ipfw/sys/cam/ctl/ctl.c
projects/ipfw/sys/cam/ctl/ctl_backend.h
projects/ipfw/sys/cam/ctl/ctl_backend_block.c
projects/ipfw/sys/cam/ctl/ctl_backend_ramdisk.c
projects/ipfw/sys/cam/ctl/ctl_cmd_table.c
projects/ipfw/sys/cam/ctl/ctl_frontend_cam_sim.c
projects/ipfw/sys/cam/ctl/ctl_frontend_iscsi.c
projects/ipfw/sys/cam/ctl/ctl_frontend_iscsi.h
projects/ipfw/sys/cam/ctl/ctl_private.h
projects/ipfw/sys/cam/ctl/scsi_ctl.c
projects/ipfw/sys/cam/scsi/scsi_all.h
projects/ipfw/sys/cddl/compat/opensolaris/sys/assfail.h
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
projects/ipfw/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
projects/ipfw/sys/compat/freebsd32/freebsd32_proto.h
projects/ipfw/sys/compat/freebsd32/freebsd32_syscall.h
projects/ipfw/sys/compat/freebsd32/freebsd32_syscalls.c
projects/ipfw/sys/compat/freebsd32/freebsd32_sysent.c
projects/ipfw/sys/compat/freebsd32/syscalls.master
projects/ipfw/sys/conf/files
projects/ipfw/sys/conf/newvers.sh
projects/ipfw/sys/dev/acpica/acpi.c
projects/ipfw/sys/dev/acpica/acpi_pci.c
projects/ipfw/sys/dev/acpica/acpivar.h
projects/ipfw/sys/dev/alc/if_alc.c
projects/ipfw/sys/dev/alc/if_alcreg.h
projects/ipfw/sys/dev/alc/if_alcvar.h
projects/ipfw/sys/dev/ale/if_ale.c
projects/ipfw/sys/dev/ale/if_alereg.h
projects/ipfw/sys/dev/cxgbe/common/t4_msg.h
projects/ipfw/sys/dev/cxgbe/tom/t4_connect.c
projects/ipfw/sys/dev/cxgbe/tom/t4_tom.c
projects/ipfw/sys/dev/cxgbe/tom/t4_tom.h
projects/ipfw/sys/dev/cxgbe/tom/t4_tom_l2t.c
projects/ipfw/sys/dev/drm2/i915/intel_ringbuffer.c
projects/ipfw/sys/dev/hwpmc/hwpmc_core.c
projects/ipfw/sys/dev/iscsi/icl.c
projects/ipfw/sys/dev/iscsi/icl.h
projects/ipfw/sys/dev/iscsi/iscsi.c
projects/ipfw/sys/dev/mmc/mmc.c
projects/ipfw/sys/dev/mpr/mpr_sas.c
projects/ipfw/sys/dev/mpr/mpr_table.c
projects/ipfw/sys/dev/mrsas/mrsas.c
projects/ipfw/sys/dev/mrsas/mrsas.h
projects/ipfw/sys/dev/mrsas/mrsas_cam.c
projects/ipfw/sys/dev/mrsas/mrsas_fp.c
projects/ipfw/sys/dev/mrsas/mrsas_ioctl.c
projects/ipfw/sys/dev/mrsas/mrsas_ioctl.h
projects/ipfw/sys/dev/pci/pci.c
projects/ipfw/sys/dev/usb/usb_freebsd.h
projects/ipfw/sys/dev/usb/usb_freebsd_loader.h
projects/ipfw/sys/dev/usb/usb_hub.c
projects/ipfw/sys/dev/usb/usbdevs
projects/ipfw/sys/dev/vt/vt_core.c
projects/ipfw/sys/fs/autofs/autofs.c
projects/ipfw/sys/geom/geom_dev.c
projects/ipfw/sys/i386/i386/machdep.c
projects/ipfw/sys/i386/i386/minidump_machdep.c
projects/ipfw/sys/i386/i386/pmap.c
projects/ipfw/sys/i386/i386/vm_machdep.c
projects/ipfw/sys/i386/include/md_var.h
projects/ipfw/sys/i386/include/pmap.h
projects/ipfw/sys/kern/bus_if.m
projects/ipfw/sys/kern/init_sysent.c
projects/ipfw/sys/kern/kern_timeout.c
projects/ipfw/sys/kern/subr_bus.c
projects/ipfw/sys/kern/syscalls.c
projects/ipfw/sys/kern/syscalls.master
projects/ipfw/sys/kern/tty.c
projects/ipfw/sys/kern/uipc_syscalls.c
projects/ipfw/sys/kern/vfs_bio.c
projects/ipfw/sys/mips/include/md_var.h
projects/ipfw/sys/mips/mips/dump_machdep.c
projects/ipfw/sys/mips/mips/minidump_machdep.c
projects/ipfw/sys/modules/mrsas/Makefile
projects/ipfw/sys/net/if_enc.c
projects/ipfw/sys/net/if_gif.c
projects/ipfw/sys/netinet/ip_gre.c
projects/ipfw/sys/netinet/sctp_output.c
projects/ipfw/sys/netinet/sctp_output.h
projects/ipfw/sys/netinet/sctp_usrreq.c
projects/ipfw/sys/netinet/tcp_output.c
projects/ipfw/sys/netinet/tcp_timer.c
projects/ipfw/sys/netinet/tcp_var.h
projects/ipfw/sys/netinet/udp_usrreq.c
projects/ipfw/sys/netinet6/udp6_usrreq.c
projects/ipfw/sys/netpfil/ipfw/ip_fw2.c
projects/ipfw/sys/ofed/drivers/net/mlx4/mlx4.h
projects/ipfw/sys/ofed/include/linux/mlx4/device.h
projects/ipfw/sys/sys/bus.h
projects/ipfw/sys/sys/mbuf.h
projects/ipfw/sys/sys/param.h
projects/ipfw/sys/sys/socketvar.h
projects/ipfw/sys/sys/syscall.h
projects/ipfw/sys/sys/syscall.mk
projects/ipfw/sys/sys/sysproto.h
projects/ipfw/sys/sys/systm.h
projects/ipfw/sys/ufs/ufs/dir.h
projects/ipfw/sys/x86/acpica/srat.c
projects/ipfw/sys/x86/x86/dump_machdep.c
projects/ipfw/sys/x86/x86/local_apic.c
projects/ipfw/tools/sched/schedgraph.py
projects/ipfw/usr.bin/basename/Makefile
projects/ipfw/usr.bin/cmp/Makefile
projects/ipfw/usr.bin/cut/Makefile
projects/ipfw/usr.bin/dirname/Makefile
projects/ipfw/usr.bin/find/function.c
projects/ipfw/usr.bin/grep/Makefile
projects/ipfw/usr.bin/gzip/Makefile
projects/ipfw/usr.bin/w/w.c
projects/ipfw/usr.sbin/autofs/common.c
projects/ipfw/usr.sbin/bhyve/pci_virtio_block.c
projects/ipfw/usr.sbin/ctladm/ctladm.8
projects/ipfw/usr.sbin/newsyslog/newsyslog.c
projects/ipfw/usr.sbin/nmtree/Makefile
projects/ipfw/usr.sbin/nscd/query.c
Directory Properties:
projects/ipfw/ (props changed)
projects/ipfw/cddl/ (props changed)
projects/ipfw/cddl/contrib/opensolaris/ (props changed)
projects/ipfw/contrib/byacc/ (props changed)
projects/ipfw/contrib/libpcap/ (props changed)
projects/ipfw/contrib/tcpdump/ (props changed)
projects/ipfw/etc/ (props changed)
projects/ipfw/include/ (props changed)
projects/ipfw/lib/libc/ (props changed)
projects/ipfw/lib/libc/stdtime/ (props changed)
projects/ipfw/sbin/ (props changed)
projects/ipfw/sbin/dumpon/ (props changed)
projects/ipfw/share/ (props changed)
projects/ipfw/share/man/man4/ (props changed)
projects/ipfw/sys/ (props changed)
projects/ipfw/sys/amd64/vmm/ (props changed)
projects/ipfw/sys/boot/ (props changed)
projects/ipfw/sys/cddl/contrib/opensolaris/ (props changed)
projects/ipfw/sys/conf/ (props changed)
projects/ipfw/usr.sbin/bhyve/ (props changed)
Modified: projects/ipfw/Makefile.inc1
==============================================================================
--- projects/ipfw/Makefile.inc1 Thu Oct 9 15:26:22 2014 (r272825)
+++ projects/ipfw/Makefile.inc1 Thu Oct 9 15:35:28 2014 (r272826)
@@ -299,6 +299,10 @@ HMAKE+= PATH=${TMPPATH} METALOG=${METAL
WMAKEENV+= MK_CTF=no
.endif
+.if defined(CROSS_TOOLCHAIN)
+LOCALBASE?= /usr/local
+.include "${LOCALBASE}/share/toolchains/${CROSS_TOOLCHAIN}.mk"
+.endif
.if defined(CROSS_TOOLCHAIN_PREFIX)
CROSS_COMPILER_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
CROSS_BINUTILS_PREFIX?=${CROSS_TOOLCHAIN_PREFIX}
@@ -311,7 +315,7 @@ X${COMPILER}?= ${CROSS_COMPILER_PREFIX}$
X${COMPILER}?= ${${COMPILER}}
.endif
.endfor
-XBINUTILS= AS AR LD NM OBJDUMP RANLIB STRINGS
+XBINUTILS= AS AR LD NM OBJCOPY OBJDUMP RANLIB STRINGS
.for BINUTIL in ${XBINUTILS}
.if defined(CROSS_BINUTILS_PREFIX)
X${BINUTIL}?= ${CROSS_BINUTILS_PREFIX}${${BINUTIL}}
@@ -322,7 +326,8 @@ X${BINUTIL}?= ${${BINUTIL}}
WMAKEENV+= CC="${XCC} ${XFLAGS}" CXX="${XCXX} ${XFLAGS}" \
CPP="${XCPP} ${XFLAGS}" \
AS="${XAS}" AR="${XAR}" LD="${XLD}" NM=${XNM} \
- OBJDUMP=${XOBJDUMP} RANLIB=${XRANLIB} STRINGS=${XSTRINGS}
+ OBJDUMP=${XOBJDUMP} OBJCOPY="${XOBJCOPY}" \
+ RANLIB=${XRANLIB} STRINGS=${XSTRINGS}
.if ${XCC:M/*}
XFLAGS= --sysroot=${WORLDTMP}
@@ -343,10 +348,14 @@ TARGET_ABI= gnueabihf
TARGET_ABI= gnueabi
.endif
.endif
+.if defined(X_COMPILER_TYPE) && ${X_COMPILER_TYPE} == gcc
+XFLAGS+= -isystem ${WORLDTMP}/usr/include -L${WORLDTMP}/usr/lib
+.else
TARGET_ABI?= unknown
TARGET_TRIPLE?= ${TARGET_ARCH:C/amd64/x86_64/}-${TARGET_ABI}-freebsd11.0
XFLAGS+= -target ${TARGET_TRIPLE}
.endif
+.endif
WMAKE= ${WMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 DESTDIR=${WORLDTMP}
Modified: projects/ipfw/bin/sleep/Makefile
==============================================================================
--- projects/ipfw/bin/sleep/Makefile Thu Oct 9 15:26:22 2014 (r272825)
+++ projects/ipfw/bin/sleep/Makefile Thu Oct 9 15:35:28 2014 (r272826)
@@ -1,6 +1,12 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
# $FreeBSD$
+.include <src.opts.mk>
+
PROG= sleep
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
.include <bsd.prog.mk>
Modified: projects/ipfw/cddl/contrib/opensolaris/cmd/zdb/zdb.c
==============================================================================
--- projects/ipfw/cddl/contrib/opensolaris/cmd/zdb/zdb.c Thu Oct 9 15:26:22 2014 (r272825)
+++ projects/ipfw/cddl/contrib/opensolaris/cmd/zdb/zdb.c Thu Oct 9 15:35:28 2014 (r272826)
@@ -76,8 +76,10 @@
#ifndef lint
extern boolean_t zfs_recover;
+extern uint64_t zfs_arc_max, zfs_arc_meta_limit;
#else
boolean_t zfs_recover;
+uint64_t zfs_arc_max, zfs_arc_meta_limit;
#endif
const char cmdname[] = "zdb";
@@ -89,7 +91,7 @@ extern void dump_intent_log(zilog_t *);
uint64_t *zopt_object = NULL;
int zopt_objects = 0;
libzfs_handle_t *g_zfs;
-uint64_t max_inflight = 200;
+uint64_t max_inflight = 1000;
/*
* These libumem hooks provide a reasonable set of defaults for the allocator's
@@ -2382,7 +2384,7 @@ zdb_blkptr_cb(spa_t *spa, zilog_t *zilog
zcb->zcb_readfails = 0;
- if (dump_opt['b'] < 5 && isatty(STDERR_FILENO) &&
+ if (dump_opt['b'] < 5 &&
gethrtime() > zcb->zcb_lastprint + NANOSEC) {
uint64_t now = gethrtime();
char buf[10];
@@ -2467,9 +2469,9 @@ zdb_leak_init(spa_t *spa, zdb_cb_t *zcb)
if (!dump_opt['L']) {
vdev_t *rvd = spa->spa_root_vdev;
- for (int c = 0; c < rvd->vdev_children; c++) {
+ for (uint64_t c = 0; c < rvd->vdev_children; c++) {
vdev_t *vd = rvd->vdev_child[c];
- for (int m = 0; m < vd->vdev_ms_count; m++) {
+ for (uint64_t m = 0; m < vd->vdev_ms_count; m++) {
metaslab_t *msp = vd->vdev_ms[m];
mutex_enter(&msp->ms_lock);
metaslab_unload(msp);
@@ -2482,6 +2484,15 @@ zdb_leak_init(spa_t *spa, zdb_cb_t *zcb)
* interfaces.
*/
if (msp->ms_sm != NULL) {
+ (void) fprintf(stderr,
+ "\rloading space map for "
+ "vdev %llu of %llu, "
+ "metaslab %llu of %llu ...",
+ (longlong_t)c,
+ (longlong_t)rvd->vdev_children,
+ (longlong_t)m,
+ (longlong_t)vd->vdev_ms_count);
+
msp->ms_ops = &zdb_metaslab_ops;
VERIFY0(space_map_load(msp->ms_sm,
msp->ms_tree, SM_ALLOC));
@@ -2490,6 +2501,7 @@ zdb_leak_init(spa_t *spa, zdb_cb_t *zcb)
mutex_exit(&msp->ms_lock);
}
}
+ (void) fprintf(stderr, "\n");
}
spa_config_enter(spa, SCL_CONFIG, FTAG, RW_READER);
@@ -3490,6 +3502,12 @@ main(int argc, char **argv)
usage();
}
+ /*
+ * ZDB does not typically re-read blocks; therefore limit the ARC
+ * to 256 MB, which can be used entirely for metadata.
+ */
+ zfs_arc_max = zfs_arc_meta_limit = 256 * 1024 * 1024;
+
kernel_init(FREAD);
g_zfs = libzfs_init();
ASSERT(g_zfs != NULL);
Modified: projects/ipfw/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y
==============================================================================
--- projects/ipfw/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y Thu Oct 9 15:26:22 2014 (r272825)
+++ projects/ipfw/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y Thu Oct 9 15:35:28 2014 (r272826)
@@ -207,6 +207,8 @@
%type <l_tok> unary_operator
%type <l_tok> struct_or_union
+%type <l_str> dtrace_keyword_ident
+
%%
dtrace_program: d_expression DT_TOK_EOF { return (dt_node_root($1)); }
@@ -391,12 +393,18 @@ postfix_expression:
| postfix_expression DT_TOK_DOT DT_TOK_TNAME {
$$ = OP2(DT_TOK_DOT, $1, dt_node_ident($3));
}
+ | postfix_expression DT_TOK_DOT dtrace_keyword_ident {
+ $$ = OP2(DT_TOK_DOT, $1, dt_node_ident($3));
+ }
| postfix_expression DT_TOK_PTR DT_TOK_IDENT {
$$ = OP2(DT_TOK_PTR, $1, dt_node_ident($3));
}
| postfix_expression DT_TOK_PTR DT_TOK_TNAME {
$$ = OP2(DT_TOK_PTR, $1, dt_node_ident($3));
}
+ | postfix_expression DT_TOK_PTR dtrace_keyword_ident {
+ $$ = OP2(DT_TOK_PTR, $1, dt_node_ident($3));
+ }
| postfix_expression DT_TOK_ADDADD {
$$ = OP1(DT_TOK_POSTINC, $1);
}
@@ -411,6 +419,10 @@ postfix_expression:
DT_TOK_TNAME DT_TOK_RPAR {
$$ = dt_node_offsetof($3, $5);
}
+ | DT_TOK_OFFSETOF DT_TOK_LPAR type_name DT_TOK_COMMA
+ dtrace_keyword_ident DT_TOK_RPAR {
+ $$ = dt_node_offsetof($3, $5);
+ }
| DT_TOK_XLATE DT_TOK_LT type_name DT_TOK_GT
DT_TOK_LPAR expression DT_TOK_RPAR {
$$ = OP2(DT_TOK_XLATE, dt_node_type($3), $6);
@@ -835,4 +847,15 @@ function_parameters:
| parameter_type_list { $$ = $1; }
;
+dtrace_keyword_ident:
+ DT_KEY_PROBE { $$ = DUP("probe"); }
+ | DT_KEY_PROVIDER { $$ = DUP("provider"); }
+ | DT_KEY_SELF { $$ = DUP("self"); }
+ | DT_KEY_STRING { $$ = DUP("string"); }
+ | DT_TOK_STRINGOF { $$ = DUP("stringof"); }
+ | DT_KEY_USERLAND { $$ = DUP("userland"); }
+ | DT_TOK_XLATE { $$ = DUP("xlate"); }
+ | DT_KEY_XLATOR { $$ = DUP("translator"); }
+ ;
+
%%
Modified: projects/ipfw/contrib/byacc/CHANGES
==============================================================================
--- projects/ipfw/contrib/byacc/CHANGES Thu Oct 9 15:26:22 2014 (r272825)
+++ projects/ipfw/contrib/byacc/CHANGES Thu Oct 9 15:35:28 2014 (r272826)
@@ -1,3 +1,145 @@
+2014-10-06 Thomas E. Dickey <tom at invisible-island.net>
+
+ * package/debian/source/format:
+ change to native format to work around regression in Debian packaging.
+
+ * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+ bump
+
+ * configure: regen
+
+ * main.c:
+ correct parameter for umask - for very old mkstemp's - and use type mode_t
+ to quiet compiler warning
+
+ * configure.in: add configure check for mode_t
+
+ * reader.c:
+ better fix for get_line, by ensuring there is enough space to null-terminate
+ its result (prompted by discussion with Craig Rodrigues).
+
+2014-10-05 Thomas E. Dickey <tom at invisible-island.net>
+
+ * main.c:
+ make change to umask before calling mkstemp, as suggested in Coverity #56902
+
+ * reader.c:
+ adjust logic in copy_action to avoid potential null-pointer dereference
+ (Coverity #56901)
+
+ * reader.c:
+ adjust logic to avoid potential null-pointer dereference in compile_args
+ (Coverity #63407)
+
+ * reader.c: eliminate strcpy into fixed-size buffer (Coverity #63408)
+
+ * yacc.1: document changes made with respect to %parse-param
+
+ * output.c:
+ add parameters from %parse-param to destructor. The order of the parameters
+ is intentionally inconsistent with yyparse/yyerror, for "compatibility" with
+ bison.
+
+ * test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.tab.c:
+ regen
+
+ * output.c:
+ use puts_param_types/puts_param_names to output lex_param data.
+
+ * test/btyacc/ok_syntax1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c, test/yacc/ok_syntax1.tab.c, test/yacc/calc2.tab.c, test/yacc/calc3.tab.c, test/btyacc/error.tab.c, test/btyacc/grammar.tab.c, test/btyacc/inherit0.tab.c, test/btyacc/inherit1.tab.c, test/btyacc/inherit2.tab.c, test/btyacc/pure_calc.tab.c, test/btyacc/pure_error.tab.c, test/btyacc/quote_calc-s.tab.c, test/btyacc/quote_calc.tab.c, test/btyacc/quote_calc2-s.tab.c, test/btyacc/quote_calc2.tab.c, test/btyacc/quote_calc3-s.tab.c, test/btyacc/quote_calc3.tab.c, test/btyacc/quote_calc4-s.tab.c, test/btyacc/quote_calc4.tab.c, test/btyacc/varsyntax_calc1.tab.c, test/btyacc/btyacc_calc1.tab.c, test/btyacc/btyacc_demo.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/code_calc.code.c, test/btyacc/code_error.code.c, test/btyacc/empty.tab.c, test/btyacc/err_inherit3.tab.c, test/btyacc/err_inherit4.tab.c, test/btyacc/err_syntax10.tab.c, test/btyacc/err_syntax11.tab.c, test/btyacc/err_syntax12.tab.c
, test/btyacc/err_syntax18.tab.c, test/btyacc/err_syntax20.tab.c, test/btyacc/rename_debug.c:
+ regen
+
+ * btyaccpar.c: add casts, change types to fix strict compiler warnings
+
+ * test/btyacc/err_syntax17.tab.c, test/btyacc/err_syntax19.tab.c, test/btyacc/err_syntax2.tab.c, test/btyacc/err_syntax21.tab.c, test/btyacc/err_syntax22.tab.c, test/btyacc/err_syntax23.tab.c, test/btyacc/err_syntax24.tab.c, test/btyacc/err_syntax25.tab.c, test/btyacc/err_syntax26.tab.c, test/btyacc/err_syntax27.tab.c, test/btyacc/err_syntax3.tab.c, test/btyacc/err_syntax4.tab.c, test/btyacc/err_syntax5.tab.c, test/btyacc/err_syntax6.tab.c, test/btyacc/err_syntax7.tab.c, test/btyacc/err_syntax7a.tab.c, test/btyacc/err_syntax7b.tab.c, test/btyacc/err_syntax8.tab.c, test/btyacc/err_syntax8a.tab.c, test/btyacc/err_syntax9.tab.c, test/btyacc/err_inherit1.tab.c, test/btyacc/err_inherit2.tab.c, test/btyacc/err_inherit5.tab.c, test/btyacc/err_syntax1.tab.c, test/btyacc/err_syntax13.tab.c, test/btyacc/err_syntax14.tab.c, test/btyacc/err_syntax15.tab.c, test/btyacc/err_syntax16.tab.c:
+ regen
+
+ * output.c: gcc-warning
+
+ * test/btyacc/code_calc.tab.c, test/btyacc/code_error.tab.c: regen
+
+ * output.c: fix limit when merging real/workaround tables
+
+ * output.c:
+ for btyacc, it is possible to have no conflicts - but in that case, the
+ "ctable" was not generated at all, while the skeleton uses the table.
+ The most straightforward (workaround) is generating a dummy table which
+ rejects any state.
+
+ * test/btyacc_destroy3.y, test/btyacc_destroy2.y, test/btyacc_destroy1.y:
+ fix "make check_make"
+
+ * test/yacc/calc3.tab.c, test/yacc/ok_syntax1.tab.c, test/yacc/calc2.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c:
+ regen
+
+ * reader.c:
+ trim blanks from interim value in copy_param() to handle special case when
+ a space precedes a comma.
+
+ * output.c:
+ use two new functions, puts_param_types and puts_param_names, to improve
+ format of the parse_param list (by trimming space after "*") as well as
+ correcting the output of the comma-separated names (only the last name
+ was output).
+
+ * test/btyacc/ok_syntax1.tab.c, test/btyacc/btyacc_destroy3.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.tab.c:
+ regen
+
+ * reader.c:
+ modify copy_param() to handle resulting comma-separated list. Before, it
+ only expected a single parameter.
+
+2014-10-04 Thomas E. Dickey <tom at invisible-island.net>
+
+ * reader.c: split-out save_param() from copy_param()
+
+ * reader.c: trim_blanks() did not always convert spaces - fix.
+
+ * reader.c: fix some minor regressions with error-reporting
+
+ * aclocal.m4: update CF_XOPEN_SOURCE for Unixware change from lynx
+
+ * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile:
+ bump
+
+ * reader.c:
+ modify copy_param() to accept multiple parameters, each in curly braces like
+ recent bison, as well as honoring bison's undocumented feature to accept the
+ parameters as a comma-separated list.
+
+ * test/btyacc/btyacc_destroy3.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.error, test/btyacc/btyacc_destroy3.output, test/btyacc/btyacc_destroy3.tab.h, test/btyacc/btyacc_destroy2.error, test/btyacc/btyacc_destroy2.output, test/btyacc/btyacc_destroy2.tab.h:
+ RCS_BASE
+
+2014-10-03 Thomas E. Dickey <tom at invisible-island.net>
+
+ * test/btyacc/btyacc_demo2.error, test/btyacc/btyacc_demo2.output, test/btyacc/btyacc_demo2.tab.c, test/btyacc/btyacc_demo2.tab.h, test/btyacc/btyacc_destroy1.error, test/btyacc/btyacc_destroy1.output, test/btyacc/btyacc_destroy1.tab.h, test/btyacc_destroy3.y, test/btyacc_destroy1.y, test/btyacc_destroy2.y:
+ RCS_BASE
+
+2014-10-02 Thomas E. Dickey <tom at invisible-island.net>
+
+ * main.c, reader.c, defs.h:
+ use calloc in get_line() when allocating line to ensure it is fully initialized,
+ fixes a later uninitialized value in copy_param() (FreeBSD #193499).
+
+2014-09-17 Thomas E. Dickey <tom at invisible-island.net>
+
+ * closure.c, lalr.c, output.c, defs.h:
+ rephrase odd addressing to fix Coverity #48848, #38950, #38860, not actually
+ a bug.
+
+2014-09-01 Thomas E. Dickey <tom at invisible-island.net>
+
+ * config.sub: update to 2014-07-28
+
+2014-07-27 Thomas E. Dickey <tom at invisible-island.net>
+
+ * configure: regen
+
+ * aclocal.m4: modified to support port to Minix3.2
+
+ * package/pkgsrc/Makefile, VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec:
+ bump
+
2014-07-15 Thomas E. Dickey <tom at invisible-island.net>
* aclocal.m4: resync with my-autoconf (no change to configure script)
Modified: projects/ipfw/contrib/byacc/MANIFEST
==============================================================================
--- projects/ipfw/contrib/byacc/MANIFEST Thu Oct 9 15:26:22 2014 (r272825)
+++ projects/ipfw/contrib/byacc/MANIFEST Thu Oct 9 15:35:28 2014 (r272826)
@@ -1,4 +1,4 @@
-MANIFEST for byacc-20140715, version t20140715
+MANIFEST for byacc-20141006, version t20141006
--------------------------------------------------------------------------------
MANIFEST this file
ACKNOWLEDGEMENTS original version of byacc - 1993
Modified: projects/ipfw/contrib/byacc/VERSION
==============================================================================
--- projects/ipfw/contrib/byacc/VERSION Thu Oct 9 15:26:22 2014 (r272825)
+++ projects/ipfw/contrib/byacc/VERSION Thu Oct 9 15:35:28 2014 (r272826)
@@ -1 +1 @@
-20140715
+20141006
Modified: projects/ipfw/contrib/byacc/aclocal.m4
==============================================================================
--- projects/ipfw/contrib/byacc/aclocal.m4 Thu Oct 9 15:26:22 2014 (r272825)
+++ projects/ipfw/contrib/byacc/aclocal.m4 Thu Oct 9 15:35:28 2014 (r272826)
@@ -1,4 +1,4 @@
-dnl $Id: aclocal.m4,v 1.35 2014/07/15 19:38:05 tom Exp $
+dnl $Id: aclocal.m4,v 1.37 2014/10/04 16:40:06 tom Exp $
dnl Macros for byacc configure script (Thomas E. Dickey)
dnl ---------------------------------------------------------------------------
dnl Copyright 2004-2013,2014 Thomas E. Dickey
@@ -54,7 +54,7 @@ define([CF_ACVERSION_COMPARE],
[ifelse([$8], , ,[$8])],
[ifelse([$9], , ,[$9])])])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_ADD_CFLAGS version: 10 updated: 2010/05/26 05:38:42
+dnl CF_ADD_CFLAGS version: 11 updated: 2014/07/22 05:32:57
dnl -------------
dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
dnl The second parameter if given makes this macro verbose.
@@ -79,7 +79,7 @@ no)
-D*)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[[^=]]*='\''\"[[^"]]*//'`
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=yes
@@ -116,7 +116,7 @@ yes)
cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'`
- test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+ test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
&& test -z "${cf_tst_cflags}" \
&& cf_fix_cppflags=no
;;
@@ -1085,7 +1085,7 @@ fi
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 46 updated: 2014/02/09 19:30:15
+dnl CF_XOPEN_SOURCE version: 48 updated: 2014/09/01 12:29:14
dnl ---------------
dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -1136,6 +1136,9 @@ irix[[56]].*) #(vi
linux*|gnu*|mint*|k*bsd*-gnu) #(vi
CF_GNU_SOURCE
;;
+minix*) #(vi
+ cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this...
+ ;;
mirbsd*) #(vi
# setting _XOPEN_SOURCE or _POSIX_SOURCE breaks <sys/select.h> and other headers which use u_int / u_short types
cf_XOPEN_SOURCE=
@@ -1165,6 +1168,10 @@ solaris2.*) #(vi
cf_xopen_source="-D__EXTENSIONS__"
cf_cv_xopen_source=broken
;;
+sysv4.2uw2.*) # Novell/SCO UnixWare 2.x (tested on 2.1.2)
+ cf_XOPEN_SOURCE=
+ cf_POSIX_C_SOURCE=
+ ;;
*)
CF_TRY_XOPEN_SOURCE
CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE)
@@ -1172,7 +1179,7 @@ solaris2.*) #(vi
esac
if test -n "$cf_xopen_source" ; then
- CF_ADD_CFLAGS($cf_xopen_source)
+ CF_ADD_CFLAGS($cf_xopen_source,true)
fi
dnl In anything but the default case, we may have system-specific setting
Modified: projects/ipfw/contrib/byacc/btyaccpar.c
==============================================================================
--- projects/ipfw/contrib/byacc/btyaccpar.c Thu Oct 9 15:26:22 2014 (r272825)
+++ projects/ipfw/contrib/byacc/btyaccpar.c Thu Oct 9 15:35:28 2014 (r272826)
@@ -18,7 +18,7 @@ const char *const banner[] =
{
"/* original parser id follows */",
"/* yysccsid[] = \"@(#)yaccpar 1.9 (Berkeley) 02/21/93\" */",
- "/* (use YYMAJOR/YYMINOR for ifdefs dependent on parser version) */",
+ "/* (use YYMAJOR/YYMINOR for ifdefs dependent of parser version) */",
"",
"#define YYBYACC 1",
CONCAT1("#define YYMAJOR ", YYMAJOR),
@@ -56,7 +56,7 @@ const char *const tables[] =
"#if YYBTYACC",
"extern const YYINT yycindex[];",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"extern const YYINT yygindex[];",
"extern const YYINT yytable[];",
"extern const YYINT yycheck[];",
@@ -64,7 +64,7 @@ const char *const tables[] =
"#if YYBTYACC",
"extern const YYINT yyctable[];",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"",
"#if YYDEBUG",
"extern const char *const yyname[];",
@@ -127,7 +127,7 @@ const char *const hdr_defs[] =
"#define YYLVQUEUEGROWTH 32",
"#endif",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"",
"/* define the initial stack-sizes */",
"#ifdef YYSTACKSIZE",
@@ -172,7 +172,7 @@ const char *const hdr_defs[] =
"};",
"typedef struct YYParseState_s YYParseState;",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
0
};
@@ -220,7 +220,7 @@ const char *const hdr_vars[] =
"",
"static short *yylexemes = 0;",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
0
};
@@ -277,7 +277,7 @@ const char *const body_vars[] =
"",
" static short *yylexemes = 0;",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
0
};
@@ -290,14 +290,14 @@ const char *const body_1[] =
"#if YYBTYACC",
"#define yytrial (yyps->save)",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"",
"#if YYDEBUG",
- "#include <stdio.h> /* needed for printf */",
+ "#include <stdio.h> /* needed for printf */",
"#endif",
"",
- "#include <stdlib.h> /* needed for malloc, etc */",
- "#include <string.h> /* needed for memset */",
+ "#include <stdlib.h> /* needed for malloc, etc */",
+ "#include <string.h> /* needed for memset */",
"",
"/* allocate initial stack or double stack size, up to YYMAXDEPTH */",
"static int yygrowstack(YYSTACKDATA *data)",
@@ -404,7 +404,7 @@ const char *const body_1[] =
" free(p);",
"}",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"",
"#define YYABORT goto yyabort",
"#define YYREJECT goto yyabort",
@@ -416,7 +416,7 @@ const char *const body_1[] =
"#define YYVALID_NESTED do { if (yyps->save && \\",
" yyps->save->save == 0) goto yyvalid; } while(0)",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"",
"int",
"YYPARSE_DECL()",
@@ -432,7 +432,7 @@ const char *const body_2[] =
" int yynewerrflag;",
" YYParseState *yyerrctx = NULL;",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
" YYLTYPE yyerror_loc_range[2]; /* position of error start & end */",
"#endif",
@@ -454,7 +454,7 @@ const char *const body_2[] =
" yyps = yyNewState(0); if (yyps == 0) goto yyenomem;",
" yyps->save = 0;",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" yynerrs = 0;",
" yyerrflag = 0;",
" yychar = YYEMPTY;",
@@ -495,8 +495,8 @@ const char *const body_2[] =
" /* in trial mode; save scanner results for future parse attempts */",
" if (yylvp == yylvlim)",
" { /* Enlarge lexical value queue */",
- " int p = yylvp - yylvals;",
- " int s = yylvlim - yylvals;",
+ " size_t p = (size_t) (yylvp - yylvals);",
+ " size_t s = (size_t) (yylvlim - yylvals);",
"",
" s += YYLVQUEUEGROWTH;",
" if ((yylexemes = (short *) realloc(yylexemes, s * sizeof(short))) == NULL) goto yyenomem;",
@@ -524,13 +524,13 @@ const char *const body_2[] =
" }",
" /* normal operation, no conflict encountered */",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" yychar = YYLEX;",
#if defined(YYBTYACC)
"#if YYBTYACC",
" } while (0);",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" if (yychar < 0) yychar = YYEOF;",
" /* if ((yychar = YYLEX) < 0) yychar = YYEOF; */",
"#if YYDEBUG",
@@ -544,7 +544,7 @@ const char *const body_2[] =
"#if YYBTYACC",
" if (!yytrial)",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" fprintf(stderr, \" <%s>\", YYSTYPE_TOSTRING(yychar, yylval));",
"#endif",
" fputc('\\n', stderr);",
@@ -598,12 +598,12 @@ const char *const body_2[] =
" save->state = yystate;",
" save->errflag = yyerrflag;",
" save->yystack.s_mark = save->yystack.s_base + (yystack.s_mark - yystack.s_base);",
- " memcpy (save->yystack.s_base, yystack.s_base, (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
+ " memcpy (save->yystack.s_base, yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
" save->yystack.l_mark = save->yystack.l_base + (yystack.l_mark - yystack.l_base);",
- " memcpy (save->yystack.l_base, yystack.l_base, (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
+ " memcpy (save->yystack.l_base, yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
" save->yystack.p_mark = save->yystack.p_base + (yystack.p_mark - yystack.p_base);",
- " memcpy (save->yystack.p_base, yystack.p_base, (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));",
+ " memcpy (save->yystack.p_base, yystack.p_base, (size_t) (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));",
"#endif",
" ctry = yytable[yyn];",
" if (yyctable[ctry] == -1)",
@@ -658,7 +658,7 @@ const char *const body_2[] =
" yylexp--;",
" yychar = YYEMPTY;",
" }",
- " save->lexeme = yylvp - yylvals;",
+ " save->lexeme = (int) (yylvp - yylvals);",
" yyps->save = save;",
" }",
" if (yytable[yyn] == ctry)",
@@ -695,7 +695,7 @@ const char *const body_2[] =
" }",
" } /* End of code dealing with conflicts */",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" if (((yyn = yysindex[yystate]) != 0) && (yyn += yychar) >= 0 &&",
" yyn <= YYTABLESIZE && yycheck[yyn] == (YYINT) yychar)",
" {",
@@ -754,14 +754,14 @@ const char *const body_2[] =
" yyerrctx->state = yystate;",
" yyerrctx->errflag = yyerrflag;",
" yyerrctx->yystack.s_mark = yyerrctx->yystack.s_base + (yystack.s_mark - yystack.s_base);",
- " memcpy (yyerrctx->yystack.s_base, yystack.s_base, (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
+ " memcpy (yyerrctx->yystack.s_base, yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
" yyerrctx->yystack.l_mark = yyerrctx->yystack.l_base + (yystack.l_mark - yystack.l_base);",
- " memcpy (yyerrctx->yystack.l_base, yystack.l_base, (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
+ " memcpy (yyerrctx->yystack.l_base, yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
" yyerrctx->yystack.p_mark = yyerrctx->yystack.p_base + (yystack.p_mark - yystack.p_base);",
- " memcpy (yyerrctx->yystack.p_base, yystack.p_base, (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));",
+ " memcpy (yyerrctx->yystack.p_base, yystack.p_base, (size_t) (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));",
"#endif",
- " yyerrctx->lexeme = yylvp - yylvals;",
+ " yyerrctx->lexeme = (int) (yylvp - yylvals);",
" }",
" yylvp = yylvals + save->lexeme;",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
@@ -770,12 +770,12 @@ const char *const body_2[] =
" yylexp = yylexemes + save->lexeme;",
" yychar = YYEMPTY;",
" yystack.s_mark = yystack.s_base + (save->yystack.s_mark - save->yystack.s_base);",
- " memcpy (yystack.s_base, save->yystack.s_base, (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
+ " memcpy (yystack.s_base, save->yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
" yystack.l_mark = yystack.l_base + (save->yystack.l_mark - save->yystack.l_base);",
- " memcpy (yystack.l_base, save->yystack.l_base, (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
+ " memcpy (yystack.l_base, save->yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
" yystack.p_mark = yystack.p_base + (save->yystack.p_mark - save->yystack.p_base);",
- " memcpy (yystack.p_base, save->yystack.p_base, (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));",
+ " memcpy (yystack.p_base, save->yystack.p_base, (size_t) (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));",
"#endif",
" ctry = ++save->ctry;",
" yystate = save->state;",
@@ -805,12 +805,12 @@ const char *const body_2[] =
" yylloc = yylpp[-1];",
"#endif",
" yystack.s_mark = yystack.s_base + (yyerrctx->yystack.s_mark - yyerrctx->yystack.s_base);",
- " memcpy (yystack.s_base, yyerrctx->yystack.s_base, (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
+ " memcpy (yystack.s_base, yyerrctx->yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
" yystack.l_mark = yystack.l_base + (yyerrctx->yystack.l_mark - yyerrctx->yystack.l_base);",
- " memcpy (yystack.l_base, yyerrctx->yystack.l_base, (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
+ " memcpy (yystack.l_base, yyerrctx->yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
" yystack.p_mark = yystack.p_base + (yyerrctx->yystack.p_mark - yyerrctx->yystack.p_base);",
- " memcpy (yystack.p_base, yyerrctx->yystack.p_base, (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));",
+ " memcpy (yystack.p_base, yyerrctx->yystack.p_base, (size_t) (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));",
"#endif",
" yystate = yyerrctx->state;",
" yyFreeState(yyerrctx);",
@@ -820,7 +820,7 @@ const char *const body_2[] =
" }",
" if (yynewerrflag == 0) goto yyinrecovery;",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"",
" YYERROR_CALL(\"syntax error\");",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
@@ -876,7 +876,7 @@ const char *const body_2[] =
"#if YYBTYACC",
" if (!yytrial)",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
" YYDESTRUCT_CALL(\"error: discarding state\",",
" yystos[*yystack.s_mark], yystack.l_mark, yystack.p_mark);",
@@ -909,7 +909,7 @@ const char *const body_2[] =
"#if YYBTYACC",
" if (!yytrial)",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
" YYDESTRUCT_CALL(\"error: discarding token\", yychar, &yylval, &yylloc);",
"#else",
@@ -932,7 +932,7 @@ const char *const body_2[] =
"#if YYBTYACC",
" if (!yytrial)",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" if (yym > 0)",
" {",
" int i;",
@@ -961,7 +961,7 @@ const char *const body_2[] =
"#if YYBTYACC",
" if (!yytrial)",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" {",
" YYLLOC_DEFAULT(yyloc, &yystack.p_mark[1-yym], yym);",
" /* just in case YYERROR is invoked within the action, save",
@@ -998,7 +998,7 @@ const char *const trailer[] =
"#if YYBTYACC",
" if (!yytrial)",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" fprintf(stderr, \"result is <%s>, \", YYSTYPE_TOSTRING(yystos[YYFINAL], yyval));",
"#endif",
" fprintf(stderr, \"shifting from state 0 to final state %d\\n\", YYFINAL);",
@@ -1030,8 +1030,8 @@ const char *const trailer[] =
" /* in trial mode; save scanner results for future parse attempts */",
" if (yylvp == yylvlim)",
" { /* Enlarge lexical value queue */",
- " int p = yylvp - yylvals;",
- " int s = yylvlim - yylvals;",
+ " size_t p = (size_t) (yylvp - yylvals);",
+ " size_t s = (size_t) (yylvlim - yylvals);",
"",
" s += YYLVQUEUEGROWTH;",
" if ((yylexemes = (short *) realloc(yylexemes, s * sizeof(short))) == NULL)",
@@ -1062,13 +1062,13 @@ const char *const trailer[] =
" }",
" /* normal operation, no conflict encountered */",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" yychar = YYLEX;",
#if defined(YYBTYACC)
"#if YYBTYACC",
" } while (0);",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" if (yychar < 0) yychar = YYEOF;",
" /* if ((yychar = YYLEX) < 0) yychar = YYEOF; */",
"#if YYDEBUG",
@@ -1097,7 +1097,7 @@ const char *const trailer[] =
"#if YYBTYACC",
" if (!yytrial)",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" fprintf(stderr, \"result is <%s>, \", YYSTYPE_TOSTRING(yystos[yystate], yyval));",
"#endif",
" fprintf(stderr, \"shifting from state %d to state %d\\n\", *yystack.s_mark, yystate);",
@@ -1140,17 +1140,17 @@ const char *const trailer[] =
" yylexp = yylexemes + yypath->lexeme;",
" yychar = YYEMPTY;",
" yystack.s_mark = yystack.s_base + (yypath->yystack.s_mark - yypath->yystack.s_base);",
- " memcpy (yystack.s_base, yypath->yystack.s_base, (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
+ " memcpy (yystack.s_base, yypath->yystack.s_base, (size_t) (yystack.s_mark - yystack.s_base + 1) * sizeof(short));",
" yystack.l_mark = yystack.l_base + (yypath->yystack.l_mark - yypath->yystack.l_base);",
- " memcpy (yystack.l_base, yypath->yystack.l_base, (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
+ " memcpy (yystack.l_base, yypath->yystack.l_base, (size_t) (yystack.l_mark - yystack.l_base + 1) * sizeof(YYSTYPE));",
"#if defined(YYLTYPE) || defined(YYLTYPE_IS_DECLARED)",
" yystack.p_mark = yystack.p_base + (yypath->yystack.p_mark - yypath->yystack.p_base);",
- " memcpy (yystack.p_base, yypath->yystack.p_base, (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));",
+ " memcpy (yystack.p_base, yypath->yystack.p_base, (size_t) (yystack.p_mark - yystack.p_base + 1) * sizeof(YYLTYPE));",
"#endif",
" yystate = yypath->state;",
" goto yyloop;",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
"",
"yyoverflow:",
" YYERROR_CALL(\"yacc stack overflow\");",
@@ -1161,7 +1161,7 @@ const char *const trailer[] =
" YYERROR_CALL(\"memory exhausted\");",
"yyabort_nomem:",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" yyresult = 2;",
" goto yyreturn;",
"",
@@ -1174,7 +1174,7 @@ const char *const trailer[] =
"#if YYBTYACC",
" if (yyps->save) goto yyvalid;",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" yyresult = 0;",
"",
"yyreturn:",
@@ -1224,7 +1224,7 @@ const char *const trailer[] =
" yyFreeState(save);",
" }",
"#endif /* YYBTYACC */",
-#endif /* defined(YYBTYACC) */
+#endif /* defined(YYBTYACC) */
" yyfreestack(&yystack);",
" return (yyresult);",
"}",
Modified: projects/ipfw/contrib/byacc/closure.c
==============================================================================
--- projects/ipfw/contrib/byacc/closure.c Thu Oct 9 15:26:22 2014 (r272825)
+++ projects/ipfw/contrib/byacc/closure.c Thu Oct 9 15:35:28 2014 (r272826)
@@ -1,4 +1,4 @@
-/* $Id: closure.c,v 1.10 2014/02/19 00:45:42 Tom.Shields Exp $ */
+/* $Id: closure.c,v 1.11 2014/09/18 00:40:07 tom Exp $ */
#include "defs.h"
@@ -6,6 +6,7 @@ Value_t *itemset;
Value_t *itemsetend;
unsigned *ruleset;
+static unsigned *first_base;
static unsigned *first_derives;
static unsigned *EFF;
@@ -68,7 +69,8 @@ set_first_derives(void)
rulesetsize = WORDSIZE(nrules);
varsetsize = WORDSIZE(nvars);
- first_derives = NEW2(nvars * rulesetsize, unsigned) - ntokens * rulesetsize;
+ first_base = NEW2(nvars * rulesetsize, unsigned);
+ first_derives = first_base - ntokens * rulesetsize;
set_EFF();
@@ -176,7 +178,7 @@ finalize_closure(void)
{
FREE(itemset);
FREE(ruleset);
- FREE(first_derives + ntokens * WORDSIZE(nrules));
+ FREE(first_base);
}
#ifdef DEBUG
Modified: projects/ipfw/contrib/byacc/config.sub
==============================================================================
--- projects/ipfw/contrib/byacc/config.sub Thu Oct 9 15:26:22 2014 (r272825)
+++ projects/ipfw/contrib/byacc/config.sub Thu Oct 9 15:35:28 2014 (r272826)
@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2014 Free Software Foundation, Inc.
-timestamp='2014-04-03'
+timestamp='2014-07-28'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -283,8 +283,10 @@ case $basic_machine in
| mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
+ | mipsisa32r6 | mipsisa32r6el \
| mipsisa64 | mipsisa64el \
| mipsisa64r2 | mipsisa64r2el \
+ | mipsisa64r6 | mipsisa64r6el \
| mipsisa64sb1 | mipsisa64sb1el \
| mipsisa64sr71k | mipsisa64sr71kel \
| mipsr5900 | mipsr5900el \
@@ -401,8 +403,10 @@ case $basic_machine in
| mips64vr5900-* | mips64vr5900el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
+ | mipsisa32r6-* | mipsisa32r6el-* \
| mipsisa64-* | mipsisa64el-* \
| mipsisa64r2-* | mipsisa64r2el-* \
+ | mipsisa64r6-* | mipsisa64r6el-* \
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipsr5900-* | mipsr5900el-* \
@@ -824,6 +828,10 @@ case $basic_machine in
basic_machine=powerpc-unknown
os=-morphos
;;
+ moxiebox)
+ basic_machine=moxie-unknown
+ os=-moxiebox
+ ;;
msdos)
basic_machine=i386-pc
os=-msdos
@@ -1369,7 +1377,7 @@ case $os in
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
Modified: projects/ipfw/contrib/byacc/configure
==============================================================================
--- projects/ipfw/contrib/byacc/configure Thu Oct 9 15:26:22 2014 (r272825)
+++ projects/ipfw/contrib/byacc/configure Thu Oct 9 15:35:28 2014 (r272826)
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 1.19 .
+# From configure.in Revision: 1.20 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by Autoconf 2.52.20121002.
#
@@ -106,6 +106,42 @@ SHELL=${CONFIG_SHELL-/bin/sh}
: ${ac_max_here_lines=38}
ac_unique_file="main.c"
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#if HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#if STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# if HAVE_STDLIB_H
+# include <stdlib.h>
+# endif
+#endif
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
+# include <memory.h>
+# endif
+# include <string.h>
+#endif
+#if HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#if HAVE_INTTYPES_H
+# include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+# include <stdint.h>
+# endif
+#endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
# Initialize some variables set by options.
ac_init_help=
@@ -854,7 +890,7 @@ if test -z "$CONFIG_SITE"; then
fi
for ac_site_file in $CONFIG_SITE; do
if test -r "$ac_site_file"; then
- { echo "$as_me:857: loading site script $ac_site_file" >&5
+ { echo "$as_me:893: loading site script $ac_site_file" >&5
echo "$as_me: loading site script $ac_site_file" >&6;}
cat "$ac_site_file" >&5
. "$ac_site_file"
@@ -865,7 +901,7 @@ if test -r "$cache_file"; then
# Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
- { echo "$as_me:868: loading cache $cache_file" >&5
+ { echo "$as_me:904: loading cache $cache_file" >&5
echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -873,7 +909,7 @@ echo "$as_me: loading cache $cache_file"
esac
fi
else
- { echo "$as_me:876: creating cache $cache_file" >&5
+ { echo "$as_me:912: creating cache $cache_file" >&5
echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
@@ -889,21 +925,21 @@ for ac_var in `(set) 2>&1 |
eval ac_new_val="\$ac_env_${ac_var}_value"
case $ac_old_set,$ac_new_set in
set,)
- { echo "$as_me:892: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ { echo "$as_me:928: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
- { echo "$as_me:896: error: \`$ac_var' was not set in the previous run" >&5
+ { echo "$as_me:932: error: \`$ac_var' was not set in the previous run" >&5
echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
*)
if test "x$ac_old_val" != "x$ac_new_val"; then
- { echo "$as_me:902: error: \`$ac_var' has changed since the previous run:" >&5
+ { echo "$as_me:938: error: \`$ac_var' has changed since the previous run:" >&5
echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list