Date: Sun, 5 Feb 2017 20:03:06 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r313301 - in projects/clang400-import: . cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt cddl/contrib/opensolaris/lib/libdtrace/common contrib/byacc contrib/byacc/package contr... Message-ID: <201702052003.v15K36MV051361@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Sun Feb 5 20:03:05 2017 New Revision: 313301 URL: https://svnweb.freebsd.org/changeset/base/313301 Log: Merge ^/head r313055 through r313300. Added: projects/clang400-import/contrib/byacc/test/btyacc/expr.oxout.error - copied unchanged from r313300, head/contrib/byacc/test/btyacc/expr.oxout.error projects/clang400-import/contrib/byacc/test/btyacc/expr.oxout.output - copied unchanged from r313300, head/contrib/byacc/test/btyacc/expr.oxout.output projects/clang400-import/contrib/byacc/test/btyacc/expr.oxout.tab.c - copied unchanged from r313300, head/contrib/byacc/test/btyacc/expr.oxout.tab.c projects/clang400-import/contrib/byacc/test/btyacc/expr.oxout.tab.h - copied unchanged from r313300, head/contrib/byacc/test/btyacc/expr.oxout.tab.h projects/clang400-import/contrib/byacc/test/expr.oxout.y - copied unchanged from r313300, head/contrib/byacc/test/expr.oxout.y projects/clang400-import/contrib/byacc/test/yacc/expr.oxout.error - copied unchanged from r313300, head/contrib/byacc/test/yacc/expr.oxout.error projects/clang400-import/contrib/byacc/test/yacc/expr.oxout.output - copied unchanged from r313300, head/contrib/byacc/test/yacc/expr.oxout.output projects/clang400-import/contrib/byacc/test/yacc/expr.oxout.tab.c - copied unchanged from r313300, head/contrib/byacc/test/yacc/expr.oxout.tab.c projects/clang400-import/contrib/byacc/test/yacc/expr.oxout.tab.h - copied unchanged from r313300, head/contrib/byacc/test/yacc/expr.oxout.tab.h projects/clang400-import/contrib/libarchive/libarchive/test/test_acl_platform_nfs4.c - copied unchanged from r313300, head/contrib/libarchive/libarchive/test/test_acl_platform_nfs4.c projects/clang400-import/contrib/libarchive/libarchive/test/test_acl_platform_posix1e.c - copied unchanged from r313300, head/contrib/libarchive/libarchive/test/test_acl_platform_posix1e.c projects/clang400-import/sbin/nvmecontrol/wdc.c - copied unchanged from r313300, head/sbin/nvmecontrol/wdc.c projects/clang400-import/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace_xoroshiro128_plus.c - copied unchanged from r313300, head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace_xoroshiro128_plus.c projects/clang400-import/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace_xoroshiro128_plus.h - copied unchanged from r313300, head/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace_xoroshiro128_plus.h Deleted: projects/clang400-import/contrib/libarchive/libarchive/test/test_acl_freebsd_nfs4.c projects/clang400-import/contrib/libarchive/libarchive/test/test_acl_freebsd_posix1e.c Modified: projects/clang400-import/Makefile.inc1 projects/clang400-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh projects/clang400-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.include.ksh projects/clang400-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c projects/clang400-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c projects/clang400-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c projects/clang400-import/contrib/byacc/CHANGES projects/clang400-import/contrib/byacc/MANIFEST projects/clang400-import/contrib/byacc/VERSION projects/clang400-import/contrib/byacc/aclocal.m4 projects/clang400-import/contrib/byacc/config.guess projects/clang400-import/contrib/byacc/config.sub projects/clang400-import/contrib/byacc/configure projects/clang400-import/contrib/byacc/defs.h projects/clang400-import/contrib/byacc/main.c projects/clang400-import/contrib/byacc/package/byacc.spec projects/clang400-import/contrib/byacc/package/debian/changelog projects/clang400-import/contrib/byacc/package/debian/copyright projects/clang400-import/contrib/byacc/package/mingw-byacc.spec projects/clang400-import/contrib/byacc/package/pkgsrc/Makefile projects/clang400-import/contrib/byacc/reader.c projects/clang400-import/contrib/libarchive/NEWS projects/clang400-import/contrib/libarchive/libarchive/archive_acl.c projects/clang400-import/contrib/libarchive/libarchive/archive_acl_private.h projects/clang400-import/contrib/libarchive/libarchive/archive_entry.c projects/clang400-import/contrib/libarchive/libarchive/archive_entry_strmode.c projects/clang400-import/contrib/libarchive/libarchive/archive_platform.h projects/clang400-import/contrib/libarchive/libarchive/archive_random.c projects/clang400-import/contrib/libarchive/libarchive/archive_read_disk_entry_from_file.c projects/clang400-import/contrib/libarchive/libarchive/archive_read_open_filename.c projects/clang400-import/contrib/libarchive/libarchive/archive_read_support_filter_lz4.c projects/clang400-import/contrib/libarchive/libarchive/archive_read_support_filter_program.c projects/clang400-import/contrib/libarchive/libarchive/archive_read_support_format_cab.c projects/clang400-import/contrib/libarchive/libarchive/archive_read_support_format_cpio.c projects/clang400-import/contrib/libarchive/libarchive/archive_read_support_format_iso9660.c projects/clang400-import/contrib/libarchive/libarchive/archive_read_support_format_lha.c projects/clang400-import/contrib/libarchive/libarchive/archive_read_support_format_mtree.c projects/clang400-import/contrib/libarchive/libarchive/archive_read_support_format_tar.c projects/clang400-import/contrib/libarchive/libarchive/archive_read_support_format_warc.c projects/clang400-import/contrib/libarchive/libarchive/archive_read_support_format_xar.c projects/clang400-import/contrib/libarchive/libarchive/archive_read_support_format_zip.c projects/clang400-import/contrib/libarchive/libarchive/archive_write_add_filter_program.c projects/clang400-import/contrib/libarchive/libarchive/archive_write_disk_acl.c projects/clang400-import/contrib/libarchive/libarchive/archive_write_disk_posix.c projects/clang400-import/contrib/libarchive/libarchive/archive_write_open.3 projects/clang400-import/contrib/libarchive/libarchive/archive_write_set_format_gnutar.c projects/clang400-import/contrib/libarchive/libarchive/archive_write_set_format_iso9660.c projects/clang400-import/contrib/libarchive/libarchive/archive_write_set_format_xar.c projects/clang400-import/contrib/libarchive/libarchive/test/main.c projects/clang400-import/contrib/libarchive/libarchive/test/test.h projects/clang400-import/contrib/libarchive/libarchive/test/test_acl_text.c projects/clang400-import/contrib/libarchive/libarchive/test/test_archive_string.c projects/clang400-import/contrib/libarchive/libarchive/test/test_compat_gtar.c projects/clang400-import/contrib/libarchive/libarchive/test/test_compat_solaris_tar_acl.c projects/clang400-import/contrib/libarchive/libarchive/test/test_compat_solaris_tar_acl.tar.uu projects/clang400-import/contrib/libarchive/libarchive/test/test_fuzz.c projects/clang400-import/contrib/libarchive/libarchive/test/test_read_disk_directory_traversals.c projects/clang400-import/contrib/libarchive/libarchive/test/test_read_filter_lzop.c projects/clang400-import/contrib/libarchive/libarchive/test/test_read_filter_lzop_multiple_parts.c projects/clang400-import/contrib/libarchive/libarchive/test/test_read_format_zip.c projects/clang400-import/contrib/libarchive/libarchive/test/test_read_format_zip_comment_stored.c projects/clang400-import/contrib/libarchive/libarchive/test/test_read_format_zip_mac_metadata.c projects/clang400-import/contrib/libarchive/libarchive/test/test_read_format_zip_malformed.c projects/clang400-import/contrib/libarchive/libarchive/test/test_read_format_zip_nested.c projects/clang400-import/contrib/libarchive/libarchive/test/test_read_format_zip_padded.c projects/clang400-import/contrib/libarchive/libarchive/test/test_read_format_zip_sfx.c projects/clang400-import/contrib/libarchive/libarchive/test/test_write_disk_secure746.c projects/clang400-import/contrib/libarchive/libarchive/test/test_write_filter_lz4.c projects/clang400-import/contrib/libarchive/libarchive/test/test_write_filter_lzop.c projects/clang400-import/contrib/libarchive/libarchive/test/test_write_format_zip_large.c projects/clang400-import/contrib/libarchive/libarchive/test/test_write_format_zip_zip64.c projects/clang400-import/contrib/libarchive/tar/test/test_option_uid_uname.c projects/clang400-import/contrib/libarchive/tar/util.c projects/clang400-import/contrib/tcpdump/config.h.in projects/clang400-import/contrib/tcpdump/configure projects/clang400-import/contrib/tcpdump/configure.in projects/clang400-import/contrib/tcpdump/tcpdump.c projects/clang400-import/etc/devd.conf projects/clang400-import/etc/periodic/daily/999.local projects/clang400-import/etc/periodic/monthly/999.local projects/clang400-import/etc/periodic/weekly/999.local projects/clang400-import/lib/libarchive/config_freebsd.h projects/clang400-import/lib/libarchive/tests/Makefile projects/clang400-import/lib/libc/aarch64/gen/setjmp.S projects/clang400-import/lib/libc/gen/getpeereid.3 projects/clang400-import/lib/libc/sys/recv.2 projects/clang400-import/libexec/getty/gettytab.5 projects/clang400-import/libexec/getty/subr.c projects/clang400-import/sbin/decryptcore/decryptcore.c projects/clang400-import/sbin/hastctl/Makefile projects/clang400-import/sbin/hastd/Makefile projects/clang400-import/sbin/hastd/hast_checksum.c projects/clang400-import/sbin/hastd/hast_proto.c projects/clang400-import/sbin/ifconfig/ifieee80211.c projects/clang400-import/sbin/kldload/kldload.c projects/clang400-import/sbin/nvmecontrol/Makefile projects/clang400-import/sbin/nvmecontrol/firmware.c projects/clang400-import/sbin/nvmecontrol/logpage.c projects/clang400-import/sbin/nvmecontrol/nvmecontrol.8 projects/clang400-import/sbin/nvmecontrol/nvmecontrol.c projects/clang400-import/sbin/nvmecontrol/nvmecontrol.h projects/clang400-import/sbin/resolvconf/Makefile projects/clang400-import/sbin/savecore/savecore.c projects/clang400-import/share/man/man4/unix.4 projects/clang400-import/sys/amd64/include/pcpu.h projects/clang400-import/sys/amd64/linux/linux_dummy.c projects/clang400-import/sys/amd64/linux/linux_proto.h projects/clang400-import/sys/amd64/linux/linux_syscall.h projects/clang400-import/sys/amd64/linux/linux_syscalls.c projects/clang400-import/sys/amd64/linux/linux_sysent.c projects/clang400-import/sys/amd64/linux/linux_systrace_args.c projects/clang400-import/sys/amd64/linux/syscalls.master projects/clang400-import/sys/amd64/linux32/linux32_dummy.c projects/clang400-import/sys/amd64/linux32/linux32_proto.h projects/clang400-import/sys/amd64/linux32/linux32_syscall.h projects/clang400-import/sys/amd64/linux32/linux32_syscalls.c projects/clang400-import/sys/amd64/linux32/linux32_sysent.c projects/clang400-import/sys/amd64/linux32/linux32_systrace_args.c projects/clang400-import/sys/amd64/linux32/syscalls.master projects/clang400-import/sys/arm/allwinner/std.allwinner projects/clang400-import/sys/arm/allwinner/std.allwinner_up projects/clang400-import/sys/arm/altera/socfpga/std.socfpga projects/clang400-import/sys/arm/amlogic/aml8726/std.aml8726 projects/clang400-import/sys/arm/annapurna/alpine/std.alpine projects/clang400-import/sys/arm/arm/cpufunc.c projects/clang400-import/sys/arm/arm/pmap-v6.c projects/clang400-import/sys/arm/broadcom/bcm2835/std.bcm2836 projects/clang400-import/sys/arm/conf/GENERIC projects/clang400-import/sys/arm/freescale/imx/std.imx51 projects/clang400-import/sys/arm/freescale/imx/std.imx53 projects/clang400-import/sys/arm/freescale/imx/std.imx6 projects/clang400-import/sys/arm/freescale/vybrid/std.vybrid projects/clang400-import/sys/arm/include/_types.h projects/clang400-import/sys/arm/include/asmacros.h projects/clang400-import/sys/arm/include/atomic-v4.h projects/clang400-import/sys/arm/include/cpu-v6.h projects/clang400-import/sys/arm/include/cpufunc.h projects/clang400-import/sys/arm/include/intr.h projects/clang400-import/sys/arm/include/sysreg.h projects/clang400-import/sys/arm/mv/armada38x/std.armada38x projects/clang400-import/sys/arm/nvidia/tegra124/std.tegra124 projects/clang400-import/sys/arm/qemu/std.virt projects/clang400-import/sys/arm/rockchip/std.rk30xx projects/clang400-import/sys/arm/samsung/exynos/std.exynos5250 projects/clang400-import/sys/arm/samsung/exynos/std.exynos5420 projects/clang400-import/sys/arm/ti/am335x/am335x_lcd.c projects/clang400-import/sys/arm/ti/am335x/std.am335x projects/clang400-import/sys/arm/ti/omap4/std.omap4 projects/clang400-import/sys/arm/xilinx/std.zynq7 projects/clang400-import/sys/arm64/include/_types.h projects/clang400-import/sys/boot/efi/libefi/Makefile projects/clang400-import/sys/boot/efi/libefi/env.c projects/clang400-import/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/clang400-import/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h projects/clang400-import/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h projects/clang400-import/sys/cddl/dev/dtrace/dtrace_ioctl.c projects/clang400-import/sys/cddl/dev/dtrace/x86/dis_tables.c projects/clang400-import/sys/cddl/dev/dtrace/x86/dis_tables.h projects/clang400-import/sys/compat/freebsd32/freebsd32_misc.c projects/clang400-import/sys/compat/linux/linux_file.c projects/clang400-import/sys/compat/linux/linux_misc.c projects/clang400-import/sys/compat/linux/linux_socket.h projects/clang400-import/sys/conf/files.arm projects/clang400-import/sys/conf/files.i386 projects/clang400-import/sys/conf/options.arm projects/clang400-import/sys/conf/options.i386 projects/clang400-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300.h projects/clang400-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c projects/clang400-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c projects/clang400-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_radar.c projects/clang400-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c projects/clang400-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_spectral.c projects/clang400-import/sys/contrib/dev/ath/ath_hal/ar9300/ar9300phy.h projects/clang400-import/sys/dev/ath/ath_hal/ah.c projects/clang400-import/sys/dev/ath/ath_hal/ah.h projects/clang400-import/sys/dev/ath/ath_hal/ah_debug.h projects/clang400-import/sys/dev/ath/if_ath_spectral.c projects/clang400-import/sys/dev/ath/if_athioctl.h projects/clang400-import/sys/dev/cesa/cesa.h projects/clang400-import/sys/dev/de/dc21040reg.h projects/clang400-import/sys/dev/mmc/mmc.c projects/clang400-import/sys/dev/mmc/mmcreg.h projects/clang400-import/sys/dev/nvme/nvme_ctrlr.c projects/clang400-import/sys/dev/pci/pci_pci.c projects/clang400-import/sys/dev/pci/pcib_private.h projects/clang400-import/sys/dev/sdhci/sdhci.c projects/clang400-import/sys/dev/sdhci/sdhci.h projects/clang400-import/sys/dev/sdhci/sdhci_fdt.c projects/clang400-import/sys/dev/sdhci/sdhci_pci.c projects/clang400-import/sys/dev/usb/serial/uftdi.c projects/clang400-import/sys/dev/usb/serial/usb_serial.c projects/clang400-import/sys/dev/usb/serial/usb_serial.h projects/clang400-import/sys/geom/part/g_part_gpt.c projects/clang400-import/sys/i386/conf/DEFAULTS projects/clang400-import/sys/i386/conf/NOTES projects/clang400-import/sys/i386/i386/elf_machdep.c projects/clang400-import/sys/i386/i386/exception.s projects/clang400-import/sys/i386/i386/initcpu.c projects/clang400-import/sys/i386/i386/machdep.c projects/clang400-import/sys/i386/i386/mp_machdep.c projects/clang400-import/sys/i386/i386/pmap.c projects/clang400-import/sys/i386/i386/ptrace_machdep.c projects/clang400-import/sys/i386/i386/support.s projects/clang400-import/sys/i386/i386/swtch.s projects/clang400-import/sys/i386/i386/trap.c projects/clang400-import/sys/i386/i386/vm86bios.s projects/clang400-import/sys/i386/i386/vm_machdep.c projects/clang400-import/sys/i386/include/atomic.h projects/clang400-import/sys/i386/isa/npx.c projects/clang400-import/sys/i386/linux/linux_dummy.c projects/clang400-import/sys/i386/linux/linux_proto.h projects/clang400-import/sys/i386/linux/linux_ptrace.c projects/clang400-import/sys/i386/linux/linux_syscall.h projects/clang400-import/sys/i386/linux/linux_syscalls.c projects/clang400-import/sys/i386/linux/linux_sysent.c projects/clang400-import/sys/i386/linux/linux_systrace_args.c projects/clang400-import/sys/i386/linux/syscalls.master projects/clang400-import/sys/kern/kern_cpuset.c projects/clang400-import/sys/kern/kern_descrip.c projects/clang400-import/sys/kern/kern_mutex.c projects/clang400-import/sys/kern/kern_rmlock.c projects/clang400-import/sys/kern/kern_rwlock.c projects/clang400-import/sys/kern/kern_sx.c projects/clang400-import/sys/kern/subr_witness.c projects/clang400-import/sys/kern/vfs_subr.c projects/clang400-import/sys/mips/include/_types.h projects/clang400-import/sys/mips/include/pcpu.h projects/clang400-import/sys/modules/Makefile projects/clang400-import/sys/modules/dtrace/dtrace/Makefile projects/clang400-import/sys/modules/dtrace/fasttrap/Makefile projects/clang400-import/sys/modules/dtrace/systrace/Makefile projects/clang400-import/sys/net/iflib.c projects/clang400-import/sys/net/netisr.c projects/clang400-import/sys/net80211/ieee80211_output.c projects/clang400-import/sys/netinet/tcp_fastopen.c projects/clang400-import/sys/netinet/tcp_subr.c projects/clang400-import/sys/powerpc/include/_types.h projects/clang400-import/sys/powerpc/include/cpufunc.h projects/clang400-import/sys/powerpc/include/pcpu.h projects/clang400-import/sys/riscv/include/_types.h projects/clang400-import/sys/riscv/include/atomic.h projects/clang400-import/sys/sparc64/include/_types.h projects/clang400-import/sys/sparc64/include/pcpu.h projects/clang400-import/sys/sys/lockstat.h projects/clang400-import/sys/sys/mutex.h projects/clang400-import/sys/sys/rwlock.h projects/clang400-import/sys/sys/sdt.h projects/clang400-import/sys/sys/sx.h projects/clang400-import/sys/sys/syscallsubr.h projects/clang400-import/sys/sys/types.h projects/clang400-import/sys/vm/vm_object.h projects/clang400-import/sys/vm/vm_page.c projects/clang400-import/sys/vm/vm_phys.c projects/clang400-import/sys/x86/acpica/acpi_wakeup.c projects/clang400-import/sys/x86/include/_types.h projects/clang400-import/sys/x86/x86/cpu_machdep.c projects/clang400-import/sys/x86/x86/identcpu.c projects/clang400-import/tests/sys/geom/class/gate/ggate_test.sh projects/clang400-import/tools/build/options/WITHOUT_BLACKLIST projects/clang400-import/tools/build/options/WITHOUT_CLANG_BOOTSTRAP projects/clang400-import/tools/build/options/WITHOUT_CROSS_COMPILER projects/clang400-import/tools/build/options/WITHOUT_DIALOG projects/clang400-import/tools/build/options/WITHOUT_DMAGENT projects/clang400-import/tools/build/options/WITHOUT_DOCCOMPRESS projects/clang400-import/tools/build/options/WITHOUT_GPL_DTC projects/clang400-import/tools/build/options/WITHOUT_INSTALLLIB projects/clang400-import/tools/build/options/WITHOUT_KERBEROS projects/clang400-import/tools/build/options/WITH_CCACHE_BUILD projects/clang400-import/tools/build/options/WITH_DIRDEPS_BUILD projects/clang400-import/tools/build/options/WITH_INSTALL_AS_USER projects/clang400-import/tools/build/options/WITH_META_MODE projects/clang400-import/tools/build/options/WITH_STAGING_MAN projects/clang400-import/tools/build/options/makeman projects/clang400-import/tools/tools/ath/athspectral/athspectral.c projects/clang400-import/tools/tools/nanobsd/embedded/rpi2.cfg projects/clang400-import/usr.bin/sed/main.c projects/clang400-import/usr.bin/yacc/tests/Makefile projects/clang400-import/usr.sbin/ctladm/ctladm.8 projects/clang400-import/usr.sbin/tcpdump/tcpdump/Makefile projects/clang400-import/usr.sbin/tcpdump/tcpdump/config.h Directory Properties: projects/clang400-import/ (props changed) projects/clang400-import/cddl/ (props changed) projects/clang400-import/cddl/contrib/opensolaris/ (props changed) projects/clang400-import/contrib/byacc/ (props changed) projects/clang400-import/contrib/libarchive/ (props changed) projects/clang400-import/contrib/tcpdump/ (props changed) projects/clang400-import/sys/cddl/contrib/opensolaris/ (props changed) Modified: projects/clang400-import/Makefile.inc1 ============================================================================== --- projects/clang400-import/Makefile.inc1 Sun Feb 5 19:57:41 2017 (r313300) +++ projects/clang400-import/Makefile.inc1 Sun Feb 5 20:03:05 2017 (r313301) @@ -242,13 +242,11 @@ SUBDIR+= ${_DIR} # of a LOCAL_DIRS directory. This allows LOCAL_DIRS=foo and # LOCAL_LIB_DIRS=foo/lib to behave as expected. .for _DIR in ${LOCAL_DIRS:M*/} ${LOCAL_DIRS:N*/:S|$|/|} -_REDUNDENT_LIB_DIRS+= ${LOCAL_LIB_DIRS:M${_DIR}*} +_REDUNDANT_LIB_DIRS+= ${LOCAL_LIB_DIRS:M${_DIR}*} .endfor .for _DIR in ${LOCAL_LIB_DIRS} -.if empty(_REDUNDENT_LIB_DIRS:M${_DIR}) && exists(${.CURDIR}/${_DIR}/Makefile) +.if empty(_REDUNDANT_LIB_DIRS:M${_DIR}) && exists(${.CURDIR}/${_DIR}/Makefile) SUBDIR+= ${_DIR} -.else -.warning ${_DIR} not added to SUBDIR list. See UPDATING 20141121. .endif .endfor @@ -1954,6 +1952,7 @@ native-xtools: .PHONY usr.bin/mktemp \ usr.bin/mt \ usr.bin/patch \ + usr.bin/readelf \ usr.bin/sed \ usr.bin/sort \ usr.bin/tar \ Modified: projects/clang400-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh ============================================================================== --- projects/clang400-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh Sun Feb 5 19:57:41 2017 (r313300) +++ projects/clang400-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh Sun Feb 5 20:03:05 2017 (r313301) @@ -77,7 +77,7 @@ main(int argc, char **argv) } EOF -cc -c -xO2 test.c +cc -c -O2 test.c if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 Modified: projects/clang400-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.include.ksh ============================================================================== --- projects/clang400-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.include.ksh Sun Feb 5 19:57:41 2017 (r313300) +++ projects/clang400-import/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.include.ksh Sun Feb 5 20:03:05 2017 (r313301) @@ -25,7 +25,7 @@ # # ident "%Z%%M% %I% %E% SMI" -# Make sure <unistd.h> defines _DTRACE_VERSION +# Make sure <sys/sdt.h> defines _DTRACE_VERSION DIR=/var/tmp/dtest.$$ @@ -33,7 +33,7 @@ mkdir $DIR cd $DIR cat > test.c <<EOF -#include <unistd.h> +#include <sys/sdt.h> int main(int argc, char **argv) @@ -46,7 +46,7 @@ main(int argc, char **argv) } EOF -cc -xarch=generic -o test test.c +cc -o test test.c if [ $? -ne 0 ]; then print -u2 "failed to compile test.c" exit 1 Modified: projects/clang400-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c ============================================================================== --- projects/clang400-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c Sun Feb 5 19:57:41 2017 (r313300) +++ projects/clang400-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c Sun Feb 5 20:03:05 2017 (r313301) @@ -462,18 +462,8 @@ dof_add_probe(dt_idhash_t *dhp, dt_ident dt_buf_write(dtp, &ddo->ddo_enoffs, pip->pi_enoffs, pip->pi_nenoffs * sizeof (uint32_t), sizeof (uint32_t)); - /* - * If pi_rname isn't set, the relocation will be against the - * function name. If it is, the relocation will be against - * pi_rname. This will be used if the function is scoped - * locally so an alternate symbol is added for the purpose - * of this relocation. - */ - if (pip->pi_rname == NULL) - dofr.dofr_name = dofpr.dofpr_func; - else - dofr.dofr_name = dof_add_string(ddo, pip->pi_rname); - dofr.dofr_type = DOF_RELO_SETX; + dofr.dofr_name = dof_add_string(ddo, pip->pi_rname); + dofr.dofr_type = DOF_RELO_DOFREL; dofr.dofr_offset = dt_buf_len(&ddo->ddo_probes); dofr.dofr_data = 0; Modified: projects/clang400-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c ============================================================================== --- projects/clang400-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Sun Feb 5 19:57:41 2017 (r313300) +++ projects/clang400-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Sun Feb 5 20:03:05 2017 (r313301) @@ -237,7 +237,7 @@ printf("%s:%s(%d): DOODAD\n",__FUNCTION_ rel->r_offset = s->dofs_offset + dofr[j].dofr_offset; rel->r_info = ELF32_R_INFO(count + dep->de_global, - R_386_32); + R_386_PC32); #elif defined(__mips__) /* XXX */ printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); @@ -253,15 +253,6 @@ printf("%s:%s(%d): DOODAD\n",__FUNCTION_ #elif defined(__riscv__) /* XXX */ printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__); -#elif defined(__sparc) - /* - * Add 4 bytes to hit the low half of this 64-bit - * big-endian address. - */ - rel->r_offset = s->dofs_offset + - dofr[j].dofr_offset + 4; - rel->r_info = ELF32_R_INFO(count + dep->de_global, - R_SPARC_32); #else #error unknown ISA #endif @@ -270,7 +261,7 @@ printf("%s:%s(%d): DOODAD\n",__FUNCTION_ sym->st_value = 0; sym->st_size = 0; sym->st_info = ELF32_ST_INFO(STB_GLOBAL, STT_FUNC); - sym->st_other = 0; + sym->st_other = ELF32_ST_VISIBILITY(STV_HIDDEN); sym->st_shndx = SHN_UNDEF; rel++; @@ -287,11 +278,7 @@ printf("%s:%s(%d): DOODAD\n",__FUNCTION_ sym->st_value = 0; sym->st_size = dof->dofh_filesz; sym->st_info = ELF32_ST_INFO(STB_GLOBAL, STT_OBJECT); -#ifdef illumos - sym->st_other = 0; -#else sym->st_other = ELF32_ST_VISIBILITY(STV_HIDDEN); -#endif sym->st_shndx = ESHDR_DOF; sym++; @@ -448,18 +435,8 @@ prepare_elf64(dtrace_hdl_t *dtp, const d #elif defined(__i386) || defined(__amd64) rel->r_offset = s->dofs_offset + dofr[j].dofr_offset; -#ifdef illumos rel->r_info = ELF64_R_INFO(count + dep->de_global, - R_AMD64_64); -#else - rel->r_info = ELF64_R_INFO(count + dep->de_global, - R_X86_64_RELATIVE); -#endif -#elif defined(__sparc) - rel->r_offset = s->dofs_offset + - dofr[j].dofr_offset; - rel->r_info = ELF64_R_INFO(count + dep->de_global, - R_SPARC_64); + R_X86_64_PC64); #else #error unknown ISA #endif @@ -468,7 +445,7 @@ prepare_elf64(dtrace_hdl_t *dtp, const d sym->st_value = 0; sym->st_size = 0; sym->st_info = GELF_ST_INFO(STB_GLOBAL, STT_FUNC); - sym->st_other = 0; + sym->st_other = ELF64_ST_VISIBILITY(STV_HIDDEN); sym->st_shndx = SHN_UNDEF; rel++; @@ -485,11 +462,7 @@ prepare_elf64(dtrace_hdl_t *dtp, const d sym->st_value = 0; sym->st_size = dof->dofh_filesz; sym->st_info = GELF_ST_INFO(STB_GLOBAL, STT_OBJECT); -#ifdef illumos - sym->st_other = 0; -#else sym->st_other = ELF64_ST_VISIBILITY(STV_HIDDEN); -#endif sym->st_shndx = ESHDR_DOF; sym++; @@ -797,16 +770,15 @@ dump_elf64(dtrace_hdl_t *dtp, const dof_ } static int -dt_symtab_lookup(Elf_Data *data_sym, int nsym, uintptr_t addr, uint_t shn, - GElf_Sym *sym, int uses_funcdesc, Elf *elf) +dt_symtab_lookup(Elf_Data *data_sym, int start, int end, uintptr_t addr, + uint_t shn, GElf_Sym *sym, int uses_funcdesc, Elf *elf) { - int i, ret = -1; Elf64_Addr symval; Elf_Scn *opd_scn; Elf_Data *opd_desc; - GElf_Sym s; + int i; - for (i = 0; i < nsym && gelf_getsym(data_sym, i, sym) != NULL; i++) { + for (i = start; i < end && gelf_getsym(data_sym, i, sym) != NULL; i++) { if (GELF_ST_TYPE(sym->st_info) == STT_FUNC) { symval = sym->st_value; if (uses_funcdesc) { @@ -816,20 +788,12 @@ dt_symtab_lookup(Elf_Data *data_sym, int *(uint64_t*)((char *)opd_desc->d_buf + symval); } if ((uses_funcdesc || shn == sym->st_shndx) && - symval <= addr && - addr < symval + sym->st_size) { - if (GELF_ST_BIND(sym->st_info) == STB_GLOBAL) - return (0); - - ret = 0; - s = *sym; - } + symval <= addr && addr < symval + sym->st_size) + return (0); } } - if (ret == 0) - *sym = s; - return (ret); + return (-1); } #if defined(__aarch64__) @@ -1237,10 +1201,11 @@ process_obj(dtrace_hdl_t *dtp, const cha dt_provider_t *pvp; dt_probe_t *prp; uint32_t off, eclass, emachine1, emachine2; - size_t symsize, nsym, isym, istr, len; + size_t symsize, osym, nsym, isym, istr, len; key_t objkey; dt_link_pair_t *pair, *bufs = NULL; dt_strtab_t *strtab; + void *tmp; if ((fd = open64(obj, O_RDWR)) == -1) { return (dt_link_error(dtp, elf, fd, bufs, @@ -1374,12 +1339,13 @@ process_obj(dtrace_hdl_t *dtp, const cha * target (text) section to replace the call instruction with * one or more nops. * - * If the function containing the probe is locally scoped - * (static), we create an alias used by the relocation in the - * generated object. The alias, a new symbol, will be global - * (so that the relocation from the generated object can be - * resolved), and hidden (so that it is converted to a local - * symbol at link time). Such aliases have this form: + * To avoid runtime overhead, the relocations added to the + * generated object should be resolved at static link time. We + * therefore create aliases for the functions that contain + * probes. An alias is global (so that the relocation from the + * generated object can be resolved), and hidden (so that its + * address is known at static link time). Such aliases have this + * form: * * $dtrace<key>.<function> * @@ -1417,16 +1383,13 @@ process_obj(dtrace_hdl_t *dtp, const cha if (strncmp(s, dt_prefix, sizeof (dt_prefix) - 1) != 0) continue; - if (dt_symtab_lookup(data_sym, isym, rela.r_offset, - shdr_rel.sh_info, &fsym, - (emachine1 == EM_PPC64), elf) != 0) { + if (dt_symtab_lookup(data_sym, 0, isym, rela.r_offset, + shdr_rel.sh_info, &fsym, (emachine1 == EM_PPC64), + elf) != 0) { dt_strtab_destroy(strtab); goto err; } - if (GELF_ST_BIND(fsym.st_info) != STB_LOCAL) - continue; - if (fsym.st_name > data_str->d_size) { dt_strtab_destroy(strtab); goto err; @@ -1462,12 +1425,12 @@ process_obj(dtrace_hdl_t *dtp, const cha } /* - * If needed, allocate the additional space for the symbol - * table and string table copying the old data into the new - * buffers, and marking the buffers as dirty. We inject those - * newly allocated buffers into the libelf data structures, but - * are still responsible for freeing them once we're done with - * the elf handle. + * If any probes were found, allocate the additional space for + * the symbol table and string table, copying the old data into + * the new buffers, and marking the buffers as dirty. We inject + * those newly allocated buffers into the libelf data + * structures, but are still responsible for freeing them once + * we're done with the elf handle. */ if (nsym > 0) { /* @@ -1501,7 +1464,9 @@ process_obj(dtrace_hdl_t *dtp, const cha bufs = pair; bcopy(data_str->d_buf, pair->dlp_str, data_str->d_size); + tmp = data_str->d_buf; data_str->d_buf = pair->dlp_str; + pair->dlp_str = tmp; data_str->d_size += len; (void) elf_flagdata(data_str, ELF_C_SET, ELF_F_DIRTY); @@ -1509,16 +1474,20 @@ process_obj(dtrace_hdl_t *dtp, const cha (void) gelf_update_shdr(scn_str, &shdr_str); bcopy(data_sym->d_buf, pair->dlp_sym, data_sym->d_size); + tmp = data_sym->d_buf; data_sym->d_buf = pair->dlp_sym; + pair->dlp_sym = tmp; data_sym->d_size += nsym * symsize; (void) elf_flagdata(data_sym, ELF_C_SET, ELF_F_DIRTY); shdr_sym.sh_size += nsym * symsize; (void) gelf_update_shdr(scn_sym, &shdr_sym); + osym = isym; nsym += isym; } else { dt_strtab_destroy(strtab); + continue; } /* @@ -1577,8 +1546,11 @@ process_obj(dtrace_hdl_t *dtp, const cha bcopy(s, pname, p - s); pname[p - s] = '\0'; - if (dt_symtab_lookup(data_sym, isym, rela.r_offset, - shdr_rel.sh_info, &fsym, + if (dt_symtab_lookup(data_sym, osym, isym, + rela.r_offset, shdr_rel.sh_info, &fsym, + (emachine1 == EM_PPC64), elf) != 0 && + dt_symtab_lookup(data_sym, 0, osym, + rela.r_offset, shdr_rel.sh_info, &fsym, (emachine1 == EM_PPC64), elf) != 0) goto err; @@ -1588,37 +1560,30 @@ process_obj(dtrace_hdl_t *dtp, const cha assert(GELF_ST_TYPE(fsym.st_info) == STT_FUNC); /* - * If a NULL relocation name is passed to - * dt_probe_define(), the function name is used for the - * relocation. The relocation needs to use a mangled - * name if the symbol is locally scoped; the function - * name may need to change if we've found the global - * alias for the locally scoped symbol (we prefer - * global symbols to locals in dt_symtab_lookup()). + * If this is our first time encountering this symbol, + * emit an alias. */ s = (char *)data_str->d_buf + fsym.st_name; - r = NULL; - if (GELF_ST_BIND(fsym.st_info) == STB_LOCAL) { + if (strncmp(s, dt_symprefix, + sizeof (dt_symprefix) - 1) != 0) { + u_int bind = GELF_ST_BIND(fsym.st_info); + dsym = fsym; dsym.st_name = istr; - dsym.st_info = GELF_ST_INFO(STB_GLOBAL, - STT_FUNC); - dsym.st_other = - ELF64_ST_VISIBILITY(STV_ELIMINATE); + dsym.st_info = GELF_ST_INFO(bind == STB_LOCAL ? + STB_GLOBAL : bind, STT_FUNC); + dsym.st_other = GELF_ST_VISIBILITY(STV_HIDDEN); (void) gelf_update_sym(data_sym, isym, &dsym); - - r = (char *)data_str->d_buf + istr; - istr += 1 + sprintf(r, dt_symfmt, - dt_symprefix, objkey, s); + r = (char *) data_str->d_buf + istr; + istr += 1 + sprintf(r, dt_symfmt, dt_symprefix, objkey, + s); isym++; assert(isym <= nsym); - - } else if (strncmp(s, dt_symprefix, - strlen(dt_symprefix)) == 0) { + } else { r = s; - if ((s = strchr(s, '.')) == NULL) - goto err; + s = strchr(s, '.'); + assert(s != NULL); s++; } @@ -1697,9 +1662,6 @@ process_obj(dtrace_hdl_t *dtp, const cha (void) elf_end(elf); (void) close(fd); -#ifndef illumos - if (nsym > 0) -#endif while ((pair = bufs) != NULL) { bufs = pair->dlp_next; dt_free(dtp, pair->dlp_str); Modified: projects/clang400-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c ============================================================================== --- projects/clang400-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c Sun Feb 5 19:57:41 2017 (r313300) +++ projects/clang400-import/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c Sun Feb 5 20:03:05 2017 (r313301) @@ -545,9 +545,7 @@ dt_probe_define(dt_provider_t *pvp, dt_p for (pip = prp->pr_inst; pip != NULL; pip = pip->pi_next) { if (strcmp(pip->pi_fname, fname) == 0 && - ((rname == NULL && pip->pi_rname == NULL) || - (rname != NULL && pip->pi_rname != NULL && - strcmp(pip->pi_rname, rname) == 0))) + strcmp(pip->pi_rname, rname) == 0) break; } @@ -565,7 +563,7 @@ dt_probe_define(dt_provider_t *pvp, dt_p if ((pip->pi_fname = strdup(fname)) == NULL) goto nomem; - if (rname != NULL && (pip->pi_rname = strdup(rname)) == NULL) + if ((pip->pi_rname = strdup(rname)) == NULL) goto nomem; pip->pi_noffs = 0; @@ -605,7 +603,7 @@ dt_probe_define(dt_provider_t *pvp, dt_p dt_dprintf("defined probe %s %s:%s %s() +0x%x (%s)\n", isenabled ? "(is-enabled)" : "", pvp->pv_desc.dtvd_name, prp->pr_ident->di_name, fname, offset, - rname != NULL ? rname : fname); + rname); assert(*noffs < *maxoffs); (*offs)[(*noffs)++] = offset; Modified: projects/clang400-import/contrib/byacc/CHANGES ============================================================================== --- projects/clang400-import/contrib/byacc/CHANGES Sun Feb 5 19:57:41 2017 (r313300) +++ projects/clang400-import/contrib/byacc/CHANGES Sun Feb 5 20:03:05 2017 (r313301) @@ -1,3 +1,33 @@ +2017-02-01 Thomas E. Dickey <dickey@invisible-island.net> + + * test/btyacc/expr.oxout.error, test/btyacc/expr.oxout.output, test/btyacc/expr.oxout.tab.c, test/btyacc/expr.oxout.tab.h, test/yacc/expr.oxout.error, test/yacc/expr.oxout.output, test/yacc/expr.oxout.tab.c, test/yacc/expr.oxout.tab.h: + RCS_BASE + + * package/debian/copyright: update copyright + + * reader.c, defs.h, main.c: + avoid using regex.h since some low-end platforms do not have this + + * test/expr.oxout.y: RCS_BASE + + * configure: regen + + * aclocal.m4: quiet a strict gcc warning in CF_MKSTEMP + +2017-02-01 Tom.Shields + + * main.c, reader.c, defs.h: + process #line directives, like bison and flex + +2017-02-01 Thomas E. Dickey <dickey@invisible-island.net> + + * VERSION, package/byacc.spec, package/debian/changelog, package/mingw-byacc.spec, package/pkgsrc/Makefile: + bump + +2016-12-31 Thomas E. Dickey <dickey@invisible-island.net> + + * config.guess, config.sub: 2017-01-01 + 2016-12-02 Thomas E. Dickey <dickey@invisible-island.net> * test/btyacc/quote_calc4-s.tab.c, test/btyacc/varsyntax_calc1.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/ok_syntax1.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.tab.c, test/btyacc/calc.tab.c, test/btyacc/calc1.tab.c, test/btyacc/calc2.tab.c, test/btyacc/calc3.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, test/btyacc/btyacc_calc1.tab.c, test/btyacc /btyacc_demo.tab.c, test/btyacc/btyacc_destroy1.tab.c, test/btyacc/btyacc_destroy2.tab.c, test/btyacc/btyacc_destroy3.tab.c, btyaccpar.c: Modified: projects/clang400-import/contrib/byacc/MANIFEST ============================================================================== --- projects/clang400-import/contrib/byacc/MANIFEST Sun Feb 5 19:57:41 2017 (r313300) +++ projects/clang400-import/contrib/byacc/MANIFEST Sun Feb 5 20:03:05 2017 (r313301) @@ -1,4 +1,4 @@ -MANIFEST for byacc-20161202, version t20161202 +MANIFEST for byacc-20170201, version t20170201 -------------------------------------------------------------------------------- MANIFEST this file ACKNOWLEDGEMENTS original version of byacc - 1993 @@ -77,6 +77,22 @@ test/btyacc/btyacc_demo.error referenc test/btyacc/btyacc_demo.output reference output for testing test/btyacc/btyacc_demo.tab.c reference output for testing test/btyacc/btyacc_demo.tab.h reference output for testing +test/btyacc/btyacc_demo2.error reference output for testing +test/btyacc/btyacc_demo2.output reference output for testing +test/btyacc/btyacc_demo2.tab.c reference output for testing +test/btyacc/btyacc_demo2.tab.h reference output for testing +test/btyacc/btyacc_destroy1.error reference output for testing +test/btyacc/btyacc_destroy1.output reference output for testing +test/btyacc/btyacc_destroy1.tab.c reference output for testing +test/btyacc/btyacc_destroy1.tab.h reference output for testing +test/btyacc/btyacc_destroy2.error reference output for testing +test/btyacc/btyacc_destroy2.output reference output for testing +test/btyacc/btyacc_destroy2.tab.c reference output for testing +test/btyacc/btyacc_destroy2.tab.h reference output for testing +test/btyacc/btyacc_destroy3.error reference output for testing +test/btyacc/btyacc_destroy3.output reference output for testing +test/btyacc/btyacc_destroy3.tab.c reference output for testing +test/btyacc/btyacc_destroy3.tab.h reference output for testing test/btyacc/calc.error reference output for testing test/btyacc/calc.output reference output for testing test/btyacc/calc.tab.c reference output for testing @@ -256,6 +272,10 @@ test/btyacc/error.error referenc test/btyacc/error.output reference output for testing test/btyacc/error.tab.c reference output for testing test/btyacc/error.tab.h reference output for testing +test/btyacc/expr.oxout.error reference output for testing +test/btyacc/expr.oxout.output reference output for testing +test/btyacc/expr.oxout.tab.c reference output for testing +test/btyacc/expr.oxout.tab.h reference output for testing test/btyacc/grammar.dot reference output for testing test/btyacc/grammar.error reference output for testing test/btyacc/grammar.output reference output for testing @@ -359,6 +379,9 @@ test/btyacc/varsyntax_calc1.tab.h refer test subdirectory test/btyacc_calc1.y testcase for btyacc test/btyacc_demo.y testcase for btyacc +test/btyacc_destroy1.y btyacc test-case for %parse-param +test/btyacc_destroy2.y btyacc test-case for %parse-param +test/btyacc_destroy3.y btyacc test-case for %parse-param test/calc.y example from VMS freeware version of byacc test/calc1.y advanced example from Steve Johnson's paper. test/calc2.y test-cases and reference files for %lex-param / %parse-param @@ -403,6 +426,7 @@ test/err_syntax8.y testcase test/err_syntax8a.y testcase for used_reserved() test/err_syntax9.y testcase for tokenized_start() test/error.y original version of byacc - 1993 +test/expr.oxout.y test-case for "#line" feature test/grammar.y grammar from cproto test/inherit0.y testcase for btyacc test/inherit1.y testcase for btyacc @@ -577,6 +601,10 @@ test/yacc/error.error referenc test/yacc/error.output reference output for testing test/yacc/error.tab.c reference output for testing test/yacc/error.tab.h reference output for testing +test/yacc/expr.oxout.error reference output for testing +test/yacc/expr.oxout.output reference output for testing +test/yacc/expr.oxout.tab.c reference output for testing +test/yacc/expr.oxout.tab.h reference output for testing test/yacc/grammar.dot reference output for testing test/yacc/grammar.error reference output for testing test/yacc/grammar.output reference output for testing Modified: projects/clang400-import/contrib/byacc/VERSION ============================================================================== --- projects/clang400-import/contrib/byacc/VERSION Sun Feb 5 19:57:41 2017 (r313300) +++ projects/clang400-import/contrib/byacc/VERSION Sun Feb 5 20:03:05 2017 (r313301) @@ -1 +1 @@ -20161202 +20170201 Modified: projects/clang400-import/contrib/byacc/aclocal.m4 ============================================================================== --- projects/clang400-import/contrib/byacc/aclocal.m4 Sun Feb 5 19:57:41 2017 (r313300) +++ projects/clang400-import/contrib/byacc/aclocal.m4 Sun Feb 5 20:03:05 2017 (r313301) @@ -1,7 +1,7 @@ -dnl $Id: aclocal.m4,v 1.41 2016/12/02 13:03:06 tom Exp $ +dnl $Id: aclocal.m4,v 1.42 2017/02/01 10:12:21 tom Exp $ dnl Macros for byacc configure script (Thomas E. Dickey) dnl --------------------------------------------------------------------------- -dnl Copyright 2004-2015,2016 Thomas E. Dickey +dnl Copyright 2004-2016,2017 Thomas E. Dickey dnl dnl Permission is hereby granted, free of charge, to any person obtaining a dnl copy of this software and associated documentation files (the @@ -803,20 +803,26 @@ fi test "$cf_cv_mixedcase" = yes && AC_DEFINE(MIXEDCASE_FILENAMES,1,[Define to 1 if filesystem supports mixed-case filenames.]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MKSTEMP version: 9 updated: 2012/10/03 04:34:49 +dnl CF_MKSTEMP version: 10 updated: 2017/01/21 11:12:16 dnl ---------- dnl Check for a working mkstemp. This creates two files, checks that they are dnl successfully created and distinct (AmigaOS apparently fails on the last). AC_DEFUN([CF_MKSTEMP],[ +AC_CHECK_HEADERS( \ +unistd.h \ +) AC_CACHE_CHECK(for working mkstemp, cf_cv_func_mkstemp,[ rm -rf conftest* AC_TRY_RUN([ #include <sys/types.h> +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif #include <stdlib.h> #include <stdio.h> #include <string.h> #include <sys/stat.h> -int main() +int main(void) { char *tmpl = "conftestXXXXXX"; char name[2][80]; Modified: projects/clang400-import/contrib/byacc/config.guess ============================================================================== --- projects/clang400-import/contrib/byacc/config.guess Sun Feb 5 19:57:41 2017 (r313300) +++ projects/clang400-import/contrib/byacc/config.guess Sun Feb 5 20:03:05 2017 (r313301) @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2016 Free Software Foundation, Inc. +# Copyright 1992-2017 Free Software Foundation, Inc. -timestamp='2016-10-02' +timestamp='2017-01-01' # 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 @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2016 Free Software Foundation, Inc. +Copyright 1992-2017 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." Modified: projects/clang400-import/contrib/byacc/config.sub ============================================================================== --- projects/clang400-import/contrib/byacc/config.sub Sun Feb 5 19:57:41 2017 (r313300) +++ projects/clang400-import/contrib/byacc/config.sub Sun Feb 5 20:03:05 2017 (r313301) @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2016 Free Software Foundation, Inc. +# Copyright 1992-2017 Free Software Foundation, Inc. -timestamp='2016-11-19' +timestamp='2017-01-01' # 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 @@ -67,7 +67,7 @@ Report bugs and patches to <config-patch version="\ GNU config.sub ($timestamp) -Copyright 1992-2016 Free Software Foundation, Inc. +Copyright 1992-2017 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -1409,7 +1409,7 @@ case $os in | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ - | -onefs* | -tirtos* | -phoenix* | -fuchsia*) + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1638,6 +1638,9 @@ case $basic_machine in sparc-* | *-sun) os=-sunos4.1.1 ;; + pru-*) + os=-elf + ;; *-be) os=-beos ;; Modified: projects/clang400-import/contrib/byacc/configure ============================================================================== --- projects/clang400-import/contrib/byacc/configure Sun Feb 5 19:57:41 2017 (r313300) +++ projects/clang400-import/contrib/byacc/configure Sun Feb 5 20:03:05 2017 (r313301) @@ -3911,7 +3911,57 @@ EOF fi done -echo "$as_me:3914: checking for working mkstemp" >&5 +for ac_header in \ +unistd.h \ + +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:3919: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 3925 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:3929: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:3935: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + eval "$as_ac_Header=no" +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:3954: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<EOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +EOF + +fi +done + +echo "$as_me:3964: checking for working mkstemp" >&5 echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6 if test "${cf_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3922,15 +3972,18 @@ if test "$cross_compiling" = yes; then cf_cv_func_mkstemp=maybe else cat >conftest.$ac_ext <<_ACEOF -#line 3925 "configure" +#line 3975 "configure" #include "confdefs.h" #include <sys/types.h> +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif #include <stdlib.h> #include <stdio.h> #include <string.h> #include <sys/stat.h> -int main() +int main(void) { char *tmpl = "conftestXXXXXX"; char name[2][80]; @@ -3960,15 +4013,15 @@ int main() _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:3963: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4016: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3966: \$? = $ac_status" >&5 + echo "$as_me:4019: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:3968: \"$ac_try\"") >&5 + { (eval echo "$as_me:4021: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3971: \$? = $ac_status" >&5 + echo "$as_me:4024: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cf_cv_func_mkstemp=yes @@ -3983,16 +4036,16 @@ rm -f core core.* *.core conftest$ac_exe fi fi -echo "$as_me:3986: result: $cf_cv_func_mkstemp" >&5 +echo "$as_me:4039: result: $cf_cv_func_mkstemp" >&5 echo "${ECHO_T}$cf_cv_func_mkstemp" >&6 if test "x$cf_cv_func_mkstemp" = xmaybe ; then - echo "$as_me:3989: checking for mkstemp" >&5 + echo "$as_me:4042: checking for mkstemp" >&5 echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6 if test "${ac_cv_func_mkstemp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3995 "configure" +#line 4048 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char mkstemp (); below. */ @@ -4023,16 +4076,16 @@ f = mkstemp; /* workaround for ICC 12.0. } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4026: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4079: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4029: \$? = $ac_status" >&5 + echo "$as_me:4082: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4032: \"$ac_try\"") >&5 + { (eval echo "$as_me:4085: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4035: \$? = $ac_status" >&5 + echo "$as_me:4088: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_mkstemp=yes else @@ -4042,7 +4095,7 @@ ac_cv_func_mkstemp=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4045: result: $ac_cv_func_mkstemp" >&5 +echo "$as_me:4098: result: $ac_cv_func_mkstemp" >&5 echo "${ECHO_T}$ac_cv_func_mkstemp" >&6 fi @@ -4057,13 +4110,13 @@ fi for ac_func in vsnprintf do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:4060: checking for $ac_func" >&5 +echo "$as_me:4113: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4066 "configure" +#line 4119 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -4094,16 +4147,16 @@ f = $ac_func; /* workaround for ICC 12.0 } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:4097: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4150: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4100: \$? = $ac_status" >&5 + echo "$as_me:4153: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:4103: \"$ac_try\"") >&5 + { (eval echo "$as_me:4156: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4106: \$? = $ac_status" >&5 + echo "$as_me:4159: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -4113,7 +4166,7 @@ eval "$as_ac_var=no" fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:4116: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:4169: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<EOF @@ -4123,7 +4176,7 @@ EOF fi done -echo "$as_me:4126: checking for maximum table size" >&5 +echo "$as_me:4179: checking for maximum table size" >&5 echo $ECHO_N "checking for maximum table size... $ECHO_C" >&6 # Check whether --with-max-table-size or --without-max-table-size was given. @@ -4133,12 +4186,12 @@ if test "${with_max_table_size+set}" = s fi; if test -n "$with_max_table_size" then - echo "$as_me:4136: result: $with_max_table_size" >&5 + echo "$as_me:4189: result: $with_max_table_size" >&5 echo "${ECHO_T}$with_max_table_size" >&6 check=`expr "$with_max_table_size" + 0` if test "x$check" != "x$with_max_table_size" then - { { echo "$as_me:4141: error: invalid value for --with-max-table-size: $with_max_table_size" >&5 + { { echo "$as_me:4194: error: invalid value for --with-max-table-size: $with_max_table_size" >&5 echo "$as_me: error: invalid value for --with-max-table-size: $with_max_table_size" >&2;} { (exit 1); exit 1; }; } fi @@ -4148,11 +4201,11 @@ cat >>confdefs.h <<EOF EOF else - echo "$as_me:4151: result: default" >&5 + echo "$as_me:4204: result: default" >&5 echo "${ECHO_T}default" >&6 fi -echo "$as_me:4155: checking if backtracking extension is wanted" >&5 +echo "$as_me:4208: checking if backtracking extension is wanted" >&5 echo $ECHO_N "checking if backtracking extension is wanted... $ECHO_C" >&6 # Check whether --enable-btyacc or --disable-btyacc was given. @@ -4160,7 +4213,7 @@ if test "${enable_btyacc+set}" = set; th enableval="$enable_btyacc" fi; -echo "$as_me:4163: result: $enable_btyacc" >&5 +echo "$as_me:4216: result: $enable_btyacc" >&5 echo "${ECHO_T}$enable_btyacc" >&6 if test "$enable_btyacc" = "yes"; then @@ -4175,7 +4228,7 @@ fi if ( test "$GCC" = yes || test "$GXX" = yes ) then -echo "$as_me:4178: checking if you want to check for gcc warnings" >&5 +echo "$as_me:4231: checking if you want to check for gcc warnings" >&5 echo $ECHO_N "checking if you want to check for gcc warnings... $ECHO_C" >&6 # Check whether --with-warnings or --without-warnings was given. @@ -4185,7 +4238,7 @@ if test "${with_warnings+set}" = set; th else cf_opt_with_warnings=no fi; -echo "$as_me:4188: result: $cf_opt_with_warnings" >&5 +echo "$as_me:4241: result: $cf_opt_with_warnings" >&5 echo "${ECHO_T}$cf_opt_with_warnings" >&6 if test "$cf_opt_with_warnings" != no ; then @@ -4207,10 +4260,10 @@ cat > conftest.i <<EOF EOF if test "$GCC" = yes then - { echo "$as_me:4210: checking for $CC __attribute__ directives..." >&5 + { echo "$as_me:4263: checking for $CC __attribute__ directives..." >&5 echo "$as_me: checking for $CC __attribute__ directives..." >&6;} cat > conftest.$ac_ext <<EOF -#line 4213 "${as_me:-configure}" +#line 4266 "${as_me:-configure}" #include "confdefs.h" #include "conftest.h" #include "conftest.i" @@ -4259,12 +4312,12 @@ EOF ;; esac - if { (eval echo "$as_me:4262: \"$ac_compile\"") >&5 + if { (eval echo "$as_me:4315: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4265: \$? = $ac_status" >&5 + echo "$as_me:4318: \$? = $ac_status" >&5 (exit $ac_status); }; then - test -n "$verbose" && echo "$as_me:4267: result: ... $cf_attribute" >&5 + test -n "$verbose" && echo "$as_me:4320: result: ... $cf_attribute" >&5 echo "${ECHO_T}... $cf_attribute" >&6 cat conftest.h >>confdefs.h case $cf_attribute in @@ -4328,12 +4381,12 @@ INTEL_COMPILER=no if test "$GCC" = yes ; then case $host_os in (linux*|gnu*) - echo "$as_me:4331: checking if this is really Intel C compiler" >&5 + echo "$as_me:4384: checking if this is really Intel C compiler" >&5 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -no-gcc" cat >conftest.$ac_ext <<_ACEOF -#line 4336 "configure" +#line 4389 "configure" #include "confdefs.h" int @@ -4350,16 +4403,16 @@ make an error } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4353: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:4406: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4356: \$? = $ac_status" >&5 + echo "$as_me:4409: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4359: \"$ac_try\"") >&5 + { (eval echo "$as_me:4412: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4362: \$? = $ac_status" >&5 + echo "$as_me:4415: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147" @@ -4370,7 +4423,7 @@ cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext CFLAGS="$cf_save_CFLAGS" - echo "$as_me:4373: result: $INTEL_COMPILER" >&5 + echo "$as_me:4426: result: $INTEL_COMPILER" >&5 echo "${ECHO_T}$INTEL_COMPILER" >&6 ;; esac @@ -4379,12 +4432,12 @@ fi CLANG_COMPILER=no if test "$GCC" = yes ; then - echo "$as_me:4382: checking if this is really Clang C compiler" >&5 + echo "$as_me:4435: checking if this is really Clang C compiler" >&5 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Qunused-arguments" cat >conftest.$ac_ext <<_ACEOF -#line 4387 "configure" +#line 4440 "configure" #include "confdefs.h" *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702052003.v15K36MV051361>