svn commit: r305172 - in projects/netbsd-tests-update-12: . bin/df cddl/contrib/opensolaris/common/ctf cddl/usr.sbin/dtrace cddl/usr.sbin/lockstat cddl/usr.sbin/plockstat cddl/usr.sbin/zfsd contrib...
Ngie Cooper
ngie at FreeBSD.org
Thu Sep 1 02:57:20 UTC 2016
Author: ngie
Date: Thu Sep 1 02:57:15 2016
New Revision: 305172
URL: https://svnweb.freebsd.org/changeset/base/305172
Log:
MFhead @ r305170
Added:
projects/netbsd-tests-update-12/cddl/usr.sbin/zfsd/Makefile.depend
- copied unchanged from r305170, head/cddl/usr.sbin/zfsd/Makefile.depend
projects/netbsd-tests-update-12/contrib/elftoolchain/libelftc/elftc_timestamp.3
- copied unchanged from r305170, head/contrib/elftoolchain/libelftc/elftc_timestamp.3
projects/netbsd-tests-update-12/contrib/elftoolchain/libelftc/elftc_timestamp.c
- copied unchanged from r305170, head/contrib/elftoolchain/libelftc/elftc_timestamp.c
projects/netbsd-tests-update-12/contrib/gcc/config/i386/cpuid.h
- copied unchanged from r305170, head/contrib/gcc/config/i386/cpuid.h
projects/netbsd-tests-update-12/crypto/openssh/blacklist.c
- copied unchanged from r305170, head/crypto/openssh/blacklist.c
projects/netbsd-tests-update-12/crypto/openssh/blacklist_client.h
- copied unchanged from r305170, head/crypto/openssh/blacklist_client.h
projects/netbsd-tests-update-12/libexec/rtld-elf/tests/libpythagoras/Makefile.depend
- copied unchanged from r305170, head/libexec/rtld-elf/tests/libpythagoras/Makefile.depend
projects/netbsd-tests-update-12/libexec/rtld-elf/tests/target/Makefile.depend
- copied unchanged from r305170, head/libexec/rtld-elf/tests/target/Makefile.depend
projects/netbsd-tests-update-12/sys/arm/ti/am335x/am335x_scm.c
- copied unchanged from r305170, head/sys/arm/ti/am335x/am335x_scm.c
projects/netbsd-tests-update-12/sys/boot/fdt/dts/arm64/
- copied from r305170, head/sys/boot/fdt/dts/arm64/
projects/netbsd-tests-update-12/tests/sys/pjdfstest/pjdfstest/Makefile.depend
- copied unchanged from r305170, head/tests/sys/pjdfstest/pjdfstest/Makefile.depend
projects/netbsd-tests-update-12/tests/sys/sys/Makefile.depend
- copied unchanged from r305170, head/tests/sys/sys/Makefile.depend
projects/netbsd-tests-update-12/usr.bin/bsdcat/tests/Makefile.depend
- copied unchanged from r305170, head/usr.bin/bsdcat/tests/Makefile.depend
projects/netbsd-tests-update-12/usr.bin/sdiff/tests/Makefile.depend
- copied unchanged from r305170, head/usr.bin/sdiff/tests/Makefile.depend
projects/netbsd-tests-update-12/usr.bin/xinstall/tests/Makefile.depend
- copied unchanged from r305170, head/usr.bin/xinstall/tests/Makefile.depend
projects/netbsd-tests-update-12/usr.sbin/extattr/tests/Makefile.depend
- copied unchanged from r305170, head/usr.sbin/extattr/tests/Makefile.depend
projects/netbsd-tests-update-12/usr.sbin/pmcstudy/Makefile.depend
- copied unchanged from r305170, head/usr.sbin/pmcstudy/Makefile.depend
projects/netbsd-tests-update-12/usr.sbin/ypldap/Makefile.depend
- copied unchanged from r305170, head/usr.sbin/ypldap/Makefile.depend
Modified:
projects/netbsd-tests-update-12/Makefile
projects/netbsd-tests-update-12/bin/df/df.c
projects/netbsd-tests-update-12/cddl/contrib/opensolaris/common/ctf/ctf_types.c
projects/netbsd-tests-update-12/cddl/usr.sbin/dtrace/Makefile.depend
projects/netbsd-tests-update-12/cddl/usr.sbin/lockstat/Makefile.depend
projects/netbsd-tests-update-12/cddl/usr.sbin/plockstat/Makefile.depend
projects/netbsd-tests-update-12/contrib/elftoolchain/common/elfdefinitions.h
projects/netbsd-tests-update-12/contrib/elftoolchain/elfcopy/archive.c
projects/netbsd-tests-update-12/contrib/elftoolchain/elfcopy/ascii.c
projects/netbsd-tests-update-12/contrib/elftoolchain/elfcopy/pe.c
projects/netbsd-tests-update-12/contrib/elftoolchain/elfdump/elfdump.c
projects/netbsd-tests-update-12/contrib/elftoolchain/libelf/elf_flagdata.3
projects/netbsd-tests-update-12/contrib/elftoolchain/libelftc/Makefile
projects/netbsd-tests-update-12/contrib/elftoolchain/libelftc/elftc_bfd_find_target.3
projects/netbsd-tests-update-12/contrib/elftoolchain/libelftc/elftc_reloc_type_str.c
projects/netbsd-tests-update-12/contrib/elftoolchain/libelftc/libelftc.h
projects/netbsd-tests-update-12/contrib/elftoolchain/libelftc/libelftc_bfdtarget.c
projects/netbsd-tests-update-12/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c
projects/netbsd-tests-update-12/contrib/elftoolchain/readelf/readelf.1
projects/netbsd-tests-update-12/contrib/elftoolchain/readelf/readelf.c
projects/netbsd-tests-update-12/contrib/gcc/doc/cpp.texi
projects/netbsd-tests-update-12/contrib/gcclibs/libcpp/ChangeLog.gcc43
projects/netbsd-tests-update-12/contrib/gcclibs/libcpp/internal.h
projects/netbsd-tests-update-12/contrib/gcclibs/libcpp/macro.c
projects/netbsd-tests-update-12/contrib/gcclibs/libcpp/pch.c
projects/netbsd-tests-update-12/contrib/telnet/libtelnet/pk.c
projects/netbsd-tests-update-12/contrib/telnet/telnet/commands.c
projects/netbsd-tests-update-12/contrib/tnftp/src/ftp.c
projects/netbsd-tests-update-12/crypto/openssh/auth-pam.c
projects/netbsd-tests-update-12/crypto/openssh/auth.c
projects/netbsd-tests-update-12/crypto/openssh/auth1.c
projects/netbsd-tests-update-12/crypto/openssh/auth2.c
projects/netbsd-tests-update-12/crypto/openssh/packet.c
projects/netbsd-tests-update-12/crypto/openssh/servconf.c
projects/netbsd-tests-update-12/crypto/openssh/servconf.h
projects/netbsd-tests-update-12/crypto/openssh/sshd.c
projects/netbsd-tests-update-12/crypto/openssh/sshd_config
projects/netbsd-tests-update-12/crypto/openssh/sshd_config.5
projects/netbsd-tests-update-12/gnu/lib/libgcc/Makefile
projects/netbsd-tests-update-12/lib/atf/libatf-c/Makefile
projects/netbsd-tests-update-12/lib/clang/libclangformat/Makefile.depend
projects/netbsd-tests-update-12/lib/clang/libclangtoolingcore/Makefile.depend
projects/netbsd-tests-update-12/lib/libc/gen/directory.3
projects/netbsd-tests-update-12/lib/libc/gen/getvfsbyname.3
projects/netbsd-tests-update-12/lib/libc/net/getaddrinfo.c
projects/netbsd-tests-update-12/lib/libc/net/name6.c
projects/netbsd-tests-update-12/lib/libc/tests/stdlib/Makefile.depend
projects/netbsd-tests-update-12/lib/libelftc/Makefile
projects/netbsd-tests-update-12/lib/libelftc/elftc_version.c
projects/netbsd-tests-update-12/lib/libproc/Makefile.depend
projects/netbsd-tests-update-12/lib/libproc/tests/Makefile.depend
projects/netbsd-tests-update-12/lib/librtld_db/Makefile.depend
projects/netbsd-tests-update-12/lib/libstand/bootp.c
projects/netbsd-tests-update-12/lib/libstand/bootp.h
projects/netbsd-tests-update-12/lib/libstand/globals.c
projects/netbsd-tests-update-12/lib/libstand/net.h
projects/netbsd-tests-update-12/lib/libstand/nfs.c
projects/netbsd-tests-update-12/lib/libstand/tftp.c
projects/netbsd-tests-update-12/sbin/newfs_msdos/mkfs_msdos.c
projects/netbsd-tests-update-12/secure/usr.bin/ssh/Makefile.depend
projects/netbsd-tests-update-12/secure/usr.sbin/sshd/Makefile
projects/netbsd-tests-update-12/secure/usr.sbin/sshd/Makefile.depend
projects/netbsd-tests-update-12/share/man/man9/mbuf.9
projects/netbsd-tests-update-12/share/mk/bsd.dep.mk
projects/netbsd-tests-update-12/share/mk/bsd.init.mk
projects/netbsd-tests-update-12/share/mk/bsd.obj.mk
projects/netbsd-tests-update-12/share/mk/bsd.subdir.mk
projects/netbsd-tests-update-12/share/mk/local.meta.sys.mk
projects/netbsd-tests-update-12/share/mk/sys.mk
projects/netbsd-tests-update-12/sys/arm/allwinner/aw_usbphy.c
projects/netbsd-tests-update-12/sys/arm/allwinner/aw_wdog.c
projects/netbsd-tests-update-12/sys/arm/arm/cpufunc_asm_xscale_c3.S
projects/netbsd-tests-update-12/sys/arm/arm/locore-v4.S
projects/netbsd-tests-update-12/sys/arm/ti/am335x/am335x_prcm.c
projects/netbsd-tests-update-12/sys/arm/ti/am335x/am335x_scm.h
projects/netbsd-tests-update-12/sys/arm/ti/am335x/files.am335x
projects/netbsd-tests-update-12/sys/arm/ti/cpsw/if_cpsw.c
projects/netbsd-tests-update-12/sys/arm/ti/cpsw/if_cpswreg.h
projects/netbsd-tests-update-12/sys/arm/ti/ti_scm.c
projects/netbsd-tests-update-12/sys/arm/xscale/i8134x/crb_machdep.c
projects/netbsd-tests-update-12/sys/arm/xscale/i8134x/obio.c
projects/netbsd-tests-update-12/sys/arm/xscale/i8134x/obiovar.h
projects/netbsd-tests-update-12/sys/arm/xscale/i8134x/uart_cpu_i81342.c
projects/netbsd-tests-update-12/sys/arm64/arm64/pmap.c
projects/netbsd-tests-update-12/sys/arm64/arm64/trap.c
projects/netbsd-tests-update-12/sys/boot/common/dev_net.c
projects/netbsd-tests-update-12/sys/boot/efi/boot1/Makefile
projects/netbsd-tests-update-12/sys/boot/efi/libefi/Makefile
projects/netbsd-tests-update-12/sys/boot/efi/loader/Makefile
projects/netbsd-tests-update-12/sys/boot/efi/loader/conf.c
projects/netbsd-tests-update-12/sys/boot/fdt/dts/Makefile
projects/netbsd-tests-update-12/sys/boot/forth/loader.4th
projects/netbsd-tests-update-12/sys/boot/i386/libi386/pxe.c
projects/netbsd-tests-update-12/sys/boot/i386/loader/conf.c
projects/netbsd-tests-update-12/sys/boot/pc98/loader/conf.c
projects/netbsd-tests-update-12/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c
projects/netbsd-tests-update-12/sys/contrib/vchiq/interface/vchiq_arm/vchiq_arm.c
projects/netbsd-tests-update-12/sys/contrib/vchiq/interface/vchiq_arm/vchiq_core.c
projects/netbsd-tests-update-12/sys/dev/cxgbe/cxgbei/cxgbei.c
projects/netbsd-tests-update-12/sys/dev/cxgbe/tom/t4_ddp.c
projects/netbsd-tests-update-12/sys/dev/cxgbe/tom/t4_tom.c
projects/netbsd-tests-update-12/sys/dev/cxgbe/tom/t4_tom.h
projects/netbsd-tests-update-12/sys/dev/hyperv/netvsc/hv_net_vsc.c
projects/netbsd-tests-update-12/sys/dev/hyperv/netvsc/hv_net_vsc.h
projects/netbsd-tests-update-12/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c
projects/netbsd-tests-update-12/sys/dev/hyperv/netvsc/hv_rndis.h
projects/netbsd-tests-update-12/sys/dev/hyperv/netvsc/hv_rndis_filter.c
projects/netbsd-tests-update-12/sys/dev/hyperv/netvsc/hv_rndis_filter.h
projects/netbsd-tests-update-12/sys/dev/hyperv/netvsc/if_hnvar.h
projects/netbsd-tests-update-12/sys/dev/hyperv/netvsc/ndis.h
projects/netbsd-tests-update-12/sys/dev/hyperv/utilities/hv_timesync.c
projects/netbsd-tests-update-12/sys/dev/iscsi_initiator/iscsi.h
projects/netbsd-tests-update-12/sys/dev/ixl/if_ixlv.c
projects/netbsd-tests-update-12/sys/dev/ixl/ixl_txrx.c
projects/netbsd-tests-update-12/sys/dev/kbdmux/kbdmux.c
projects/netbsd-tests-update-12/sys/dev/netmap/if_ixl_netmap.h
projects/netbsd-tests-update-12/sys/dev/syscons/syscons.c
projects/netbsd-tests-update-12/sys/dev/syscons/syscons.h
projects/netbsd-tests-update-12/sys/dev/usb/net/if_urndis.c
projects/netbsd-tests-update-12/sys/kern/capabilities.conf
projects/netbsd-tests-update-12/sys/kern/init_sysent.c
projects/netbsd-tests-update-12/sys/kern/kern_descrip.c
projects/netbsd-tests-update-12/sys/kern/subr_gtaskqueue.c
projects/netbsd-tests-update-12/sys/kern/subr_smp.c
projects/netbsd-tests-update-12/sys/kern/subr_taskqueue.c
projects/netbsd-tests-update-12/sys/kern/sys_capability.c
projects/netbsd-tests-update-12/sys/kern/uipc_usrreq.c
projects/netbsd-tests-update-12/sys/net/rndis.h
projects/netbsd-tests-update-12/sys/netipsec/ipsec_input.c
projects/netbsd-tests-update-12/sys/powerpc/mpc85xx/platform_mpc85xx.c
projects/netbsd-tests-update-12/sys/sys/filedesc.h
projects/netbsd-tests-update-12/sys/sys/mbuf.h
projects/netbsd-tests-update-12/sys/vm/swap_pager.c
projects/netbsd-tests-update-12/sys/vm/vm_page.c
projects/netbsd-tests-update-12/targets/pseudo/tests/Makefile.depend
projects/netbsd-tests-update-12/targets/pseudo/userland/Makefile.depend
projects/netbsd-tests-update-12/targets/pseudo/userland/cddl/Makefile.depend
projects/netbsd-tests-update-12/targets/pseudo/userland/libexec/Makefile.depend
projects/netbsd-tests-update-12/tools/regression/capsicum/syscalls/cap_fcntls_limit.c
projects/netbsd-tests-update-12/tools/regression/capsicum/syscalls/cap_ioctls_limit.c
projects/netbsd-tests-update-12/tools/tools/crypto/cryptotest.c
projects/netbsd-tests-update-12/usr.bin/Makefile
projects/netbsd-tests-update-12/usr.bin/newkey/generic.c
projects/netbsd-tests-update-12/usr.bin/nfsstat/Makefile.depend
projects/netbsd-tests-update-12/usr.bin/tar/tests/Makefile.depend
projects/netbsd-tests-update-12/usr.sbin/bhyve/Makefile.depend
projects/netbsd-tests-update-12/usr.sbin/bhyve/pci_e82545.c
projects/netbsd-tests-update-12/usr.sbin/pw/tests/Makefile.depend
Directory Properties:
projects/netbsd-tests-update-12/ (props changed)
projects/netbsd-tests-update-12/cddl/ (props changed)
projects/netbsd-tests-update-12/cddl/contrib/opensolaris/ (props changed)
projects/netbsd-tests-update-12/contrib/elftoolchain/ (props changed)
projects/netbsd-tests-update-12/contrib/elftoolchain/elfdump/ (props changed)
projects/netbsd-tests-update-12/contrib/gcc/ (props changed)
projects/netbsd-tests-update-12/contrib/tnftp/ (props changed)
projects/netbsd-tests-update-12/crypto/openssh/ (props changed)
projects/netbsd-tests-update-12/gnu/lib/ (props changed)
projects/netbsd-tests-update-12/sys/cddl/contrib/opensolaris/ (props changed)
Modified: projects/netbsd-tests-update-12/Makefile
==============================================================================
--- projects/netbsd-tests-update-12/Makefile Thu Sep 1 02:51:50 2016 (r305171)
+++ projects/netbsd-tests-update-12/Makefile Thu Sep 1 02:57:15 2016 (r305172)
@@ -109,7 +109,8 @@
# Note: we use this awkward construct to be compatible with FreeBSD's
# old make used in 10.0 and 9.2 and earlier.
-.if defined(MK_DIRDEPS_BUILD) && ${MK_DIRDEPS_BUILD} == "yes" && !make(showconfig)
+.if defined(MK_DIRDEPS_BUILD) && ${MK_DIRDEPS_BUILD} == "yes" && \
+ !make(showconfig) && !make(print-dir)
# targets/Makefile plays the role of top-level
.include "targets/Makefile"
.else
@@ -132,7 +133,7 @@ TGTS= all all-man buildenv buildenvvars
xdev-links native-xtools stageworld stagekernel stage-packages \
create-world-packages create-kernel-packages create-packages \
packages installconfig real-packages sign-packages package-pkg \
- test-system-compiler
+ print-dir test-system-compiler
# XXX: r156740: This can't work since bsd.subdir.mk is not included ever.
# It will only work for SUBDIR_TARGETS in make.conf.
@@ -257,6 +258,10 @@ _TARGET_ARCH= ${XDEV_ARCH}
_TARGET?= ${MACHINE}
_TARGET_ARCH?= ${MACHINE_ARCH}
+.if make(print-dir)
+.SILENT:
+.endif
+
#
# Make sure we have an up-to-date make(1). Only world and buildworld
# should do this as those are the initial targets used for upgrades.
Modified: projects/netbsd-tests-update-12/bin/df/df.c
==============================================================================
--- projects/netbsd-tests-update-12/bin/df/df.c Thu Sep 1 02:51:50 2016 (r305171)
+++ projects/netbsd-tests-update-12/bin/df/df.c Thu Sep 1 02:57:15 2016 (r305172)
@@ -166,6 +166,9 @@ main(int argc, char *argv[])
hflag = 0;
break;
case 'l':
+ /* Ignore duplicate -l */
+ if (lflag)
+ break;
if (vfslist != NULL)
xo_errx(1, "-l and -t are mutually exclusive.");
vfslist = makevfslist(makenetvfslist());
Modified: projects/netbsd-tests-update-12/cddl/contrib/opensolaris/common/ctf/ctf_types.c
==============================================================================
--- projects/netbsd-tests-update-12/cddl/contrib/opensolaris/common/ctf/ctf_types.c Thu Sep 1 02:51:50 2016 (r305171)
+++ projects/netbsd-tests-update-12/cddl/contrib/opensolaris/common/ctf/ctf_types.c Thu Sep 1 02:57:15 2016 (r305172)
@@ -644,11 +644,8 @@ ctf_type_compat(ctf_file_t *lfp, ctf_id_
}
}
-/*
- * Return the type and offset for a given member of a STRUCT or UNION.
- */
-int
-ctf_member_info(ctf_file_t *fp, ctf_id_t type, const char *name,
+static int
+_ctf_member_info(ctf_file_t *fp, ctf_id_t type, const char *name, ulong_t off,
ctf_membinfo_t *mip)
{
ctf_file_t *ofp = fp;
@@ -673,9 +670,13 @@ ctf_member_info(ctf_file_t *fp, ctf_id_t
((uintptr_t)tp + increment);
for (n = LCTF_INFO_VLEN(fp, tp->ctt_info); n != 0; n--, mp++) {
+ if (mp->ctm_name == 0 &&
+ _ctf_member_info(fp, mp->ctm_type, name,
+ mp->ctm_offset + off, mip) == 0)
+ return (0);
if (strcmp(ctf_strptr(fp, mp->ctm_name), name) == 0) {
mip->ctm_type = mp->ctm_type;
- mip->ctm_offset = mp->ctm_offset;
+ mip->ctm_offset = mp->ctm_offset + off;
return (0);
}
}
@@ -684,9 +685,14 @@ ctf_member_info(ctf_file_t *fp, ctf_id_t
((uintptr_t)tp + increment);
for (n = LCTF_INFO_VLEN(fp, tp->ctt_info); n != 0; n--, lmp++) {
+ if (lmp->ctlm_name == 0 &&
+ _ctf_member_info(fp, lmp->ctlm_name, name,
+ (ulong_t)CTF_LMEM_OFFSET(lmp) + off, mip) == 0)
+ return (0);
if (strcmp(ctf_strptr(fp, lmp->ctlm_name), name) == 0) {
mip->ctm_type = lmp->ctlm_type;
- mip->ctm_offset = (ulong_t)CTF_LMEM_OFFSET(lmp);
+ mip->ctm_offset =
+ (ulong_t)CTF_LMEM_OFFSET(lmp) + off;
return (0);
}
}
@@ -696,6 +702,17 @@ ctf_member_info(ctf_file_t *fp, ctf_id_t
}
/*
+ * Return the type and offset for a given member of a STRUCT or UNION.
+ */
+int
+ctf_member_info(ctf_file_t *fp, ctf_id_t type, const char *name,
+ ctf_membinfo_t *mip)
+{
+
+ return (_ctf_member_info(fp, type, name, 0, mip));
+}
+
+/*
* Return the array type, index, and size information for the specified ARRAY.
*/
int
Modified: projects/netbsd-tests-update-12/cddl/usr.sbin/dtrace/Makefile.depend
==============================================================================
--- projects/netbsd-tests-update-12/cddl/usr.sbin/dtrace/Makefile.depend Thu Sep 1 02:51:50 2016 (r305171)
+++ projects/netbsd-tests-update-12/cddl/usr.sbin/dtrace/Makefile.depend Thu Sep 1 02:57:15 2016 (r305172)
@@ -13,7 +13,9 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libcxxrt \
lib/libelf \
+ lib/libkvm \
lib/libproc \
+ lib/libprocstat \
lib/librtld_db \
lib/libthr \
lib/libutil \
Modified: projects/netbsd-tests-update-12/cddl/usr.sbin/lockstat/Makefile.depend
==============================================================================
--- projects/netbsd-tests-update-12/cddl/usr.sbin/lockstat/Makefile.depend Thu Sep 1 02:51:50 2016 (r305171)
+++ projects/netbsd-tests-update-12/cddl/usr.sbin/lockstat/Makefile.depend Thu Sep 1 02:57:15 2016 (r305172)
@@ -13,7 +13,9 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libcxxrt \
lib/libelf \
+ lib/libkvm \
lib/libproc \
+ lib/libprocstat \
lib/librt \
lib/librtld_db \
lib/libthr \
Modified: projects/netbsd-tests-update-12/cddl/usr.sbin/plockstat/Makefile.depend
==============================================================================
--- projects/netbsd-tests-update-12/cddl/usr.sbin/plockstat/Makefile.depend Thu Sep 1 02:51:50 2016 (r305171)
+++ projects/netbsd-tests-update-12/cddl/usr.sbin/plockstat/Makefile.depend Thu Sep 1 02:57:15 2016 (r305172)
@@ -13,7 +13,9 @@ DIRDEPS = \
lib/libcompiler_rt \
lib/libcxxrt \
lib/libelf \
+ lib/libkvm \
lib/libproc \
+ lib/libprocstat \
lib/librtld_db \
lib/libthr \
lib/libutil \
Copied: projects/netbsd-tests-update-12/cddl/usr.sbin/zfsd/Makefile.depend (from r305170, head/cddl/usr.sbin/zfsd/Makefile.depend)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/netbsd-tests-update-12/cddl/usr.sbin/zfsd/Makefile.depend Thu Sep 1 02:57:15 2016 (r305172, copy of r305170, head/cddl/usr.sbin/zfsd/Makefile.depend)
@@ -0,0 +1,35 @@
+# $FreeBSD$
+# Autogenerated - do NOT edit!
+
+DIRDEPS = \
+ cddl/lib/libavl \
+ cddl/lib/libnvpair \
+ cddl/lib/libumem \
+ cddl/lib/libuutil \
+ cddl/lib/libzfs \
+ cddl/lib/libzfs_core \
+ gnu/lib/csu \
+ gnu/lib/libgcc \
+ include \
+ include/xlocale \
+ lib/${CSU_DIR} \
+ lib/libc \
+ lib/libc++ \
+ lib/libcompiler_rt \
+ lib/libcxxrt \
+ lib/libdevdctl \
+ lib/libexpat \
+ lib/libgeom \
+ lib/libmd \
+ lib/libsbuf \
+ lib/libthr \
+ lib/libutil \
+ lib/libz \
+ lib/msun \
+
+
+.include <dirdeps.mk>
+
+.if ${DEP_RELDIR} == ${_DEP_RELDIR}
+# local dependencies - needed for -jN in clean tree
+.endif
Modified: projects/netbsd-tests-update-12/contrib/elftoolchain/common/elfdefinitions.h
==============================================================================
--- projects/netbsd-tests-update-12/contrib/elftoolchain/common/elfdefinitions.h Thu Sep 1 02:51:50 2016 (r305171)
+++ projects/netbsd-tests-update-12/contrib/elftoolchain/common/elfdefinitions.h Thu Sep 1 02:57:15 2016 (r305172)
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: elfdefinitions.h 3455 2016-05-09 13:47:29Z emaste $
+ * $Id: elfdefinitions.h 3485 2016-08-18 13:38:52Z emaste $
*/
/*
@@ -2091,7 +2091,10 @@ _ELF_DEFINE_RELOC(R_RISCV_GNU_VTINHERIT,
_ELF_DEFINE_RELOC(R_RISCV_GNU_VTENTRY, 42) \
_ELF_DEFINE_RELOC(R_RISCV_ALIGN, 43) \
_ELF_DEFINE_RELOC(R_RISCV_RVC_BRANCH, 44) \
-_ELF_DEFINE_RELOC(R_RISCV_RVC_JUMP, 45)
+_ELF_DEFINE_RELOC(R_RISCV_RVC_JUMP, 45) \
+_ELF_DEFINE_RELOC(R_RISCV_RVC_LUI, 46) \
+_ELF_DEFINE_RELOC(R_RISCV_GPREL_I, 47) \
+_ELF_DEFINE_RELOC(R_RISCV_GPREL_S, 48)
#define _ELF_DEFINE_SPARC_RELOCATIONS() \
_ELF_DEFINE_RELOC(R_SPARC_NONE, 0) \
Modified: projects/netbsd-tests-update-12/contrib/elftoolchain/elfcopy/archive.c
==============================================================================
--- projects/netbsd-tests-update-12/contrib/elftoolchain/elfcopy/archive.c Thu Sep 1 02:51:50 2016 (r305171)
+++ projects/netbsd-tests-update-12/contrib/elftoolchain/elfcopy/archive.c Thu Sep 1 02:57:15 2016 (r305172)
@@ -38,7 +38,7 @@
#include "elfcopy.h"
-ELFTC_VCSID("$Id: archive.c 3287 2015-12-31 16:58:48Z emaste $");
+ELFTC_VCSID("$Id: archive.c 3490 2016-08-31 00:12:22Z emaste $");
#define _ARMAG_LEN 8 /* length of ar magic string */
#define _ARHDR_LEN 60 /* length of ar header */
@@ -440,6 +440,7 @@ ac_write_objs(struct elfcopy *ecp, int o
struct archive *a;
struct archive_entry *entry;
struct ar_obj *obj;
+ time_t timestamp;
int nr;
if ((a = archive_write_new()) == NULL)
@@ -450,7 +451,9 @@ ac_write_objs(struct elfcopy *ecp, int o
/* Write the archive symbol table, even if it's empty. */
entry = archive_entry_new();
archive_entry_copy_pathname(entry, "/");
- archive_entry_set_mtime(entry, time(NULL), 0);
+ if (elftc_timestamp(×tamp) != 0)
+ err(EXIT_FAILURE, "elftc_timestamp");
+ archive_entry_set_mtime(entry, timestamp, 0);
archive_entry_set_size(entry, (ecp->s_cnt + 1) * sizeof(uint32_t) +
ecp->s_sn_sz);
AC(archive_write_header(a, entry));
Modified: projects/netbsd-tests-update-12/contrib/elftoolchain/elfcopy/ascii.c
==============================================================================
--- projects/netbsd-tests-update-12/contrib/elftoolchain/elfcopy/ascii.c Thu Sep 1 02:51:50 2016 (r305171)
+++ projects/netbsd-tests-update-12/contrib/elftoolchain/elfcopy/ascii.c Thu Sep 1 02:57:15 2016 (r305172)
@@ -36,7 +36,7 @@
#include "elfcopy.h"
-ELFTC_VCSID("$Id: ascii.c 3446 2016-05-03 01:31:17Z emaste $");
+ELFTC_VCSID("$Id: ascii.c 3487 2016-08-24 18:12:08Z emaste $");
static void append_data(struct section *s, const void *buf, size_t sz);
static char hex_digit(uint8_t n);
@@ -251,7 +251,7 @@ create_elf_from_srec(struct elfcopy *ecp
sec_index = 1;
sec_addr = entry = 0;
while (fgets(line, _LINE_BUFSZ, ifp) != NULL) {
- sz = 0; /* Silence GCC 5.3 uninitialized variable warning */
+ sz = 0;
if (line[0] == '\r' || line[0] == '\n')
continue;
if (line[0] == '$' && line[1] == '$') {
Modified: projects/netbsd-tests-update-12/contrib/elftoolchain/elfcopy/pe.c
==============================================================================
--- projects/netbsd-tests-update-12/contrib/elftoolchain/elfcopy/pe.c Thu Sep 1 02:51:50 2016 (r305171)
+++ projects/netbsd-tests-update-12/contrib/elftoolchain/elfcopy/pe.c Thu Sep 1 02:57:15 2016 (r305172)
@@ -34,7 +34,7 @@
#include "elfcopy.h"
-ELFTC_VCSID("$Id: pe.c 3477 2016-05-25 20:00:42Z kaiwang27 $");
+ELFTC_VCSID("$Id: pe.c 3490 2016-08-31 00:12:22Z emaste $");
/* Convert ELF object to Portable Executable (PE). */
void
@@ -54,6 +54,7 @@ create_pe(struct elfcopy *ecp, int ifd,
PE_Buffer *pb;
const char *name;
size_t indx;
+ time_t timestamp;
int elferr;
if (ecp->otf == ETF_EFI || ecp->oem == EM_X86_64)
@@ -89,7 +90,9 @@ create_pe(struct elfcopy *ecp, int ifd,
pch.ch_machine = IMAGE_FILE_MACHINE_UNKNOWN;
break;
}
- pch.ch_timestamp = (uint32_t) time(NULL);
+ if (elftc_timestamp(×tamp) != 0)
+ err(EXIT_FAILURE, "elftc_timestamp");
+ pch.ch_timestamp = (uint32_t) timestamp;
if (pe_update_coff_header(pe, &pch) < 0)
err(EXIT_FAILURE, "pe_update_coff_header() failed");
Modified: projects/netbsd-tests-update-12/contrib/elftoolchain/elfdump/elfdump.c
==============================================================================
--- projects/netbsd-tests-update-12/contrib/elftoolchain/elfdump/elfdump.c Thu Sep 1 02:51:50 2016 (r305171)
+++ projects/netbsd-tests-update-12/contrib/elftoolchain/elfdump/elfdump.c Thu Sep 1 02:57:15 2016 (r305172)
@@ -50,7 +50,7 @@
#include "_elftc.h"
-ELFTC_VCSID("$Id: elfdump.c 3474 2016-05-17 20:44:53Z emaste $");
+ELFTC_VCSID("$Id: elfdump.c 3482 2016-08-02 18:47:00Z emaste $");
#if defined(ELFTC_NEED_ELF_NOTE_DEFINITION)
#include "native-elf-format.h"
@@ -332,6 +332,8 @@ static const char *ei_abis[256] = {
"ELFOSABI_IRIX", "ELFOSABI_FREEBSD", "ELFOSABI_TRU64",
"ELFOSABI_MODESTO", "ELFOSABI_OPENBSD",
[17] = "ELFOSABI_CLOUDABI",
+ [64] = "ELFOSABI_ARM_AEABI",
+ [97] = "ELFOSABI_ARM",
[255] = "ELFOSABI_STANDALONE"
};
Modified: projects/netbsd-tests-update-12/contrib/elftoolchain/libelf/elf_flagdata.3
==============================================================================
--- projects/netbsd-tests-update-12/contrib/elftoolchain/libelf/elf_flagdata.3 Thu Sep 1 02:51:50 2016 (r305171)
+++ projects/netbsd-tests-update-12/contrib/elftoolchain/libelf/elf_flagdata.3 Thu Sep 1 02:57:15 2016 (r305172)
@@ -21,7 +21,7 @@
.\" out of the use of this software, even if advised of the possibility of
.\" such damage.
.\"
-.\" $Id: elf_flagdata.3 2884 2013-01-11 02:03:46Z jkoshy $
+.\" $Id: elf_flagdata.3 3479 2016-06-25 20:44:33Z jkoshy $
.\"
.Dd December 3, 2011
.Os
@@ -208,16 +208,13 @@ was called without a program header bein
.Xr elf 3 ,
.Xr elf32_newehdr 3 ,
.Xr elf32_newphdr 3 ,
-.Xr elf32_newshdr 3 ,
.Xr elf64_newehdr 3 ,
.Xr elf64_newphdr 3 ,
-.Xr elf64_newshdr 3 ,
.Xr elf_newdata 3 ,
.Xr elf_update 3 ,
.Xr gelf 3 ,
.Xr gelf_newehdr 3 ,
.Xr gelf_newphdr 3 ,
-.Xr gelf_newshdr 3 ,
.Xr gelf_update_dyn 3 ,
.Xr gelf_update_move 3 ,
.Xr gelf_update_rel 3 ,
Modified: projects/netbsd-tests-update-12/contrib/elftoolchain/libelftc/Makefile
==============================================================================
--- projects/netbsd-tests-update-12/contrib/elftoolchain/libelftc/Makefile Thu Sep 1 02:51:50 2016 (r305171)
+++ projects/netbsd-tests-update-12/contrib/elftoolchain/libelftc/Makefile Thu Sep 1 02:57:15 2016 (r305172)
@@ -1,4 +1,4 @@
-# $Id: Makefile 3418 2016-02-19 20:04:42Z emaste $
+# $Id: Makefile 3489 2016-08-31 00:12:15Z emaste $
TOP= ${.CURDIR}/..
@@ -10,6 +10,7 @@ SRCS= elftc_bfdtarget.c \
elftc_reloc_type_str.c \
elftc_set_timestamps.c \
elftc_string_table.c \
+ elftc_timestamp.c \
elftc_version.c \
libelftc_bfdtarget.c \
libelftc_dem_arm.c \
Modified: projects/netbsd-tests-update-12/contrib/elftoolchain/libelftc/elftc_bfd_find_target.3
==============================================================================
--- projects/netbsd-tests-update-12/contrib/elftoolchain/libelftc/elftc_bfd_find_target.3 Thu Sep 1 02:51:50 2016 (r305171)
+++ projects/netbsd-tests-update-12/contrib/elftoolchain/libelftc/elftc_bfd_find_target.3 Thu Sep 1 02:57:15 2016 (r305172)
@@ -21,7 +21,7 @@
.\" out of the use of this software, even if advised of the possibility of
.\" such damage.
.\"
-.\" $Id: elftc_bfd_find_target.3 3348 2016-01-18 14:18:50Z emaste $
+.\" $Id: elftc_bfd_find_target.3 3488 2016-08-24 18:15:57Z emaste $
.\"
.Dd November 30, 2011
.Os
Modified: projects/netbsd-tests-update-12/contrib/elftoolchain/libelftc/elftc_reloc_type_str.c
==============================================================================
--- projects/netbsd-tests-update-12/contrib/elftoolchain/libelftc/elftc_reloc_type_str.c Thu Sep 1 02:51:50 2016 (r305171)
+++ projects/netbsd-tests-update-12/contrib/elftoolchain/libelftc/elftc_reloc_type_str.c Thu Sep 1 02:57:15 2016 (r305172)
@@ -545,6 +545,9 @@ elftc_reloc_type_str(unsigned int mach,
case 43: return "R_RISCV_ALIGN";
case 44: return "R_RISCV_RVC_BRANCH";
case 45: return "R_RISCV_RVC_JUMP";
+ case 46: return "R_RISCV_RVC_LUI";
+ case 47: return "R_RISCV_GPREL_I";
+ case 48: return "R_RISCV_GPREL_S";
}
break;
case EM_SPARC:
Copied: projects/netbsd-tests-update-12/contrib/elftoolchain/libelftc/elftc_timestamp.3 (from r305170, head/contrib/elftoolchain/libelftc/elftc_timestamp.3)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/netbsd-tests-update-12/contrib/elftoolchain/libelftc/elftc_timestamp.3 Thu Sep 1 02:57:15 2016 (r305172, copy of r305170, head/contrib/elftoolchain/libelftc/elftc_timestamp.3)
@@ -0,0 +1,79 @@
+.\" Copyright (c) 2016 The FreeBSD Foundation. All rights reserved.
+.\"
+.\" This documentation was written by Ed Maste under sponsorship of
+.\" the FreeBSD Foundation.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\" notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\" notice, this list of conditions and the following disclaimer in the
+.\" documentation and/or other materials provided with the distribution.
+.\"
+.\" This software is provided by the author and contributors ``as is'' and
+.\" any express or implied warranties, including, but not limited to, the
+.\" implied warranties of merchantability and fitness for a particular purpose
+.\" are disclaimed. In no event shall the author or contributors be liable
+.\" for any direct, indirect, incidental, special, exemplary, or consequential
+.\" damages (including, but not limited to, procurement of substitute goods
+.\" or services; loss of use, data, or profits; or business interruption)
+.\" however caused and on any theory of liability, whether in contract, strict
+.\" liability, or tort (including negligence or otherwise) arising in any way
+.\" out of the use of this software, even if advised of the possibility of
+.\" such damage.
+.\"
+.\" $Id$
+.\"
+.Dd August 24, 2016
+.Os
+.Dt ELFTC_TIMESTAMP 3
+.Sh NAME
+.Nm elftc_timestamp
+.Nd return the current or environment-provided timestamp
+.Sh LIBRARY
+.Lb libelftc
+.Sh SYNOPSIS
+.In libelftc.h
+.Ft int
+.Fo elftc_timestamp
+.Fa "time_t *timestamp"
+.Fc
+.Sh DESCRIPTION
+The
+.Fn elftc_timestamp
+function returns a timestamp supplied by the
+.Ev SOURCE_DATE_EPOCH
+environment variable, or the current time provided by
+.Xr time 3
+if the environment variable is not set.
+.Pp
+The
+.Ar timestamp
+argument specifies a pointer to the location where the timestamp will be
+stored.
+.Sh RETURN VALUE
+Function
+.Fn elftc_timestamp
+returns 0 on success, and -1 in the event of an error.
+.Sh ERRORS
+The
+.Fn elftc_timestamp
+function may fail with the following errors:
+.Bl -tag -width ".Bq Er ERANGE"
+.It Bq Er EINVAL
+.Ev SOURCE_DATE_EPOCH
+contains invalid characters.
+.It Bq Er ERANGE
+.Ev SOURCE_DATE_EPOCH
+specifies a negative value or a value that cannot be stored in a
+time_t.
+.El
+The
+.Fn elftc_timestamp
+function may also fail for any of the reasons described in
+.Xr strtoll 3 .
+.Sh SEE ALSO
+.Xr strtoll 3 ,
+.Xr time 3
Copied: projects/netbsd-tests-update-12/contrib/elftoolchain/libelftc/elftc_timestamp.c (from r305170, head/contrib/elftoolchain/libelftc/elftc_timestamp.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/netbsd-tests-update-12/contrib/elftoolchain/libelftc/elftc_timestamp.c Thu Sep 1 02:57:15 2016 (r305172, copy of r305170, head/contrib/elftoolchain/libelftc/elftc_timestamp.c)
@@ -0,0 +1,55 @@
+/*-
+ * Copyright (c) 2016 The FreeBSD Foundation
+ * All rights reserved.
+ *
+ * This software was developed by Ed Maste under sponsorship
+ * of the FreeBSD Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <errno.h>
+#include <stdlib.h>
+#include <time.h>
+#include <libelftc.h>
+
+int
+elftc_timestamp(time_t *timestamp)
+{
+ long long source_date_epoch;
+ char *env, *eptr;
+
+ if ((env = getenv("SOURCE_DATE_EPOCH")) != NULL) {
+ errno = 0;
+ source_date_epoch = strtoll(env, &eptr, 10);
+ if (*eptr != '\0')
+ errno = EINVAL;
+ if (source_date_epoch < 0)
+ errno = ERANGE;
+ if (errno != 0)
+ return (-1);
+ *timestamp = source_date_epoch;
+ return (0);
+ }
+ *timestamp = time(NULL);
+ return (0);
+}
Modified: projects/netbsd-tests-update-12/contrib/elftoolchain/libelftc/libelftc.h
==============================================================================
--- projects/netbsd-tests-update-12/contrib/elftoolchain/libelftc/libelftc.h Thu Sep 1 02:51:50 2016 (r305171)
+++ projects/netbsd-tests-update-12/contrib/elftoolchain/libelftc/libelftc.h Thu Sep 1 02:57:15 2016 (r305172)
@@ -24,7 +24,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: users/kaiwang27/elftc/libelftc.h 392 2009-05-31 19:17:46Z kaiwang27 $
- * $Id: libelftc.h 3418 2016-02-19 20:04:42Z emaste $
+ * $Id: libelftc.h 3489 2016-08-31 00:12:15Z emaste $
*/
#ifndef _LIBELFTC_H_
@@ -91,6 +91,7 @@ int elftc_string_table_remove(Elftc_Str
const char *_string);
const char *elftc_string_table_to_string(Elftc_String_Table *_table,
size_t offset);
+int elftc_timestamp(time_t *_timestamp);
const char *elftc_version(void);
#ifdef __cplusplus
}
Modified: projects/netbsd-tests-update-12/contrib/elftoolchain/libelftc/libelftc_bfdtarget.c
==============================================================================
--- projects/netbsd-tests-update-12/contrib/elftoolchain/libelftc/libelftc_bfdtarget.c Thu Sep 1 02:51:50 2016 (r305171)
+++ projects/netbsd-tests-update-12/contrib/elftoolchain/libelftc/libelftc_bfdtarget.c Thu Sep 1 02:57:15 2016 (r305172)
@@ -30,7 +30,7 @@
#include "_libelftc.h"
-ELFTC_VCSID("$Id: libelftc_bfdtarget.c 3309 2016-01-10 09:10:51Z kaiwang27 $");
+ELFTC_VCSID("$Id: libelftc_bfdtarget.c 3488 2016-08-24 18:15:57Z emaste $");
struct _Elftc_Bfd_Target _libelftc_targets[] = {
Modified: projects/netbsd-tests-update-12/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c
==============================================================================
--- projects/netbsd-tests-update-12/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c Thu Sep 1 02:51:50 2016 (r305171)
+++ projects/netbsd-tests-update-12/contrib/elftoolchain/libelftc/libelftc_dem_gnu3.c Thu Sep 1 02:57:15 2016 (r305172)
@@ -36,7 +36,7 @@
#include "_libelftc.h"
-ELFTC_VCSID("$Id: libelftc_dem_gnu3.c 3447 2016-05-03 13:32:23Z emaste $");
+ELFTC_VCSID("$Id: libelftc_dem_gnu3.c 3480 2016-07-24 23:38:41Z emaste $");
/**
* @file cpp_demangle.c
Modified: projects/netbsd-tests-update-12/contrib/elftoolchain/readelf/readelf.1
==============================================================================
--- projects/netbsd-tests-update-12/contrib/elftoolchain/readelf/readelf.1 Thu Sep 1 02:51:50 2016 (r305171)
+++ projects/netbsd-tests-update-12/contrib/elftoolchain/readelf/readelf.1 Thu Sep 1 02:57:15 2016 (r305172)
@@ -22,7 +22,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $Id: readelf.1 3219 2015-05-24 23:42:34Z kaiwang27 $
+.\" $Id: readelf.1 3486 2016-08-22 14:10:05Z emaste $
.\"
.Dd September 13, 2012
.Os
@@ -43,12 +43,12 @@
.Op Fl p Ar section | Fl -string-dump Ns = Ns Ar section
.Op Fl r | Fl -relocs
.Op Fl t | Fl -section-details
-.Op Fl x Ar section | Fl -hex-dump Ns = Ns Ar section
.Op Fl v | Fl -version
.Oo
.Fl w Ns Oo Ns Ar afilmoprsFLR Ns Oc |
.Fl -debug-dump Ns Op Ns = Ns Ar long-option-name , Ns ...
.Oc
+.Op Fl x Ar section | Fl -hex-dump Ns = Ns Ar section
.Op Fl A | Fl -arch-specific
.Op Fl D | Fl -use-dynamic
.Op Fl H | Fl -help
Modified: projects/netbsd-tests-update-12/contrib/elftoolchain/readelf/readelf.c
==============================================================================
--- projects/netbsd-tests-update-12/contrib/elftoolchain/readelf/readelf.c Thu Sep 1 02:51:50 2016 (r305171)
+++ projects/netbsd-tests-update-12/contrib/elftoolchain/readelf/readelf.c Thu Sep 1 02:57:15 2016 (r305172)
@@ -47,7 +47,7 @@
#include "_elftc.h"
-ELFTC_VCSID("$Id: readelf.c 3469 2016-05-15 23:16:09Z emaste $");
+ELFTC_VCSID("$Id: readelf.c 3484 2016-08-03 13:36:49Z emaste $");
/* Backwards compatability for older FreeBSD releases. */
#ifndef STB_GNU_UNIQUE
@@ -440,6 +440,7 @@ elf_osabi(unsigned int abi)
case ELFOSABI_OPENVMS: return "OpenVMS";
case ELFOSABI_NSK: return "NSK";
case ELFOSABI_CLOUDABI: return "CloudABI";
+ case ELFOSABI_ARM_AEABI: return "ARM EABI";
case ELFOSABI_ARM: return "ARM";
case ELFOSABI_STANDALONE: return "StandAlone";
default:
@@ -2787,6 +2788,8 @@ dump_rel(struct readelf *re, struct sect
const char *symname;
uint64_t symval;
int i, len;
+ uint32_t type;
+ uint8_t type2, type3;
if (s->link >= re->shnum)
return;
@@ -2796,8 +2799,8 @@ dump_rel(struct readelf *re, struct sect
elftc_reloc_type_str(re->ehdr.e_machine, \
ELF32_R_TYPE(r.r_info)), (uintmax_t)symval, symname
#define REL_CT64 (uintmax_t)r.r_offset, (uintmax_t)r.r_info, \
- elftc_reloc_type_str(re->ehdr.e_machine, \
- ELF64_R_TYPE(r.r_info)), (uintmax_t)symval, symname
+ elftc_reloc_type_str(re->ehdr.e_machine, type), \
+ (uintmax_t)symval, symname
printf("\nRelocation section (%s):\n", s->name);
if (re->ec == ELFCLASS32)
@@ -2823,12 +2826,37 @@ dump_rel(struct readelf *re, struct sect
ELF64_R_TYPE(r.r_info));
printf("%8.8jx %8.8jx %-19.19s %8.8jx %s\n", REL_CT32);
} else {
+ type = ELF64_R_TYPE(r.r_info);
+ if (re->ehdr.e_machine == EM_MIPS) {
+ type2 = (type >> 8) & 0xFF;
+ type3 = (type >> 16) & 0xFF;
+ type = type & 0xFF;
+ } else {
+ type2 = type3 = 0;
+ }
if (re->options & RE_WW)
printf("%16.16jx %16.16jx %-24.24s"
" %16.16jx %s\n", REL_CT64);
else
printf("%12.12jx %12.12jx %-19.19s"
" %16.16jx %s\n", REL_CT64);
+ if (re->ehdr.e_machine == EM_MIPS) {
+ if (re->options & RE_WW) {
+ printf("%32s: %s\n", "Type2",
+ elftc_reloc_type_str(EM_MIPS,
+ type2));
+ printf("%32s: %s\n", "Type3",
+ elftc_reloc_type_str(EM_MIPS,
+ type3));
+ } else {
+ printf("%24s: %s\n", "Type2",
+ elftc_reloc_type_str(EM_MIPS,
+ type2));
+ printf("%24s: %s\n", "Type3",
+ elftc_reloc_type_str(EM_MIPS,
+ type3));
+ }
+ }
}
}
@@ -2843,6 +2871,8 @@ dump_rela(struct readelf *re, struct sec
const char *symname;
uint64_t symval;
int i, len;
+ uint32_t type;
+ uint8_t type2, type3;
if (s->link >= re->shnum)
return;
@@ -2853,8 +2883,8 @@ dump_rela(struct readelf *re, struct sec
elftc_reloc_type_str(re->ehdr.e_machine, \
ELF32_R_TYPE(r.r_info)), (uintmax_t)symval, symname
#define RELA_CT64 (uintmax_t)r.r_offset, (uintmax_t)r.r_info, \
- elftc_reloc_type_str(re->ehdr.e_machine, \
- ELF64_R_TYPE(r.r_info)), (uintmax_t)symval, symname
+ elftc_reloc_type_str(re->ehdr.e_machine, type), \
+ (uintmax_t)symval, symname
printf("\nRelocation section with addend (%s):\n", s->name);
if (re->ec == ELFCLASS32)
@@ -2881,6 +2911,14 @@ dump_rela(struct readelf *re, struct sec
printf("%8.8jx %8.8jx %-19.19s %8.8jx %s", RELA_CT32);
printf(" + %x\n", (uint32_t) r.r_addend);
} else {
+ type = ELF64_R_TYPE(r.r_info);
+ if (re->ehdr.e_machine == EM_MIPS) {
+ type2 = (type >> 8) & 0xFF;
+ type3 = (type >> 16) & 0xFF;
+ type = type & 0xFF;
+ } else {
+ type2 = type3 = 0;
+ }
if (re->options & RE_WW)
printf("%16.16jx %16.16jx %-24.24s"
" %16.16jx %s", RELA_CT64);
@@ -2888,6 +2926,23 @@ dump_rela(struct readelf *re, struct sec
printf("%12.12jx %12.12jx %-19.19s"
" %16.16jx %s", RELA_CT64);
printf(" + %jx\n", (uintmax_t) r.r_addend);
+ if (re->ehdr.e_machine == EM_MIPS) {
+ if (re->options & RE_WW) {
+ printf("%32s: %s\n", "Type2",
+ elftc_reloc_type_str(EM_MIPS,
+ type2));
+ printf("%32s: %s\n", "Type3",
+ elftc_reloc_type_str(EM_MIPS,
+ type3));
+ } else {
+ printf("%24s: %s\n", "Type2",
+ elftc_reloc_type_str(EM_MIPS,
+ type2));
+ printf("%24s: %s\n", "Type3",
+ elftc_reloc_type_str(EM_MIPS,
+ type3));
+ }
+ }
}
}
Copied: projects/netbsd-tests-update-12/contrib/gcc/config/i386/cpuid.h (from r305170, head/contrib/gcc/config/i386/cpuid.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/netbsd-tests-update-12/contrib/gcc/config/i386/cpuid.h Thu Sep 1 02:57:15 2016 (r305172, copy of r305170, head/contrib/gcc/config/i386/cpuid.h)
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2007 Free Software Foundation, Inc.
+ *
+ * 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 the
+ * Free Software Foundation; either version 2, or (at your option) any
+ * later version.
+ *
+ * In addition to the permissions in the GNU General Public License, the
+ * Free Software Foundation gives you unlimited permission to link the
+ * compiled version of this file with other programs, and to distribute
+ * those programs without any restriction coming from the use of this
+ * file. (The General Public License restrictions do apply in other
+ * respects; for example, they cover modification of the file, and
+ * distribution when not linked into another program.)
+ *
+ * This file is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING. If not, write to
+ * the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ * As a special exception, if you link this library with files
+ * compiled with GCC to produce an executable, this does not cause
+ * the resulting executable to be covered by the GNU General Public License.
+ * This exception does not however invalidate any other reasons why
+ * the executable file might be covered by the GNU General Public License.
+ */
+
+/* %ecx */
+#define bit_SSE3 (1 << 0)
+#define bit_SSSE3 (1 << 9)
+#define bit_CMPXCHG16B (1 << 13)
+#define bit_SSE4_1 (1 << 19)
+#define bit_SSE4_2 (1 << 20)
+#define bit_POPCNT (1 << 23)
+
+/* %edx */
+#define bit_CMPXCHG8B (1 << 8)
+#define bit_CMOV (1 << 15)
+#define bit_MMX (1 << 23)
+#define bit_FXSAVE (1 << 24)
+#define bit_SSE (1 << 25)
+#define bit_SSE2 (1 << 26)
+
+/* Extended Features */
+/* %ecx */
+#define bit_LAHF_LM (1 << 0)
+#define bit_SSE4a (1 << 6)
+#define bit_SSE5 (1 << 11)
+
+/* %edx */
+#define bit_LM (1 << 29)
+#define bit_3DNOWP (1 << 30)
+#define bit_3DNOW (1 << 31)
+
+
+#if defined(__i386__) && defined(__PIC__)
+/* %ebx may be the PIC register. */
+#define __cpuid(level, a, b, c, d) \
+ __asm__ ("xchg{l}\t{%%}ebx, %1\n\t" \
+ "cpuid\n\t" \
+ "xchg{l}\t{%%}ebx, %1\n\t" \
+ : "=a" (a), "=r" (b), "=c" (c), "=d" (d) \
+ : "0" (level))
+#else
+#define __cpuid(level, a, b, c, d) \
+ __asm__ ("cpuid\n\t" \
+ : "=a" (a), "=b" (b), "=c" (c), "=d" (d) \
+ : "0" (level))
+#endif
+
+/* Return highest supported input value for cpuid instruction. ext can
+ be either 0x0 or 0x8000000 to return highest supported value for
+ basic or extended cpuid information. Function returns 0 if cpuid
+ is not supported or whatever cpuid returns in eax register. If sig
+ pointer is non-null, then first four bytes of the signature
+ (as found in ebx register) are returned in location pointed by sig. */
+
+static __inline unsigned int
+__get_cpuid_max (unsigned int __ext, unsigned int *__sig)
+{
+ unsigned int __eax, __ebx, __ecx, __edx;
+
+#ifndef __x86_64__
+ /* See if we can use cpuid. On AMD64 we always can. */
+ __asm__ ("pushf{l|d}\n\t"
+ "pushf{l|d}\n\t"
+ "pop{l}\t%0\n\t"
+ "mov{l}\t{%0, %1|%1, %0}\n\t"
+ "xor{l}\t{%2, %0|%0, %2}\n\t"
+ "push{l}\t%0\n\t"
+ "popf{l|d}\n\t"
+ "pushf{l|d}\n\t"
+ "pop{l}\t%0\n\t"
+ "popf{l|d}\n\t"
+ : "=&r" (__eax), "=&r" (__ebx)
+ : "i" (0x00200000));
+
+ if (!((__eax ^ __ebx) & 0x00200000))
+ return 0;
+#endif
+
+ /* Host supports cpuid. Return highest supported cpuid input value. */
+ __cpuid (__ext, __eax, __ebx, __ecx, __edx);
+
+ if (__sig)
+ *__sig = __ebx;
+
+ return __eax;
+}
+
+/* Return cpuid data for requested cpuid level, as found in returned
+ eax, ebx, ecx and edx registers. The function checks if cpuid is
+ supported and returns 1 for valid cpuid information or 0 for
+ unsupported cpuid level. All pointers are required to be non-null. */
+
+static __inline int
+__get_cpuid (unsigned int __level,
+ unsigned int *__eax, unsigned int *__ebx,
+ unsigned int *__ecx, unsigned int *__edx)
+{
+ unsigned int __ext = __level & 0x80000000;
+
+ if (__get_cpuid_max (__ext, 0) < __level)
+ return 0;
+
+ __cpuid (__level, *__eax, *__ebx, *__ecx, *__edx);
+ return 1;
+}
Modified: projects/netbsd-tests-update-12/contrib/gcc/doc/cpp.texi
==============================================================================
--- projects/netbsd-tests-update-12/contrib/gcc/doc/cpp.texi Thu Sep 1 02:51:50 2016 (r305171)
+++ projects/netbsd-tests-update-12/contrib/gcc/doc/cpp.texi Thu Sep 1 02:57:15 2016 (r305172)
@@ -1912,6 +1912,13 @@ underscores.
@table @code
+ at item __COUNTER__
+This macro expands to sequential integral values starting from 0. In
+conjuction with the @code{##} operator, this provides a convenient means to
+generate unique identifiers. Care must be taken to ensure that
+ at code{__COUNTER__} is not expanded prior to inclusion of precompiled headers
+which use it. Otherwise, the precompiled headers will not be used.
+
@item __GNUC__
@itemx __GNUC_MINOR__
@itemx __GNUC_PATCHLEVEL__
Modified: projects/netbsd-tests-update-12/contrib/gcclibs/libcpp/ChangeLog.gcc43
==============================================================================
--- projects/netbsd-tests-update-12/contrib/gcclibs/libcpp/ChangeLog.gcc43 Thu Sep 1 02:51:50 2016 (r305171)
+++ projects/netbsd-tests-update-12/contrib/gcclibs/libcpp/ChangeLog.gcc43 Thu Sep 1 02:57:15 2016 (r305172)
@@ -12,6 +12,17 @@
PR preprocessor/14331
* lex.c (_cpp_get_fresh_line): Don't warn if no newline at EOF.
+2007-05-24 Ollie Wild <aaw at google.com> (r125041)
+
+ * macro.c (_cpp_builtin_macro_text): Handle BT_COUNTER.
+ * pch.c (cpp_write_pch_deps): Save __COUNTER__ state.
+ (cpp_write_pch_state): Save __COUNTER__ state.
+ (cpp_valid_state): Check valid __COUNTER__ state.
+ (cpp_read_state): Read new __COUNTER__ state.
+ * include/cpplib.h (enum builtin_type): Add BT_COUNTER enumerator.
+ * init.c (builtin_array): Add __COUNTER__/BT_COUNTER.
+ * internal.h (struct cpp_reader): Add counter member.
+
2007-05-21 Ian Lance Taylor <iant at google.com> (r124929)
* internal.h (struct cpp_reader): Add new fields:
Modified: projects/netbsd-tests-update-12/contrib/gcclibs/libcpp/internal.h
==============================================================================
--- projects/netbsd-tests-update-12/contrib/gcclibs/libcpp/internal.h Thu Sep 1 02:51:50 2016 (r305171)
+++ projects/netbsd-tests-update-12/contrib/gcclibs/libcpp/internal.h Thu Sep 1 02:57:15 2016 (r305172)
@@ -458,7 +458,8 @@ struct cpp_reader
of precompiled headers. */
struct cpp_savedstate *savedstate;
- unsigned int nextcounter;
+ /* Next value of __COUNTER__ macro. */
+ unsigned int counter;
};
/* Character classes. Based on the more primitive macros in safe-ctype.h.
Modified: projects/netbsd-tests-update-12/contrib/gcclibs/libcpp/macro.c
==============================================================================
--- projects/netbsd-tests-update-12/contrib/gcclibs/libcpp/macro.c Thu Sep 1 02:51:50 2016 (r305171)
+++ projects/netbsd-tests-update-12/contrib/gcclibs/libcpp/macro.c Thu Sep 1 02:57:15 2016 (r305172)
@@ -268,7 +268,7 @@ _cpp_builtin_macro_text (cpp_reader *pfi
if (CPP_OPTION (pfile, directives_only) && pfile->state.in_directive)
cpp_error (pfile, CPP_DL_ERROR,
"__COUNTER__ expanded inside directive with -fdirectives-only");
- number = pfile->nextcounter++;
+ number = pfile->counter++;
break;
}
Modified: projects/netbsd-tests-update-12/contrib/gcclibs/libcpp/pch.c
==============================================================================
--- projects/netbsd-tests-update-12/contrib/gcclibs/libcpp/pch.c Thu Sep 1 02:51:50 2016 (r305171)
+++ projects/netbsd-tests-update-12/contrib/gcclibs/libcpp/pch.c Thu Sep 1 02:57:15 2016 (r305172)
@@ -337,6 +337,14 @@ cpp_write_pch_deps (cpp_reader *r, FILE
/* Free the saved state. */
free (ss);
r->savedstate = NULL;
+
+ /* Save the next value of __COUNTER__. */
+ if (fwrite (&r->counter, sizeof (r->counter), 1, f) != 1)
+ {
+ cpp_errno (r, CPP_DL_ERROR, "while writing precompiled header");
+ return -1;
+ }
+
return 0;
}
@@ -361,6 +369,15 @@ cpp_write_pch_state (cpp_reader *r, FILE
return -1;
}
+ /* Save the next __COUNTER__ value. When we include a precompiled header,
+ we need to start at the offset we would have if the header had been
+ included normally. */
+ if (fwrite (&r->counter, sizeof (r->counter), 1, f) != 1)
+ {
+ cpp_errno (r, CPP_DL_ERROR, "while writing precompiled header");
+ return -1;
+ }
+
return 0;
}
@@ -423,6 +440,7 @@ cpp_valid_state (cpp_reader *r, const ch
struct ht_node_list nl = { 0, 0, 0 };
unsigned char *first, *last;
unsigned int i;
+ unsigned int counter;
/* Read in the list of identifiers that must be defined
Check that they are defined in the same way. */
@@ -524,7 +542,23 @@ cpp_valid_state (cpp_reader *r, const ch
}
free(nl.defs);
+ nl.defs = NULL;
free (undeftab);
+ undeftab = NULL;
+
+ /* Read in the next value of __COUNTER__.
+ Check that (a) __COUNTER__ was not used in the pch or (b) __COUNTER__
+ has not been used in this translation unit. */
+ if (read (fd, &counter, sizeof (counter)) != sizeof (counter))
+ goto error;
+ if (counter && r->counter)
+ {
+ if (CPP_OPTION (r, warn_invalid_pch))
+ cpp_error (r, CPP_DL_WARNING_SYSHDR,
+ "%s: not used because `__COUNTER__' is invalid",
+ name);
+ goto fail;
+ }
/* We win! */
return 0;
@@ -631,6 +665,7 @@ cpp_read_state (cpp_reader *r, const cha
{
size_t i;
struct lexer_state old_state;
+ unsigned int counter;
/* Restore spec_nodes, which will be full of references to the old
hashtable entries and so will now be invalid. */
@@ -690,6 +725,12 @@ cpp_read_state (cpp_reader *r, const cha
if (! _cpp_read_file_entries (r, f))
goto error;
+ if (fread (&counter, sizeof (counter), 1, f) != 1)
+ goto error;
+
+ if (!r->counter)
+ r->counter = counter;
+
return 0;
error:
Modified: projects/netbsd-tests-update-12/contrib/telnet/libtelnet/pk.c
==============================================================================
--- projects/netbsd-tests-update-12/contrib/telnet/libtelnet/pk.c Thu Sep 1 02:51:50 2016 (r305171)
+++ projects/netbsd-tests-update-12/contrib/telnet/libtelnet/pk.c Thu Sep 1 02:57:15 2016 (r305172)
@@ -164,7 +164,7 @@ genkeys(char *public, char *secret)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list