Date: Thu, 13 Feb 2020 12:52:25 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r357855 - in projects/clang1000-import: . contrib/elftoolchain/addr2line contrib/elftoolchain/elfcopy contrib/elftoolchain/libelftc contrib/file contrib/file/doc contrib/file/m4 contrib... Message-ID: <202002131252.01DCqP0L016182@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Thu Feb 13 12:52:24 2020 New Revision: 357855 URL: https://svnweb.freebsd.org/changeset/base/357855 Log: Merge ^/head r357662 through r357854. Added: projects/clang1000-import/contrib/file/magic/Magdir/forth - copied unchanged from r357854, head/contrib/file/magic/Magdir/forth projects/clang1000-import/contrib/file/magic/Magdir/git - copied unchanged from r357854, head/contrib/file/magic/Magdir/git projects/clang1000-import/contrib/file/magic/Magdir/modulefile - copied unchanged from r357854, head/contrib/file/magic/Magdir/modulefile projects/clang1000-import/contrib/file/magic/Magdir/openfst - copied unchanged from r357854, head/contrib/file/magic/Magdir/openfst projects/clang1000-import/contrib/file/magic/Magdir/opentimestamps - copied unchanged from r357854, head/contrib/file/magic/Magdir/opentimestamps projects/clang1000-import/contrib/file/magic/Magdir/pmem - copied unchanged from r357854, head/contrib/file/magic/Magdir/pmem projects/clang1000-import/contrib/file/magic/Magdir/rst - copied unchanged from r357854, head/contrib/file/magic/Magdir/rst projects/clang1000-import/contrib/file/magic/Magdir/sosi - copied unchanged from r357854, head/contrib/file/magic/Magdir/sosi projects/clang1000-import/contrib/file/src/is_csv.c - copied unchanged from r357854, head/contrib/file/src/is_csv.c projects/clang1000-import/contrib/libarchive/libarchive/archive_write_set_format_private.h - copied unchanged from r357854, head/contrib/libarchive/libarchive/archive_write_set_format_private.h projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_format_7zip_delta4_lzma1.7z.uu - copied unchanged from r357854, head/contrib/libarchive/libarchive/test/test_read_format_7zip_delta4_lzma1.7z.uu projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_format_7zip_delta4_lzma2.7z.uu - copied unchanged from r357854, head/contrib/libarchive/libarchive/test/test_read_format_7zip_delta4_lzma2.7z.uu projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_format_rar5_block_size_is_too_small.rar.uu - copied unchanged from r357854, head/contrib/libarchive/libarchive/test/test_read_format_rar5_block_size_is_too_small.rar.uu projects/clang1000-import/contrib/libarchive/tar/test/test_option_safe_writes.c - copied unchanged from r357854, head/contrib/libarchive/tar/test/test_option_safe_writes.c projects/clang1000-import/lib/libc/sys/sigfastblock.2 - copied unchanged from r357854, head/lib/libc/sys/sigfastblock.2 projects/clang1000-import/sys/dev/cxgbe/firmware/t4fw-1.24.12.0.bin - copied unchanged from r357854, head/sys/dev/cxgbe/firmware/t4fw-1.24.12.0.bin projects/clang1000-import/sys/dev/cxgbe/firmware/t5fw-1.24.12.0.bin - copied unchanged from r357854, head/sys/dev/cxgbe/firmware/t5fw-1.24.12.0.bin projects/clang1000-import/sys/dev/cxgbe/firmware/t6fw-1.24.12.0.bin - copied unchanged from r357854, head/sys/dev/cxgbe/firmware/t6fw-1.24.12.0.bin projects/clang1000-import/sys/dev/pci/controller/ - copied from r357854, head/sys/dev/pci/controller/ Deleted: projects/clang1000-import/lib/libkvm/kvm_sparc64.c projects/clang1000-import/lib/libkvm/kvm_sparc64.h projects/clang1000-import/share/man/man4/man4.sparc64/Makefile projects/clang1000-import/share/man/man4/man4.sparc64/Makefile.depend projects/clang1000-import/share/man/man4/man4.sparc64/auxio.4 projects/clang1000-import/share/man/man4/man4.sparc64/central.4 projects/clang1000-import/share/man/man4/man4.sparc64/clkbrd.4 projects/clang1000-import/share/man/man4/man4.sparc64/creator.4 projects/clang1000-import/share/man/man4/man4.sparc64/ebus.4 projects/clang1000-import/share/man/man4/man4.sparc64/eeprom.4 projects/clang1000-import/share/man/man4/man4.sparc64/fhc.4 projects/clang1000-import/share/man/man4/man4.sparc64/machfb.4 projects/clang1000-import/share/man/man4/man4.sparc64/ofw_console.4 projects/clang1000-import/share/man/man4/man4.sparc64/openfirm.4 projects/clang1000-import/share/man/man4/man4.sparc64/openprom.4 projects/clang1000-import/share/man/man4/man4.sparc64/rtc.4 projects/clang1000-import/share/man/man4/man4.sparc64/sbus.4 projects/clang1000-import/share/man/man4/man4.sparc64/snd_audiocs.4 projects/clang1000-import/sys/dev/cxgbe/firmware/t4fw-1.24.11.0.bin projects/clang1000-import/sys/dev/cxgbe/firmware/t5fw-1.24.11.0.bin projects/clang1000-import/sys/dev/cxgbe/firmware/t6fw-1.24.11.0.bin projects/clang1000-import/usr.sbin/Makefile.sparc64 projects/clang1000-import/usr.sbin/eeprom/Makefile projects/clang1000-import/usr.sbin/eeprom/Makefile.depend projects/clang1000-import/usr.sbin/eeprom/eeprom.8 projects/clang1000-import/usr.sbin/eeprom/eeprom.c projects/clang1000-import/usr.sbin/eeprom/ofw_options.c projects/clang1000-import/usr.sbin/eeprom/ofw_options.h Modified: projects/clang1000-import/ObsoleteFiles.inc projects/clang1000-import/UPDATING projects/clang1000-import/contrib/elftoolchain/addr2line/addr2line.c projects/clang1000-import/contrib/elftoolchain/elfcopy/main.c projects/clang1000-import/contrib/elftoolchain/libelftc/elftc.3 projects/clang1000-import/contrib/elftoolchain/libelftc/elftc_bfd_find_target.3 projects/clang1000-import/contrib/elftoolchain/libelftc/elftc_bfdtarget.c projects/clang1000-import/contrib/elftoolchain/libelftc/libelftc.h projects/clang1000-import/contrib/file/ChangeLog projects/clang1000-import/contrib/file/Makefile.in projects/clang1000-import/contrib/file/README projects/clang1000-import/contrib/file/aclocal.m4 projects/clang1000-import/contrib/file/compile projects/clang1000-import/contrib/file/config.guess projects/clang1000-import/contrib/file/config.h.in projects/clang1000-import/contrib/file/config.sub projects/clang1000-import/contrib/file/configure projects/clang1000-import/contrib/file/configure.ac projects/clang1000-import/contrib/file/depcomp projects/clang1000-import/contrib/file/doc/Makefile.in projects/clang1000-import/contrib/file/doc/file.man projects/clang1000-import/contrib/file/doc/libmagic.man projects/clang1000-import/contrib/file/doc/magic.man projects/clang1000-import/contrib/file/ltmain.sh projects/clang1000-import/contrib/file/m4/libtool.m4 projects/clang1000-import/contrib/file/m4/ltoptions.m4 projects/clang1000-import/contrib/file/m4/ltsugar.m4 projects/clang1000-import/contrib/file/m4/ltversion.m4 projects/clang1000-import/contrib/file/m4/lt~obsolete.m4 projects/clang1000-import/contrib/file/magic/Magdir/android projects/clang1000-import/contrib/file/magic/Magdir/animation projects/clang1000-import/contrib/file/magic/Magdir/apple projects/clang1000-import/contrib/file/magic/Magdir/archive projects/clang1000-import/contrib/file/magic/Magdir/audio projects/clang1000-import/contrib/file/magic/Magdir/bsi projects/clang1000-import/contrib/file/magic/Magdir/c-lang projects/clang1000-import/contrib/file/magic/Magdir/cad projects/clang1000-import/contrib/file/magic/Magdir/commands projects/clang1000-import/contrib/file/magic/Magdir/compress projects/clang1000-import/contrib/file/magic/Magdir/console projects/clang1000-import/contrib/file/magic/Magdir/database projects/clang1000-import/contrib/file/magic/Magdir/elf projects/clang1000-import/contrib/file/magic/Magdir/espressif projects/clang1000-import/contrib/file/magic/Magdir/filesystems projects/clang1000-import/contrib/file/magic/Magdir/fonts projects/clang1000-import/contrib/file/magic/Magdir/frame projects/clang1000-import/contrib/file/magic/Magdir/games projects/clang1000-import/contrib/file/magic/Magdir/gimp projects/clang1000-import/contrib/file/magic/Magdir/icc projects/clang1000-import/contrib/file/magic/Magdir/images projects/clang1000-import/contrib/file/magic/Magdir/javascript projects/clang1000-import/contrib/file/magic/Magdir/kml projects/clang1000-import/contrib/file/magic/Magdir/linux projects/clang1000-import/contrib/file/magic/Magdir/macintosh projects/clang1000-import/contrib/file/magic/Magdir/mail.news projects/clang1000-import/contrib/file/magic/Magdir/map projects/clang1000-import/contrib/file/magic/Magdir/msdos projects/clang1000-import/contrib/file/magic/Magdir/msooxml projects/clang1000-import/contrib/file/magic/Magdir/ole2compounddocs projects/clang1000-import/contrib/file/magic/Magdir/pdf projects/clang1000-import/contrib/file/magic/Magdir/python projects/clang1000-import/contrib/file/magic/Magdir/rpi projects/clang1000-import/contrib/file/magic/Magdir/ruby projects/clang1000-import/contrib/file/magic/Magdir/sgml projects/clang1000-import/contrib/file/magic/Magdir/sniffer projects/clang1000-import/contrib/file/magic/Magdir/ssh projects/clang1000-import/contrib/file/magic/Magdir/uuencode projects/clang1000-import/contrib/file/magic/Magdir/varied.script projects/clang1000-import/contrib/file/magic/Magdir/vax projects/clang1000-import/contrib/file/magic/Magdir/windows projects/clang1000-import/contrib/file/magic/Magdir/wordprocessors projects/clang1000-import/contrib/file/magic/Magdir/zip projects/clang1000-import/contrib/file/magic/Makefile.am projects/clang1000-import/contrib/file/magic/Makefile.in projects/clang1000-import/contrib/file/missing projects/clang1000-import/contrib/file/python/Makefile.in projects/clang1000-import/contrib/file/src/Makefile.am projects/clang1000-import/contrib/file/src/Makefile.in projects/clang1000-import/contrib/file/src/apprentice.c projects/clang1000-import/contrib/file/src/ascmagic.c projects/clang1000-import/contrib/file/src/buffer.c projects/clang1000-import/contrib/file/src/compress.c projects/clang1000-import/contrib/file/src/encoding.c projects/clang1000-import/contrib/file/src/file.c projects/clang1000-import/contrib/file/src/file.h projects/clang1000-import/contrib/file/src/file_opts.h projects/clang1000-import/contrib/file/src/fsmagic.c projects/clang1000-import/contrib/file/src/funcs.c projects/clang1000-import/contrib/file/src/magic.h.in projects/clang1000-import/contrib/file/src/readcdf.c projects/clang1000-import/contrib/file/src/readelf.c projects/clang1000-import/contrib/file/src/seccomp.c projects/clang1000-import/contrib/file/src/vasprintf.c projects/clang1000-import/contrib/file/tests/JW07022A.mp3.result projects/clang1000-import/contrib/file/tests/Makefile.in projects/clang1000-import/contrib/file/tests/test.c projects/clang1000-import/contrib/libarchive/NEWS projects/clang1000-import/contrib/libarchive/cat/bsdcat.h projects/clang1000-import/contrib/libarchive/cat/test/test_0.c projects/clang1000-import/contrib/libarchive/cpio/cpio.c projects/clang1000-import/contrib/libarchive/cpio/test/test_basic.c projects/clang1000-import/contrib/libarchive/cpio/test/test_format_newc.c projects/clang1000-import/contrib/libarchive/libarchive/archive.h projects/clang1000-import/contrib/libarchive/libarchive/archive_acl_private.h projects/clang1000-import/contrib/libarchive/libarchive/archive_blake2.h projects/clang1000-import/contrib/libarchive/libarchive/archive_blake2_impl.h projects/clang1000-import/contrib/libarchive/libarchive/archive_cmdline_private.h projects/clang1000-import/contrib/libarchive/libarchive/archive_crc32.h projects/clang1000-import/contrib/libarchive/libarchive/archive_cryptor_private.h projects/clang1000-import/contrib/libarchive/libarchive/archive_digest_private.h projects/clang1000-import/contrib/libarchive/libarchive/archive_endian.h projects/clang1000-import/contrib/libarchive/libarchive/archive_entry.c projects/clang1000-import/contrib/libarchive/libarchive/archive_entry.h projects/clang1000-import/contrib/libarchive/libarchive/archive_entry_locale.h projects/clang1000-import/contrib/libarchive/libarchive/archive_entry_private.h projects/clang1000-import/contrib/libarchive/libarchive/archive_getdate.c projects/clang1000-import/contrib/libarchive/libarchive/archive_getdate.h projects/clang1000-import/contrib/libarchive/libarchive/archive_hmac_private.h projects/clang1000-import/contrib/libarchive/libarchive/archive_openssl_evp_private.h projects/clang1000-import/contrib/libarchive/libarchive/archive_openssl_hmac_private.h projects/clang1000-import/contrib/libarchive/libarchive/archive_options_private.h projects/clang1000-import/contrib/libarchive/libarchive/archive_pack_dev.c projects/clang1000-import/contrib/libarchive/libarchive/archive_pack_dev.h projects/clang1000-import/contrib/libarchive/libarchive/archive_pathmatch.h projects/clang1000-import/contrib/libarchive/libarchive/archive_platform_acl.h projects/clang1000-import/contrib/libarchive/libarchive/archive_platform_xattr.h projects/clang1000-import/contrib/libarchive/libarchive/archive_ppmd7.c projects/clang1000-import/contrib/libarchive/libarchive/archive_ppmd7_private.h projects/clang1000-import/contrib/libarchive/libarchive/archive_ppmd8_private.h projects/clang1000-import/contrib/libarchive/libarchive/archive_ppmd_private.h projects/clang1000-import/contrib/libarchive/libarchive/archive_private.h projects/clang1000-import/contrib/libarchive/libarchive/archive_random_private.h projects/clang1000-import/contrib/libarchive/libarchive/archive_rb.h projects/clang1000-import/contrib/libarchive/libarchive/archive_read.c projects/clang1000-import/contrib/libarchive/libarchive/archive_read_disk_posix.c projects/clang1000-import/contrib/libarchive/libarchive/archive_read_disk_private.h projects/clang1000-import/contrib/libarchive/libarchive/archive_read_private.h projects/clang1000-import/contrib/libarchive/libarchive/archive_read_set_options.3 projects/clang1000-import/contrib/libarchive/libarchive/archive_read_support_filter_uu.c projects/clang1000-import/contrib/libarchive/libarchive/archive_read_support_format_7zip.c projects/clang1000-import/contrib/libarchive/libarchive/archive_read_support_format_lha.c projects/clang1000-import/contrib/libarchive/libarchive/archive_read_support_format_mtree.c projects/clang1000-import/contrib/libarchive/libarchive/archive_read_support_format_rar.c projects/clang1000-import/contrib/libarchive/libarchive/archive_read_support_format_rar5.c projects/clang1000-import/contrib/libarchive/libarchive/archive_read_support_format_warc.c projects/clang1000-import/contrib/libarchive/libarchive/archive_read_support_format_xar.c projects/clang1000-import/contrib/libarchive/libarchive/archive_string.c projects/clang1000-import/contrib/libarchive/libarchive/archive_string.h projects/clang1000-import/contrib/libarchive/libarchive/archive_string_composition.h projects/clang1000-import/contrib/libarchive/libarchive/archive_util.c projects/clang1000-import/contrib/libarchive/libarchive/archive_write_disk.3 projects/clang1000-import/contrib/libarchive/libarchive/archive_write_disk_posix.c projects/clang1000-import/contrib/libarchive/libarchive/archive_write_disk_private.h projects/clang1000-import/contrib/libarchive/libarchive/archive_write_private.h projects/clang1000-import/contrib/libarchive/libarchive/archive_write_set_format.c projects/clang1000-import/contrib/libarchive/libarchive/archive_write_set_format_7zip.c projects/clang1000-import/contrib/libarchive/libarchive/archive_write_set_format_ar.c projects/clang1000-import/contrib/libarchive/libarchive/archive_write_set_format_cpio.c projects/clang1000-import/contrib/libarchive/libarchive/archive_write_set_format_cpio_newc.c projects/clang1000-import/contrib/libarchive/libarchive/archive_write_set_format_gnutar.c projects/clang1000-import/contrib/libarchive/libarchive/archive_write_set_format_iso9660.c projects/clang1000-import/contrib/libarchive/libarchive/archive_write_set_format_pax.c projects/clang1000-import/contrib/libarchive/libarchive/archive_write_set_format_shar.c projects/clang1000-import/contrib/libarchive/libarchive/archive_write_set_format_ustar.c projects/clang1000-import/contrib/libarchive/libarchive/archive_write_set_format_v7tar.c projects/clang1000-import/contrib/libarchive/libarchive/archive_write_set_format_warc.c projects/clang1000-import/contrib/libarchive/libarchive/archive_write_set_format_xar.c projects/clang1000-import/contrib/libarchive/libarchive/archive_write_set_format_zip.c projects/clang1000-import/contrib/libarchive/libarchive/archive_write_set_options.3 projects/clang1000-import/contrib/libarchive/libarchive/archive_xxhash.h projects/clang1000-import/contrib/libarchive/libarchive/filter_fork.h projects/clang1000-import/contrib/libarchive/libarchive/test/test_archive_write_set_format_filter_by_ext.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_compat_zip.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_fuzz.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_extract.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_format_7zip.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_format_7zip_packinfo_digests.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_format_gtar_sparse.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_format_rar5.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_format_zip.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_format_zip_7075_utf8_paths.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_format_zip_comment_stored.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_format_zip_extra_padding.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_format_zip_high_compression.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_format_zip_jar.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_format_zip_mac_metadata.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_format_zip_malformed.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_format_zip_msdos.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_format_zip_nested.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_format_zip_nofiletype.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_format_zip_padded.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_format_zip_sfx.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_format_zip_with_invalid_traditional_eocd.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_format_zip_zip64.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_pax_truncated.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_read_truncated_filter.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_sparse_basic.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_write_disk.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_write_format_cpio_empty.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_write_format_pax.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_write_format_shar_empty.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_write_format_tar.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_write_format_tar_sparse.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_write_format_xar.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_write_format_zip_file.c projects/clang1000-import/contrib/libarchive/libarchive/test/test_write_format_zip_file_zip64.c projects/clang1000-import/contrib/libarchive/libarchive_fe/err.h projects/clang1000-import/contrib/libarchive/tar/bsdtar.1 projects/clang1000-import/contrib/libarchive/tar/bsdtar.c projects/clang1000-import/contrib/libarchive/tar/bsdtar.h projects/clang1000-import/contrib/libarchive/tar/cmdline.c projects/clang1000-import/contrib/libarchive/tar/test/test_basic.c projects/clang1000-import/contrib/libarchive/tar/test/test_copy.c projects/clang1000-import/contrib/libarchive/tar/test/test_option_C_upper.c projects/clang1000-import/contrib/libarchive/tar/test/test_option_s.c projects/clang1000-import/contrib/libarchive/tar/util.c projects/clang1000-import/contrib/libarchive/test_utils/test_common.h projects/clang1000-import/contrib/libarchive/test_utils/test_main.c projects/clang1000-import/contrib/netbsd-tests/lib/libc/c063/t_o_search.c projects/clang1000-import/lib/Makefile projects/clang1000-import/lib/libarchive/Makefile projects/clang1000-import/lib/libarchive/tests/Makefile projects/clang1000-import/lib/libc/gen/auxv.c projects/clang1000-import/lib/libc/string/memset.3 projects/clang1000-import/lib/libc/sys/Makefile.inc projects/clang1000-import/lib/libc/sys/Symbol.map projects/clang1000-import/lib/libcompiler_rt/Makefile.inc projects/clang1000-import/lib/libmagic/Makefile projects/clang1000-import/lib/libmagic/config.h projects/clang1000-import/lib/libmemstat/memstat_uma.c projects/clang1000-import/lib/libpmc/libpmc_pmu_util.c projects/clang1000-import/lib/libpmc/pmu-events/arch/x86/mapfile.csv projects/clang1000-import/lib/libthr/thread/thr_create.c projects/clang1000-import/lib/libthr/thread/thr_private.h projects/clang1000-import/lib/libthr/thread/thr_rtld.c projects/clang1000-import/lib/libthr/thread/thr_sig.c projects/clang1000-import/libexec/rtld-elf/rtld-libc/Makefile.inc projects/clang1000-import/libexec/rtld-elf/rtld.c projects/clang1000-import/libexec/rtld-elf/rtld.h projects/clang1000-import/libexec/rtld-elf/rtld_lock.c projects/clang1000-import/release/tools/ec2.conf projects/clang1000-import/sbin/fsck_msdosfs/Makefile projects/clang1000-import/sbin/fsck_msdosfs/check.c projects/clang1000-import/sbin/ipfw/nat.c projects/clang1000-import/share/man/man4/cas.4 projects/clang1000-import/share/man/man4/dc.4 projects/clang1000-import/share/man/man4/ddb.4 projects/clang1000-import/share/man/man4/gem.4 projects/clang1000-import/share/man/man4/hme.4 projects/clang1000-import/share/man/man4/le.4 projects/clang1000-import/share/man/man4/netmap.4 projects/clang1000-import/share/man/man4/pcm.4 projects/clang1000-import/share/man/man4/smp.4 projects/clang1000-import/share/man/man4/vale.4 projects/clang1000-import/share/man/man5/rc.conf.5 projects/clang1000-import/share/man/man9/bus_dma.9 projects/clang1000-import/share/misc/committers-src.dot projects/clang1000-import/share/mk/bsd.opts.mk projects/clang1000-import/share/mk/src.opts.mk projects/clang1000-import/stand/common/interp_lua.c projects/clang1000-import/stand/efi/loader/main.c projects/clang1000-import/sys/amd64/amd64/trap.c projects/clang1000-import/sys/amd64/include/counter.h projects/clang1000-import/sys/amd64/include/pcpu.h projects/clang1000-import/sys/arm/include/atomic-v6.h projects/clang1000-import/sys/arm64/conf/GENERIC projects/clang1000-import/sys/arm64/linux/linux_locore.asm projects/clang1000-import/sys/cam/ctl/ctl_backend_block.c projects/clang1000-import/sys/cam/ctl/ctl_backend_ramdisk.c projects/clang1000-import/sys/cam/scsi/scsi_da.c projects/clang1000-import/sys/compat/freebsd32/freebsd32_syscall.h projects/clang1000-import/sys/compat/freebsd32/freebsd32_syscalls.c projects/clang1000-import/sys/compat/freebsd32/freebsd32_sysent.c projects/clang1000-import/sys/compat/freebsd32/freebsd32_systrace_args.c projects/clang1000-import/sys/compat/freebsd32/syscalls.master projects/clang1000-import/sys/compat/linux/linux_futex.c projects/clang1000-import/sys/compat/linux/linux_socket.c projects/clang1000-import/sys/conf/files projects/clang1000-import/sys/conf/files.arm64 projects/clang1000-import/sys/dev/acpica/acpi_hpet.c projects/clang1000-import/sys/dev/al_eth/al_eth.c projects/clang1000-import/sys/dev/alc/if_alc.c projects/clang1000-import/sys/dev/ale/if_ale.c projects/clang1000-import/sys/dev/altera/atse/if_atse.c projects/clang1000-import/sys/dev/ath/if_ath.c projects/clang1000-import/sys/dev/ath/if_ath_rx.c projects/clang1000-import/sys/dev/bge/if_bge.c projects/clang1000-import/sys/dev/bwn/if_bwn.c projects/clang1000-import/sys/dev/bxe/bxe.c projects/clang1000-import/sys/dev/cas/if_cas.c projects/clang1000-import/sys/dev/cxgbe/firmware/t4fw_interface.h projects/clang1000-import/sys/dev/ena/ena.c projects/clang1000-import/sys/dev/flash/cqspi.c projects/clang1000-import/sys/dev/hme/if_hme.c projects/clang1000-import/sys/dev/hwpmc/hwpmc_amd.c projects/clang1000-import/sys/dev/hwpmc/hwpmc_x86.c projects/clang1000-import/sys/dev/ixl/if_iavf.c projects/clang1000-import/sys/dev/le/lancevar.h projects/clang1000-import/sys/dev/liquidio/base/lio_droq.c projects/clang1000-import/sys/dev/malo/if_malo.c projects/clang1000-import/sys/dev/mlx5/driver.h projects/clang1000-import/sys/dev/mlx5/mlx5_core/mlx5_eq.c projects/clang1000-import/sys/dev/mlx5/mlx5_core/mlx5_main.c projects/clang1000-import/sys/dev/mlx5/mlx5_en/mlx5_en_main.c projects/clang1000-import/sys/dev/mwl/if_mwl.c projects/clang1000-import/sys/dev/neta/if_mvneta.c projects/clang1000-import/sys/dev/neta/if_mvneta_fdt.c projects/clang1000-import/sys/dev/neta/if_mvnetavar.h projects/clang1000-import/sys/dev/netmap/if_ptnet.c projects/clang1000-import/sys/dev/netmap/netmap_kern.h projects/clang1000-import/sys/dev/nfe/if_nfe.c projects/clang1000-import/sys/dev/pci/pci_host_generic_acpi.c projects/clang1000-import/sys/dev/pci/pci_host_generic_acpi.h projects/clang1000-import/sys/dev/pms/RefTisa/discovery/dm/dmdisc.c projects/clang1000-import/sys/dev/ppbus/lpt.c projects/clang1000-import/sys/dev/puc/pucdata.c projects/clang1000-import/sys/dev/qlxgbe/ql_os.c projects/clang1000-import/sys/dev/re/if_re.c projects/clang1000-import/sys/dev/rt/if_rt.c projects/clang1000-import/sys/dev/smc/if_smc.c projects/clang1000-import/sys/dev/usb/controller/ehci_pci.c projects/clang1000-import/sys/dev/usb/controller/ohci_pci.c projects/clang1000-import/sys/dev/usb/controller/xhci_pci.c projects/clang1000-import/sys/dev/usb/net/if_axe.c projects/clang1000-import/sys/dev/virtio/network/if_vtnet.c projects/clang1000-import/sys/dev/vnic/nicvf_queues.c projects/clang1000-import/sys/dev/vr/if_vr.c projects/clang1000-import/sys/dev/wtap/if_wtap.c projects/clang1000-import/sys/dev/xdma/xdma.c projects/clang1000-import/sys/dev/xdma/xdma.h projects/clang1000-import/sys/dev/xdma/xdma_fdt_test.c projects/clang1000-import/sys/dev/xdma/xdma_sg.c projects/clang1000-import/sys/dev/xilinx/if_xae.c projects/clang1000-import/sys/dev/xl/if_xl.c projects/clang1000-import/sys/geom/eli/g_eli.c projects/clang1000-import/sys/kern/Makefile projects/clang1000-import/sys/kern/capabilities.conf projects/clang1000-import/sys/kern/imgact_elf.c projects/clang1000-import/sys/kern/init_sysent.c projects/clang1000-import/sys/kern/kern_exec.c projects/clang1000-import/sys/kern/kern_fork.c projects/clang1000-import/sys/kern/kern_intr.c projects/clang1000-import/sys/kern/kern_jail.c projects/clang1000-import/sys/kern/kern_proc.c projects/clang1000-import/sys/kern/kern_rmlock.c projects/clang1000-import/sys/kern/kern_sig.c projects/clang1000-import/sys/kern/kern_sysctl.c projects/clang1000-import/sys/kern/kern_thread.c projects/clang1000-import/sys/kern/subr_capability.c projects/clang1000-import/sys/kern/subr_epoch.c projects/clang1000-import/sys/kern/subr_gtaskqueue.c projects/clang1000-import/sys/kern/subr_pcpu.c projects/clang1000-import/sys/kern/subr_smp.c projects/clang1000-import/sys/kern/subr_syscall.c projects/clang1000-import/sys/kern/subr_taskqueue.c projects/clang1000-import/sys/kern/subr_trap.c projects/clang1000-import/sys/kern/syscalls.c projects/clang1000-import/sys/kern/syscalls.master projects/clang1000-import/sys/kern/systrace_args.c projects/clang1000-import/sys/kern/vfs_mount.c projects/clang1000-import/sys/kern/vfs_subr.c projects/clang1000-import/sys/kern/vfs_vnops.c projects/clang1000-import/sys/mips/ingenic/jz4780_aic.c projects/clang1000-import/sys/modules/cxgbe/t4_firmware/Makefile projects/clang1000-import/sys/modules/cxgbe/t5_firmware/Makefile projects/clang1000-import/sys/modules/cxgbe/t6_firmware/Makefile projects/clang1000-import/sys/net/ieee8023ad_lacp.c projects/clang1000-import/sys/net/if_media.c projects/clang1000-import/sys/net/if_media.h projects/clang1000-import/sys/net/iflib.c projects/clang1000-import/sys/netgraph/ng_nat.c projects/clang1000-import/sys/netinet/cc/cc_cdg.c projects/clang1000-import/sys/netinet/cc/cc_dctcp.c projects/clang1000-import/sys/netinet/cc/cc_htcp.c projects/clang1000-import/sys/netinet/icmp6.h projects/clang1000-import/sys/netinet/if_ether.c projects/clang1000-import/sys/netinet/igmp.c projects/clang1000-import/sys/netinet/in.c projects/clang1000-import/sys/netinet/in.h projects/clang1000-import/sys/netinet/in_mcast.c projects/clang1000-import/sys/netinet/in_pcb.c projects/clang1000-import/sys/netinet/in_pcb.h projects/clang1000-import/sys/netinet/in_proto.c projects/clang1000-import/sys/netinet/in_rmx.c projects/clang1000-import/sys/netinet/ip_divert.c projects/clang1000-import/sys/netinet/ip_dummynet.h projects/clang1000-import/sys/netinet/ip_fastfwd.c projects/clang1000-import/sys/netinet/ip_fw.h projects/clang1000-import/sys/netinet/ip_icmp.c projects/clang1000-import/sys/netinet/ip_id.c projects/clang1000-import/sys/netinet/ip_input.c projects/clang1000-import/sys/netinet/ip_mroute.c projects/clang1000-import/sys/netinet/ip_options.c projects/clang1000-import/sys/netinet/ip_reass.c projects/clang1000-import/sys/netinet/netdump/netdump_client.c projects/clang1000-import/sys/netinet/raw_ip.c projects/clang1000-import/sys/netinet/sctp_indata.c projects/clang1000-import/sys/netinet/sctp_output.c projects/clang1000-import/sys/netinet/sctp_pcb.c projects/clang1000-import/sys/netinet/sctp_var.h projects/clang1000-import/sys/netinet/sctputil.c projects/clang1000-import/sys/netinet/sctputil.h projects/clang1000-import/sys/netinet/siftr.c projects/clang1000-import/sys/netinet/tcp.h projects/clang1000-import/sys/netinet/tcp_fastopen.c projects/clang1000-import/sys/netinet/tcp_fsm.h projects/clang1000-import/sys/netinet/tcp_hpts.c projects/clang1000-import/sys/netinet/tcp_hpts.h projects/clang1000-import/sys/netinet/tcp_input.c projects/clang1000-import/sys/netinet/tcp_log_buf.c projects/clang1000-import/sys/netinet/tcp_log_buf.h projects/clang1000-import/sys/netinet/tcp_lro.c projects/clang1000-import/sys/netinet/tcp_lro.h projects/clang1000-import/sys/netinet/tcp_output.c projects/clang1000-import/sys/netinet/tcp_ratelimit.c projects/clang1000-import/sys/netinet/tcp_reass.c projects/clang1000-import/sys/netinet/tcp_sack.c projects/clang1000-import/sys/netinet/tcp_stacks/bbr.c projects/clang1000-import/sys/netinet/tcp_stacks/rack.c projects/clang1000-import/sys/netinet/tcp_stacks/rack_bbr_common.c projects/clang1000-import/sys/netinet/tcp_stacks/rack_bbr_common.h projects/clang1000-import/sys/netinet/tcp_stacks/sack_filter.c projects/clang1000-import/sys/netinet/tcp_stacks/tcp_bbr.h projects/clang1000-import/sys/netinet/tcp_stacks/tcp_rack.h projects/clang1000-import/sys/netinet/tcp_subr.c projects/clang1000-import/sys/netinet/tcp_syncache.c projects/clang1000-import/sys/netinet/tcp_timer.c projects/clang1000-import/sys/netinet/tcp_timer.h projects/clang1000-import/sys/netinet/tcp_usrreq.c projects/clang1000-import/sys/netinet/tcp_var.h projects/clang1000-import/sys/netinet/udp.h projects/clang1000-import/sys/netinet/udp_usrreq.c projects/clang1000-import/sys/netinet/udp_var.h projects/clang1000-import/sys/netinet/udplite.h projects/clang1000-import/sys/netipsec/key.c projects/clang1000-import/sys/netpfil/ipfw/ip_fw_dynamic.c projects/clang1000-import/sys/opencrypto/xform_enc.h projects/clang1000-import/sys/riscv/include/pcpu.h projects/clang1000-import/sys/riscv/riscv/pmap.c projects/clang1000-import/sys/sys/_task.h projects/clang1000-import/sys/sys/capsicum.h projects/clang1000-import/sys/sys/elf_common.h projects/clang1000-import/sys/sys/epoch.h projects/clang1000-import/sys/sys/gtaskqueue.h projects/clang1000-import/sys/sys/mount.h projects/clang1000-import/sys/sys/pcpu.h projects/clang1000-import/sys/sys/proc.h projects/clang1000-import/sys/sys/signalvar.h projects/clang1000-import/sys/sys/smp.h projects/clang1000-import/sys/sys/syscall.h projects/clang1000-import/sys/sys/syscall.mk projects/clang1000-import/sys/sys/sysctl.h projects/clang1000-import/sys/sys/sysproto.h projects/clang1000-import/sys/sys/taskqueue.h projects/clang1000-import/sys/vm/uma_core.c projects/clang1000-import/sys/vm/uma_int.h projects/clang1000-import/sys/vm/vm_pageout.c projects/clang1000-import/tests/sys/fs/fusefs/read.cc projects/clang1000-import/tests/sys/fs/fusefs/write.cc projects/clang1000-import/tests/sys/geom/class/multipath/failloop.sh projects/clang1000-import/tests/sys/kern/ptrace_test.c projects/clang1000-import/tests/sys/mac/portacl/misc.sh projects/clang1000-import/tests/sys/net/routing/test_rtsock_lladdr.c projects/clang1000-import/tests/sys/pjdfstest/tests/Makefile projects/clang1000-import/tools/kerneldoc/subsys/Makefile projects/clang1000-import/usr.bin/bsdcat/Makefile projects/clang1000-import/usr.bin/cpio/Makefile projects/clang1000-import/usr.bin/diff/diff.1 projects/clang1000-import/usr.bin/login/login.conf projects/clang1000-import/usr.bin/procstat/procstat.c projects/clang1000-import/usr.bin/procstat/procstat.h projects/clang1000-import/usr.bin/procstat/procstat_auxv.c projects/clang1000-import/usr.bin/procstat/procstat_sigs.c projects/clang1000-import/usr.bin/tar/Makefile projects/clang1000-import/usr.bin/tar/tests/Makefile projects/clang1000-import/usr.bin/truss/syscalls.c projects/clang1000-import/usr.sbin/bhyve/net_backends.c projects/clang1000-import/usr.sbin/bhyve/net_backends.h projects/clang1000-import/usr.sbin/bhyve/net_utils.c projects/clang1000-import/usr.sbin/bhyve/pci_e82545.c projects/clang1000-import/usr.sbin/bhyve/pci_virtio_net.c projects/clang1000-import/usr.sbin/binmiscctl/binmiscctl.8 projects/clang1000-import/usr.sbin/bsdconfig/share/media/network.subr projects/clang1000-import/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c projects/clang1000-import/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_partition_tbl.c projects/clang1000-import/usr.sbin/config/config.5 projects/clang1000-import/usr.sbin/cron/cron/compat.h projects/clang1000-import/usr.sbin/cron/cron/do_command.c projects/clang1000-import/usr.sbin/cron/cron/externs.h projects/clang1000-import/usr.sbin/cron/cron/popen.c projects/clang1000-import/usr.sbin/cron/lib/compat.c projects/clang1000-import/usr.sbin/ntp/config.h projects/clang1000-import/usr.sbin/ntp/libntpevent/Makefile projects/clang1000-import/usr.sbin/periodic/etc/daily/200.backup-passwd projects/clang1000-import/usr.sbin/rmt/Makefile projects/clang1000-import/usr.sbin/tzsetup/tzsetup.c Directory Properties: projects/clang1000-import/ (props changed) projects/clang1000-import/contrib/elftoolchain/ (props changed) projects/clang1000-import/contrib/file/ (props changed) projects/clang1000-import/contrib/libarchive/ (props changed) projects/clang1000-import/contrib/netbsd-tests/ (props changed) Modified: projects/clang1000-import/ObsoleteFiles.inc ============================================================================== --- projects/clang1000-import/ObsoleteFiles.inc Thu Feb 13 11:00:20 2020 (r357854) +++ projects/clang1000-import/ObsoleteFiles.inc Thu Feb 13 12:52:24 2020 (r357855) @@ -291,6 +291,10 @@ OLD_FILES+=usr/include/ssp/string.h OLD_FILES+=usr/include/ssp/unistd.h OLD_DIRS+=usr/include/ssp +# 20191229: GEOM_SCHED class and gsched tool removed +OLD_FILES+=sbin/gsched +OLD_LIBS+=lib/geom/geom_sched.so + # 20191222: new clang import which bumps version from 9.0.0 to 9.0.1. OLD_FILES+=usr/lib/clang/9.0.0/include/cuda_wrappers/algorithm OLD_FILES+=usr/lib/clang/9.0.0/include/cuda_wrappers/complex @@ -994,7 +998,7 @@ OLD_FILES+=usr/share/man/man4/wb.4.gz OLD_FILES+=usr/share/man/man4/xe.4.gz OLD_FILES+=usr/share/man/man4/if_xe.4.gz # 20190513: libcap_sysctl interface change -OLD_FILES+=lib/casper/libcap_sysctl.1 +OLD_FILES+=lib/casper/libcap_sysctl.so.1 # 20190509: tests/sys/opencrypto requires the net/py-dpkt package. OLD_FILES+=usr/tests/sys/opencrypto/dpkt.py OLD_FILES+=usr/tests/sys/opencrypto/dpkt.pyc Modified: projects/clang1000-import/UPDATING ============================================================================== --- projects/clang1000-import/UPDATING Thu Feb 13 11:00:20 2020 (r357854) +++ projects/clang1000-import/UPDATING Thu Feb 13 12:52:24 2020 (r357855) @@ -32,6 +32,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: information about prerequisites and upgrading, if you are not already using clang 3.5.0 or higher. +20200212: + Defining the long deprecated NO_CTF, NO_DEBUG_FILES, NO_INSTALLLIB, + NO_MAN, NO_PROFILE, and NO_WARNS variables is now an error. Update + your Makefiles and scripts to define MK_<var>=no instead as required. + + One exception to this is that program or library Makefiles should + define MAN to empty rather than setting MK_MAN=no. + 20200108: Clang/LLVM is now the default compiler and LLD the default linker for riscv64. Modified: projects/clang1000-import/contrib/elftoolchain/addr2line/addr2line.c ============================================================================== --- projects/clang1000-import/contrib/elftoolchain/addr2line/addr2line.c Thu Feb 13 11:00:20 2020 (r357854) +++ projects/clang1000-import/contrib/elftoolchain/addr2line/addr2line.c Thu Feb 13 12:52:24 2020 (r357855) @@ -65,6 +65,7 @@ struct CU { Dwarf_Signed nsrcfiles; STAILQ_HEAD(, Func) funclist; Dwarf_Die die; + Dwarf_Debug dbg; }; static struct option longopts[] = { @@ -345,7 +346,8 @@ cont_search: collect_func(dbg, ret_die, parent, cu); /* Cleanup */ - dwarf_dealloc(dbg, die, DW_DLA_DIE); + if (die != cu->die) + dwarf_dealloc(dbg, die, DW_DLA_DIE); if (abst_die != NULL) dwarf_dealloc(dbg, abst_die, DW_DLA_DIE); @@ -411,6 +413,102 @@ culookup(Dwarf_Unsigned addr) return (NULL); } +/* + * Check whether addr falls into range(s) of current CU, and save current CU + * to lookup tree if so. + */ +static int +check_range(Dwarf_Debug dbg, Dwarf_Die die, Dwarf_Unsigned addr, + struct CU **cu) +{ + Dwarf_Error de; + Dwarf_Unsigned addr_base, lopc, hipc; + Dwarf_Off ranges_off; + Dwarf_Signed ranges_cnt; + Dwarf_Ranges *ranges; + int i, ret; + bool in_range; + + addr_base = 0; + ranges = NULL; + ranges_cnt = 0; + in_range = false; + + ret = dwarf_attrval_unsigned(die, DW_AT_ranges, &ranges_off, &de); + if (ret == DW_DLV_NO_ENTRY) { + if (dwarf_attrval_unsigned(die, DW_AT_low_pc, &lopc, &de) == + DW_DLV_OK) { + if (lopc == curlopc) + return (DW_DLV_ERROR); + if (dwarf_attrval_unsigned(die, DW_AT_high_pc, &hipc, + &de) == DW_DLV_OK) { + /* + * Check if the address falls into the PC + * range of this CU. + */ + if (handle_high_pc(die, lopc, &hipc) != + DW_DLV_OK) + return (DW_DLV_ERROR); + } else { + /* Assume ~0ULL if DW_AT_high_pc not present */ + hipc = ~0ULL; + } + + if (addr >= lopc && addr < hipc) { + in_range = true; + } + } + } else if (ret == DW_DLV_OK) { + ret = dwarf_get_ranges(dbg, ranges_off, &ranges, + &ranges_cnt, NULL, &de); + if (ret != DW_DLV_OK) + return (ret); + + if (!ranges || ranges_cnt <= 0) + return (DW_DLV_ERROR); + + for (i = 0; i < ranges_cnt; i++) { + if (ranges[i].dwr_type == DW_RANGES_END) + return (DW_DLV_NO_ENTRY); + + if (ranges[i].dwr_type == + DW_RANGES_ADDRESS_SELECTION) { + addr_base = ranges[i].dwr_addr2; + continue; + } + + /* DW_RANGES_ENTRY */ + lopc = ranges[i].dwr_addr1 + addr_base; + hipc = ranges[i].dwr_addr2 + addr_base; + + if (lopc == curlopc) + return (DW_DLV_ERROR); + + if (addr >= lopc && addr < hipc){ + in_range = true; + break; + } + } + } else { + return (DW_DLV_ERROR); + } + + if (in_range) { + if ((*cu = calloc(1, sizeof(struct CU))) == NULL) + err(EXIT_FAILURE, "calloc"); + (*cu)->lopc = lopc; + (*cu)->hipc = hipc; + (*cu)->die = die; + (*cu)->dbg = dbg; + STAILQ_INIT(&(*cu)->funclist); + RB_INSERT(cutree, &cuhead, *cu); + curlopc = lopc; + return (DW_DLV_OK); + } else { + return (DW_DLV_NO_ENTRY); + } +} + static void translate(Dwarf_Debug dbg, Elf *e, const char* addrstr) { @@ -418,10 +516,9 @@ translate(Dwarf_Debug dbg, Elf *e, const char* addrstr Dwarf_Line *lbuf; Dwarf_Error de; Dwarf_Half tag; - Dwarf_Unsigned lopc, hipc, addr, lineno, plineno; + Dwarf_Unsigned addr, lineno, plineno; Dwarf_Signed lcount; Dwarf_Addr lineaddr, plineaddr; - Dwarf_Off off; struct CU *cu; struct Func *f; const char *funcname; @@ -439,6 +536,7 @@ translate(Dwarf_Debug dbg, Elf *e, const char* addrstr cu = culookup(addr); if (cu != NULL) { die = cu->die; + dbg = cu->dbg; goto status_ok; } @@ -477,44 +575,11 @@ translate(Dwarf_Debug dbg, Elf *e, const char* addrstr warnx("could not find DW_TAG_compile_unit die"); goto next_cu; } - if (dwarf_attrval_unsigned(die, DW_AT_low_pc, &lopc, &de) == - DW_DLV_OK) { - if (lopc == curlopc) - goto out; - if (dwarf_attrval_unsigned(die, DW_AT_high_pc, &hipc, - &de) == DW_DLV_OK) { - /* - * Check if the address falls into the PC - * range of this CU. - */ - if (handle_high_pc(die, lopc, &hipc) != - DW_DLV_OK) - goto out; - } else { - /* Assume ~0ULL if DW_AT_high_pc not present */ - hipc = ~0ULL; - } - - if (dwarf_dieoffset(die, &off, &de) != DW_DLV_OK) { - warnx("dwarf_dieoffset failed: %s", - dwarf_errmsg(de)); - goto out; - } - - if (addr >= lopc && addr < hipc) { - if ((cu = calloc(1, sizeof(*cu))) == NULL) - err(EXIT_FAILURE, "calloc"); - cu->off = off; - cu->lopc = lopc; - cu->hipc = hipc; - cu->die = die; - STAILQ_INIT(&cu->funclist); - RB_INSERT(cutree, &cuhead, cu); - - curlopc = lopc; - break; - } - } + ret = check_range(dbg, die, addr, &cu); + if (ret == DW_DLV_OK) + break; + if (ret == DW_DLV_ERROR) + goto out; next_cu: if (die != NULL) { dwarf_dealloc(dbg, die, DW_DLA_DIE); Modified: projects/clang1000-import/contrib/elftoolchain/elfcopy/main.c ============================================================================== --- projects/clang1000-import/contrib/elftoolchain/elfcopy/main.c Thu Feb 13 11:00:20 2020 (r357854) +++ projects/clang1000-import/contrib/elftoolchain/elfcopy/main.c Thu Feb 13 12:52:24 2020 (r357855) @@ -1394,6 +1394,7 @@ set_output_target(struct elfcopy *ecp, const char *tar ecp->oec = elftc_bfd_target_class(tgt); ecp->oed = elftc_bfd_target_byteorder(tgt); ecp->oem = elftc_bfd_target_machine(tgt); + ecp->abi = elftc_bfd_target_osabi(tgt); } if (ecp->otf == ETF_EFI || ecp->otf == ETF_PE) ecp->oem = elftc_bfd_target_machine(tgt); Modified: projects/clang1000-import/contrib/elftoolchain/libelftc/elftc.3 ============================================================================== --- projects/clang1000-import/contrib/elftoolchain/libelftc/elftc.3 Thu Feb 13 11:00:20 2020 (r357854) +++ projects/clang1000-import/contrib/elftoolchain/libelftc/elftc.3 Thu Feb 13 12:52:24 2020 (r357855) @@ -23,7 +23,7 @@ .\" .\" $Id: elftc.3 3645 2018-10-15 20:17:14Z jkoshy $ .\" -.Dd December 24, 2012 +.Dd February 12, 2020 .Dt ELFTC 3 .Os .Sh NAME @@ -57,6 +57,8 @@ Query the byte order for a binary object descriptor. Query the object format for a binary object descriptor. .It Fn elftc_bfd_target_machine Query the target machine for a binary object descriptor. +.It Fn elftc_bfd_target_osabi +Query the target osabi for a binary object descriptor. .El .It "C++ support" .Bl -tag -compact -width indent Modified: projects/clang1000-import/contrib/elftoolchain/libelftc/elftc_bfd_find_target.3 ============================================================================== --- projects/clang1000-import/contrib/elftoolchain/libelftc/elftc_bfd_find_target.3 Thu Feb 13 11:00:20 2020 (r357854) +++ projects/clang1000-import/contrib/elftoolchain/libelftc/elftc_bfd_find_target.3 Thu Feb 13 12:52:24 2020 (r357855) @@ -23,7 +23,7 @@ .\" .\" $Id: elftc_bfd_find_target.3 3752 2019-06-28 01:12:53Z emaste $ .\" -.Dd June 27, 2019 +.Dd February 12, 2020 .Dt ELFTC_BFD_FIND_TARGET 3 .Os .Sh NAME @@ -48,6 +48,8 @@ .Fn elftc_bfd_target_flavor "Elftc_Bfd_Target *target" .Ft "unsigned int" .Fn elftc_bfd_target_machine "Elftc_Bfd_Target *target" +.Ft "unsigned int" +.Fn elftc_bfd_target_osabi "Elftc_Bfd_Target *target" .Sh DESCRIPTION Function .Fn elftc_bfd_find_target Modified: projects/clang1000-import/contrib/elftoolchain/libelftc/elftc_bfdtarget.c ============================================================================== --- projects/clang1000-import/contrib/elftoolchain/libelftc/elftc_bfdtarget.c Thu Feb 13 11:00:20 2020 (r357854) +++ projects/clang1000-import/contrib/elftoolchain/libelftc/elftc_bfdtarget.c Thu Feb 13 12:52:24 2020 (r357855) @@ -71,3 +71,10 @@ elftc_bfd_target_machine(Elftc_Bfd_Target *tgt) return (tgt->bt_machine); } + +unsigned int +elftc_bfd_target_osabi(Elftc_Bfd_Target *tgt) +{ + + return (tgt->bt_osabi); +} Modified: projects/clang1000-import/contrib/elftoolchain/libelftc/libelftc.h ============================================================================== --- projects/clang1000-import/contrib/elftoolchain/libelftc/libelftc.h Thu Feb 13 11:00:20 2020 (r357854) +++ projects/clang1000-import/contrib/elftoolchain/libelftc/libelftc.h Thu Feb 13 12:52:24 2020 (r357855) @@ -72,6 +72,7 @@ Elftc_Bfd_Target_Flavor elftc_bfd_target_flavor(Elftc unsigned int elftc_bfd_target_byteorder(Elftc_Bfd_Target *_tgt); unsigned int elftc_bfd_target_class(Elftc_Bfd_Target *_tgt); unsigned int elftc_bfd_target_machine(Elftc_Bfd_Target *_tgt); +unsigned int elftc_bfd_target_osabi(Elftc_Bfd_Target *_tgt); int elftc_copyfile(int _srcfd, int _dstfd); int elftc_demangle(const char *_mangledname, char *_buffer, size_t _bufsize, unsigned int _flags); Modified: projects/clang1000-import/contrib/file/ChangeLog ============================================================================== --- projects/clang1000-import/contrib/file/ChangeLog Thu Feb 13 11:00:20 2020 (r357854) +++ projects/clang1000-import/contrib/file/ChangeLog Thu Feb 13 12:52:24 2020 (r357855) @@ -1,3 +1,23 @@ +2019-12-16 21:11 Christos Zoulas <christos@zoulas.com> + + * release 5.38 + +2019-12-15 22:13 Christos Zoulas <christos@zoulas.com> + Document changes since the previous release: + - Always accept -S (no sandbox) even if we don't support sandboxing + - More syscalls elided for sandboxiing + - For ELF dynamic means having an interpreter not just PT_DYNAMIC + - Check for large ELF session header offset + - When saving and restoring a locale, keep the locale name in our + own storage. + - Add a flag to disable CSV file detection. + - Don't pass NULL/0 to memset to appease sanitizers. + - Avoid spurious prints when looks for extensions or apple strings + in fsmagic. + - Add builtin decompressors for xz and and bzip. + - Add a limit for the number of CDF elements. + - More checks for overflow in CDF. + 2019-05-14 22:26 Christos Zoulas <christos@zoulas.com> * release 5.37 Modified: projects/clang1000-import/contrib/file/Makefile.in ============================================================================== --- projects/clang1000-import/contrib/file/Makefile.in Thu Feb 13 11:00:20 2020 (r357854) +++ projects/clang1000-import/contrib/file/Makefile.in Thu Feb 13 12:52:24 2020 (r357855) @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.15 from Makefile.am. +# Makefile.in generated by automake 1.16.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2014 Free Software Foundation, Inc. +# Copyright (C) 1994-2018 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -136,7 +136,7 @@ am__recursive_targets = \ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - cscope distdir dist dist-all distcheck + cscope distdir distdir-am dist dist-all distcheck am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ $(LISP)config.h.in # Read a list of newline-separated strings from the standard input, @@ -161,7 +161,7 @@ CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \ COPYING ChangeLog INSTALL NEWS README TODO compile \ - config.guess config.sub depcomp install-sh ltmain.sh missing + config.guess config.sub install-sh ltmain.sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -246,6 +246,7 @@ LIBTOOL = @LIBTOOL@ LIPO = @LIPO@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ +LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MINGW = @MINGW@ @@ -352,8 +353,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config echo ' $(SHELL) ./config.status'; \ $(SHELL) ./config.status;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -495,7 +496,10 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files -distdir: $(DISTFILES) +distdir: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) distdir-am + +distdir-am: $(DISTFILES) $(am__remove_distdir) test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -560,7 +564,7 @@ distdir: $(DISTFILES) ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r "$(distdir)" dist-gzip: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz $(am__post_remove_distdir) dist-bzip2: distdir @@ -586,7 +590,7 @@ dist-shar: distdir @echo WARNING: "Support for shar distribution archives is" \ "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 - shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz $(am__post_remove_distdir) dist-zip: distdir @@ -604,7 +608,7 @@ dist dist-all: distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lz*) \ @@ -614,7 +618,7 @@ distcheck: dist *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ + eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac Modified: projects/clang1000-import/contrib/file/README ============================================================================== --- projects/clang1000-import/contrib/file/README Thu Feb 13 11:00:20 2020 (r357854) +++ projects/clang1000-import/contrib/file/README Thu Feb 13 12:52:24 2020 (r357855) @@ -1,6 +1,6 @@ ## README for file(1) Command and the libmagic(3) library ## - @(#) $File: README,v 1.57 2019/02/06 00:20:56 christos Exp $ + @(#) $File: README,v 1.59 2019/09/19 01:04:01 christos Exp $ Mailing List: file@astron.com Mailing List archives: http://mailman.astron.com/pipermail/file/ @@ -24,6 +24,10 @@ A public read-only git repository of the same sources https://github.com/file/file +We are continuously being fuzzed by OSS-FUZZ: + + https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:file + The major changes for 5.x are CDF file parsing, indirect magic, name/use (recursion) and overhaul in mime and ascii encoding handling. @@ -91,6 +95,7 @@ src/funcs.c - utilility functions src/getline.c - replacement for OS's that don't have it. src/getopt_long.c - replacement for OS's that don't have it. src/gmtime_r.c - replacement for OS's that don't have it. +src/is_csv.c - knows about Comma Separated Value file format (RFC 4180). src/is_json.c - knows about JavaScript Object Notation format (RFC 8259). src/is_tar.c, tar.h - knows about Tape ARchive format (courtesy John Gilmore). src/localtime_r.c - replacement for OS's that don't have it. Modified: projects/clang1000-import/contrib/file/aclocal.m4 ============================================================================== --- projects/clang1000-import/contrib/file/aclocal.m4 Thu Feb 13 11:00:20 2020 (r357854) +++ projects/clang1000-import/contrib/file/aclocal.m4 Thu Feb 13 12:52:24 2020 (r357855) @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.15 -*- Autoconf -*- +# generated automatically by aclocal 1.16.1 -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,8 +20,8 @@ You have another version of autoconf. It may work, bu If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# visibility.m4 serial 5 (gettext-0.18.2) -dnl Copyright (C) 2005, 2008, 2010-2016 Free Software Foundation, Inc. +# visibility.m4 serial 6 +dnl Copyright (C) 2005, 2008, 2010-2019 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -51,42 +51,42 @@ AC_DEFUN([gl_VISIBILITY], dnl First, check whether -Werror can be added to the command line, or dnl whether it leads to an error because of some other option that the dnl user has put into $CC $CFLAGS $CPPFLAGS. - AC_MSG_CHECKING([whether the -Werror option is usable]) - AC_CACHE_VAL([gl_cv_cc_vis_werror], [ - gl_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Werror" - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[]], [[]])], - [gl_cv_cc_vis_werror=yes], - [gl_cv_cc_vis_werror=no]) - CFLAGS="$gl_save_CFLAGS"]) - AC_MSG_RESULT([$gl_cv_cc_vis_werror]) + AC_CACHE_CHECK([whether the -Werror option is usable], + [gl_cv_cc_vis_werror], + [gl_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Werror" + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[]], [[]])], + [gl_cv_cc_vis_werror=yes], + [gl_cv_cc_vis_werror=no]) + CFLAGS="$gl_save_CFLAGS" + ]) dnl Now check whether visibility declarations are supported. - AC_MSG_CHECKING([for simple visibility declarations]) - AC_CACHE_VAL([gl_cv_cc_visibility], [ - gl_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fvisibility=hidden" - dnl We use the option -Werror and a function dummyfunc, because on some - dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning - dnl "visibility attribute not supported in this configuration; ignored" - dnl at the first function definition in every compilation unit, and we - dnl don't want to use the option in this case. - if test $gl_cv_cc_vis_werror = yes; then - CFLAGS="$CFLAGS -Werror" - fi - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[extern __attribute__((__visibility__("hidden"))) int hiddenvar; - extern __attribute__((__visibility__("default"))) int exportedvar; - extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); - extern __attribute__((__visibility__("default"))) int exportedfunc (void); - void dummyfunc (void) {} - ]], - [[]])], - [gl_cv_cc_visibility=yes], - [gl_cv_cc_visibility=no]) - CFLAGS="$gl_save_CFLAGS"]) - AC_MSG_RESULT([$gl_cv_cc_visibility]) + AC_CACHE_CHECK([for simple visibility declarations], + [gl_cv_cc_visibility], + [gl_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -fvisibility=hidden" + dnl We use the option -Werror and a function dummyfunc, because on some + dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning + dnl "visibility attribute not supported in this configuration; ignored" + dnl at the first function definition in every compilation unit, and we + dnl don't want to use the option in this case. + if test $gl_cv_cc_vis_werror = yes; then + CFLAGS="$CFLAGS -Werror" + fi + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[extern __attribute__((__visibility__("hidden"))) int hiddenvar; + extern __attribute__((__visibility__("default"))) int exportedvar; + extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); + extern __attribute__((__visibility__("default"))) int exportedfunc (void); + void dummyfunc (void) {} + ]], + [[]])], + [gl_cv_cc_visibility=yes], + [gl_cv_cc_visibility=no]) + CFLAGS="$gl_save_CFLAGS" + ]) if test $gl_cv_cc_visibility = yes; then CFLAG_VISIBILITY="-fvisibility=hidden" HAVE_VISIBILITY=1 @@ -98,7 +98,7 @@ AC_DEFUN([gl_VISIBILITY], [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.]) ]) -# Copyright (C) 2002-2014 Free Software Foundation, Inc. +# Copyright (C) 2002-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,10 +110,10 @@ AC_DEFUN([gl_VISIBILITY], # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.15' +[am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.15], [], +m4_if([$1], [1.16.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -129,14 +129,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.15])dnl +[AM_AUTOMAKE_VERSION([1.16.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -188,7 +188,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -219,7 +219,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -410,13 +410,12 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. - # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], @@ -424,49 +423,41 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac + # TODO: see whether this extra hack can be removed once we start + # requiring Autoconf 2.70 or later. + AS_CASE([$CONFIG_FILES], + [*\'*], [eval set x "$CONFIG_FILES"], + [*], [set x $CONFIG_FILES]) shift - for mf + # Used to flag and report bootstrapping failures. + am_rc=0 + for am_mf do # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named 'Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line + am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile which includes + # dependency-tracking related rules and includes. + # Grep'ing the whole file directly is not great: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running 'make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ + || continue + am_dirpart=`AS_DIRNAME(["$am_mf"])` + am_filepart=`AS_BASENAME(["$am_mf"])` + AM_RUN_LOG([cd "$am_dirpart" \ + && sed -e '/# am--include-marker/d' "$am_filepart" \ + | $MAKE -f - am--depfiles]) || am_rc=$? done + if test $am_rc -ne 0; then + AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments + for automatic dependency tracking. Try re-running configure with the + '--disable-dependency-tracking' option to at least be able to build + the package (albeit without support for automatic dependency tracking).]) + fi + AS_UNSET([am_dirpart]) + AS_UNSET([am_filepart]) + AS_UNSET([am_mf]) + AS_UNSET([am_rc]) + rm -f conftest-deps.mk } ])# _AM_OUTPUT_DEPENDENCY_COMMANDS @@ -475,18 +466,17 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # ----------------------------- # This macro should only be invoked once -- use via AC_REQUIRE. # -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each '.P' file that we will -# need in order to bootstrap the dependency handling code. +# This code is only required when automatic dependency tracking is enabled. +# This creates each '.Po' and '.Plo' makefile fragment that we'll need in +# order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) + [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -573,8 +563,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl AC_REQUIRE([AC_PROG_MKDIR_P])dnl # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>; -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>; +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>; +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>; AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target (and possibly the TAP driver). The # system "awk" is bad on some platforms. @@ -641,7 +631,7 @@ END Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: <http://www.gnu.org/software/coreutils/>. +that behaves properly: <https://www.gnu.org/software/coreutils/>. If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -683,7 +673,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -704,7 +694,7 @@ if test x"${install_sh+set}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2014 Free Software Foundation, Inc. +# Copyright (C) 2003-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -725,7 +715,7 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -733,49 +723,42 @@ AC_SUBST([am__leading_dot])]) # AM_MAKE_INCLUDE() # ----------------- -# Check to see how make treats includes. +# Check whether make has an 'include' directive that can support all +# the idioms we need for our automatic dependency tracking code. AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' +[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) +cat > confinc.mk << 'END' am__doit: - @echo this is the am__doit target + @echo this is the am__doit target >confinc.out .PHONY: am__doit END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) am__include="#" am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) +# BSD make does it like this. +echo '.include "confinc.mk" # ignored' > confmf.BSD +# Other make implementations (GNU, Solaris 10, AIX) do it like this. +echo 'include confinc.mk # ignored' > confmf.GNU +_am_result=no +for s in GNU BSD; do + AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) + AS_CASE([$?:`cat confinc.out 2>/dev/null`], + ['0:this is the am__doit target'], + [AS_CASE([$s], + [BSD], [am__include='.include' am__quote='"'], + [am__include='include' am__quote=''])]) + if test "$am__include" != "#"; then + _am_result="yes ($s style)" + break + fi +done +rm -f confinc.* confmf.* +AC_MSG_RESULT([${_am_result}]) +AC_SUBST([am__include])]) +AC_SUBST([am__quote])]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2014 Free Software Foundation, Inc. +# Copyright (C) 1997-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -814,7 +797,7 @@ fi # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -843,7 +826,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -890,7 +873,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -909,7 +892,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -990,7 +973,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2014 Free Software Foundation, Inc. +# Copyright (C) 2009-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1050,7 +1033,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2014 Free Software Foundation, Inc. +# Copyright (C) 2001-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1078,7 +1061,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2014 Free Software Foundation, Inc. +# Copyright (C) 2006-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1097,7 +1080,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2014 Free Software Foundation, Inc. +# Copyright (C) 2004-2018 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, Modified: projects/clang1000-import/contrib/file/compile ============================================================================== --- projects/clang1000-import/contrib/file/compile Thu Feb 13 11:00:20 2020 (r357854) +++ projects/clang1000-import/contrib/file/compile Thu Feb 13 12:52:24 2020 (r357855) @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # Written by Tom Tromey <tromey@cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -255,7 +255,8 @@ EOF echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -339,9 +340,9 @@ exit $ret # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: Modified: projects/clang1000-import/contrib/file/config.guess ============================================================================== --- projects/clang1000-import/contrib/file/config.guess Thu Feb 13 11:00:20 2020 (r357854) +++ projects/clang1000-import/contrib/file/config.guess Thu Feb 13 12:52:24 2020 (r357855) @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2017 Free Software Foundation, Inc. +# Copyright 1992-2019 Free Software Foundation, Inc. -timestamp='2017-01-01' +timestamp='2019-01-03' # 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 @@ -15,7 +15,7 @@ timestamp='2017-01-01' # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see <http://www.gnu.org/licenses/>. +# along with this program; if not, see <https://www.gnu.org/licenses/>. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -27,7 +27,7 @@ timestamp='2017-01-01' # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002131252.01DCqP0L016182>