Date: Mon, 29 Dec 2014 14:52:33 +0000 (UTC) From: Ed Maste <emaste@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r276362 - in projects/elftoolchain-update-r3130: bin/ln cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/lib/libdtrace/common cddl/usr.bin/ctfconvert contrib/binutils/bfd con... Message-ID: <201412291452.sBTEqXLH078513@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: emaste Date: Mon Dec 29 14:52:32 2014 New Revision: 276362 URL: https://svnweb.freebsd.org/changeset/base/276362 Log: MFH up to r276361 Added: projects/elftoolchain-update-r3130/sys/arm/arm/cpu_asm-v6.S - copied unchanged from r276361, head/sys/arm/arm/cpu_asm-v6.S projects/elftoolchain-update-r3130/sys/arm/arm/cpuinfo.c - copied unchanged from r276361, head/sys/arm/arm/cpuinfo.c projects/elftoolchain-update-r3130/sys/arm/include/cpu-v6.h - copied unchanged from r276361, head/sys/arm/include/cpu-v6.h projects/elftoolchain-update-r3130/sys/arm/include/cpuinfo.h - copied unchanged from r276361, head/sys/arm/include/cpuinfo.h Deleted: projects/elftoolchain-update-r3130/sys/contrib/dev/iwn/iwlwifi-6000g2a-17.168.5.2.fw.uu projects/elftoolchain-update-r3130/sys/contrib/dev/iwn/iwlwifi-6000g2b-17.168.5.2.fw.uu Modified: projects/elftoolchain-update-r3130/bin/ln/symlink.7 projects/elftoolchain-update-r3130/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 projects/elftoolchain-update-r3130/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c projects/elftoolchain-update-r3130/cddl/usr.bin/ctfconvert/ctfconvert.1 projects/elftoolchain-update-r3130/contrib/binutils/bfd/elf32-ppc.c projects/elftoolchain-update-r3130/contrib/binutils/gas/config/tc-ppc.c projects/elftoolchain-update-r3130/contrib/bsnmp/lib/snmpcrypto.c projects/elftoolchain-update-r3130/lib/libc/iconv/iconvlist.3 projects/elftoolchain-update-r3130/lib/libc/locale/digittoint.3 projects/elftoolchain-update-r3130/lib/libc/locale/xlocale.3 projects/elftoolchain-update-r3130/lib/libc/regex/re_format.7 projects/elftoolchain-update-r3130/lib/libc/rpc/rpc.3 projects/elftoolchain-update-r3130/lib/libc/rpc/rpc_svc_reg.3 projects/elftoolchain-update-r3130/lib/libc/tests/hash/Makefile projects/elftoolchain-update-r3130/lib/libdpv/dpv.3 projects/elftoolchain-update-r3130/lib/libpam/modules/pam_guest/pam_guest.8 projects/elftoolchain-update-r3130/lib/librtld_db/librtld_db.3 projects/elftoolchain-update-r3130/lib/libusb/libusb20.3 projects/elftoolchain-update-r3130/lib/libutil/quotafile.3 projects/elftoolchain-update-r3130/lib/msun/man/cexp.3 projects/elftoolchain-update-r3130/lib/msun/man/complex.3 projects/elftoolchain-update-r3130/lib/msun/man/lgamma.3 projects/elftoolchain-update-r3130/lib/msun/man/sin.3 projects/elftoolchain-update-r3130/lib/ncurses/Makefile projects/elftoolchain-update-r3130/libexec/rtld-elf/powerpc/reloc.c projects/elftoolchain-update-r3130/sbin/bsdlabel/bsdlabel.8 projects/elftoolchain-update-r3130/sbin/camcontrol/camcontrol.8 projects/elftoolchain-update-r3130/sbin/dhclient/dhclient.conf.5 projects/elftoolchain-update-r3130/sbin/dhclient/dhclient.leases.5 projects/elftoolchain-update-r3130/sbin/geom/class/label/glabel.8 projects/elftoolchain-update-r3130/sbin/ifconfig/ifconfig.8 projects/elftoolchain-update-r3130/sbin/ipfw/ipfw.8 projects/elftoolchain-update-r3130/sbin/iscontrol/iscontrol.8 projects/elftoolchain-update-r3130/sbin/mount/mount.8 projects/elftoolchain-update-r3130/sbin/mount_fusefs/mount_fusefs.8 projects/elftoolchain-update-r3130/sbin/mount_nfs/mount_nfs.8 projects/elftoolchain-update-r3130/sbin/newfs/newfs.8 projects/elftoolchain-update-r3130/sbin/routed/routed.8 projects/elftoolchain-update-r3130/share/man/man4/ada.4 projects/elftoolchain-update-r3130/share/man/man4/man4.i386/glxsb.4 projects/elftoolchain-update-r3130/share/man/man4/man4.powerpc/snd_ai2s.4 projects/elftoolchain-update-r3130/share/man/man4/man4.powerpc/snd_davbus.4 projects/elftoolchain-update-r3130/share/man/man4/tcp.4 projects/elftoolchain-update-r3130/share/man/man5/src.conf.5 projects/elftoolchain-update-r3130/share/man/man7/build.7 projects/elftoolchain-update-r3130/share/man/man7/crypto.7 projects/elftoolchain-update-r3130/share/man/man7/hier.7 projects/elftoolchain-update-r3130/share/mk/bsd.progs.mk projects/elftoolchain-update-r3130/share/mk/src.libnames.mk projects/elftoolchain-update-r3130/sys/amd64/ia32/ia32_sigtramp.S projects/elftoolchain-update-r3130/sys/amd64/ia32/ia32_syscall.c projects/elftoolchain-update-r3130/sys/amd64/vmm/io/vatpic.c projects/elftoolchain-update-r3130/sys/arm/arm/machdep.c projects/elftoolchain-update-r3130/sys/arm/broadcom/bcm2835/bcm2835_bsc.c projects/elftoolchain-update-r3130/sys/arm/broadcom/bcm2835/bcm2835_bscvar.h projects/elftoolchain-update-r3130/sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c projects/elftoolchain-update-r3130/sys/arm/broadcom/bcm2835/bcm2835_mbox.c projects/elftoolchain-update-r3130/sys/arm/include/cpufunc.h projects/elftoolchain-update-r3130/sys/arm/ti/ti_gpio.c projects/elftoolchain-update-r3130/sys/arm/ti/ti_i2c.c projects/elftoolchain-update-r3130/sys/boot/common/loader.8 projects/elftoolchain-update-r3130/sys/boot/forth/brand.4th.8 projects/elftoolchain-update-r3130/sys/boot/forth/delay.4th.8 projects/elftoolchain-update-r3130/sys/boot/forth/menu.4th.8 projects/elftoolchain-update-r3130/sys/boot/forth/menusets.4th.8 projects/elftoolchain-update-r3130/sys/boot/forth/version.4th.8 projects/elftoolchain-update-r3130/sys/boot/powerpc/boot1.chrp/Makefile projects/elftoolchain-update-r3130/sys/conf/files projects/elftoolchain-update-r3130/sys/conf/files.arm projects/elftoolchain-update-r3130/sys/dev/ahci/ahci.c projects/elftoolchain-update-r3130/sys/dev/ahci/ahci_pci.c projects/elftoolchain-update-r3130/sys/dev/ahci/ahciem.c projects/elftoolchain-update-r3130/sys/dev/bce/if_bcefw.h projects/elftoolchain-update-r3130/sys/dev/beri/virtio/network/if_vtbe.c projects/elftoolchain-update-r3130/sys/dev/beri/virtio/virtio.c projects/elftoolchain-update-r3130/sys/dev/beri/virtio/virtio_block.c projects/elftoolchain-update-r3130/sys/dev/bge/if_bge.c projects/elftoolchain-update-r3130/sys/dev/pci/pci.c projects/elftoolchain-update-r3130/sys/dev/uart/uart_bus_pci.c projects/elftoolchain-update-r3130/sys/dev/usb/controller/xhci.h projects/elftoolchain-update-r3130/sys/dev/usb/controller/xhci_pci.c projects/elftoolchain-update-r3130/sys/dev/virtio/mmio/virtio_mmio.c projects/elftoolchain-update-r3130/sys/dev/vt/vt.h projects/elftoolchain-update-r3130/sys/dev/vt/vt_core.c projects/elftoolchain-update-r3130/sys/fs/nfsclient/nfs_clport.c projects/elftoolchain-update-r3130/sys/kern/kern_sysctl.c projects/elftoolchain-update-r3130/sys/modules/dtrace/dtraceall/dtraceall.c projects/elftoolchain-update-r3130/sys/teken/libteken/teken.3 projects/elftoolchain-update-r3130/tools/tools/ether_reflect/ether_reflect.1 projects/elftoolchain-update-r3130/tools/tools/vimage/vimage.8 projects/elftoolchain-update-r3130/usr.bin/soeliminate/soeliminate.1 projects/elftoolchain-update-r3130/usr.sbin/bsdinstall/bsdinstall.8 projects/elftoolchain-update-r3130/usr.sbin/kbdcontrol/kbdcontrol.1 Directory Properties: projects/elftoolchain-update-r3130/ (props changed) projects/elftoolchain-update-r3130/cddl/ (props changed) projects/elftoolchain-update-r3130/cddl/contrib/opensolaris/ (props changed) projects/elftoolchain-update-r3130/contrib/binutils/ (props changed) projects/elftoolchain-update-r3130/lib/libc/ (props changed) projects/elftoolchain-update-r3130/lib/libutil/ (props changed) projects/elftoolchain-update-r3130/sbin/ (props changed) projects/elftoolchain-update-r3130/sbin/ipfw/ (props changed) projects/elftoolchain-update-r3130/share/ (props changed) projects/elftoolchain-update-r3130/share/man/man4/ (props changed) projects/elftoolchain-update-r3130/sys/ (props changed) projects/elftoolchain-update-r3130/sys/amd64/vmm/ (props changed) projects/elftoolchain-update-r3130/sys/boot/ (props changed) projects/elftoolchain-update-r3130/sys/boot/powerpc/boot1.chrp/ (props changed) projects/elftoolchain-update-r3130/sys/conf/ (props changed) Modified: projects/elftoolchain-update-r3130/bin/ln/symlink.7 ============================================================================== --- projects/elftoolchain-update-r3130/bin/ln/symlink.7 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/bin/ln/symlink.7 Mon Dec 29 14:52:32 2014 (r276362) @@ -29,7 +29,7 @@ .\" @(#)symlink.7 8.3 (Berkeley) 3/31/94 .\" $FreeBSD$ .\" -.Dd April 25, 2010 +.Dd December 29, 2014 .Dt SYMLINK 7 .Os .Sh NAME @@ -219,7 +219,7 @@ would change the ownership of .Dq Li slink itself. .Pp -There are four exceptions to this rule. +There are five exceptions to this rule. The .Xr mv 1 and @@ -262,13 +262,12 @@ a file tree.) .Pp The .Xr file 1 -command is also an exception to this rule. -The -.Xr file 1 -command does not follow symbolic links named as argument by default. -The -.Xr file 1 -command does follow symbolic links named as argument if +and +.Xr stat 1 +commands are also exceptions to this rule. +These +commands do not follow symbolic links named as argument by default, +but do follow symbolic links named as argument if the .Fl L option is specified. .Pp Modified: projects/elftoolchain-update-r3130/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 ============================================================================== --- projects/elftoolchain-update-r3130/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/cddl/contrib/opensolaris/cmd/zpool/zpool-features.7 Mon Dec 29 14:52:32 2014 (r276362) @@ -443,7 +443,7 @@ This feature becomes .Sy active once a .Sy recordsize -property has been set larger than 128KB, and will return to being +property has been set larger than 128KB, and will return to being .Sy enabled once all filesystems that have ever had their recordsize larger than 128KB are destroyed. Modified: projects/elftoolchain-update-r3130/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c ============================================================================== --- projects/elftoolchain-update-r3130/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c Mon Dec 29 14:52:32 2014 (r276362) @@ -685,8 +685,8 @@ dump_elf64(dtrace_hdl_t *dtp, const dof_ elf_file.ehdr.e_machine = EM_ARM; #elif defined(__mips__) elf_file.ehdr.e_machine = EM_MIPS; -#elif defined(__powerpc__) - elf_file.ehdr.e_machine = EM_PPC; +#elif defined(__powerpc64__) + elf_file.ehdr.e_machine = EM_PPC64; #elif defined(__sparc) elf_file.ehdr.e_machine = EM_SPARCV9; #elif defined(__i386) || defined(__amd64) @@ -784,21 +784,32 @@ dump_elf64(dtrace_hdl_t *dtp, const dof_ static int dt_symtab_lookup(Elf_Data *data_sym, int nsym, uintptr_t addr, uint_t shn, - GElf_Sym *sym) + GElf_Sym *sym, int uses_funcdesc, Elf *elf) { int i, ret = -1; + Elf64_Addr symval; + Elf_Scn *opd_scn; + Elf_Data *opd_desc; GElf_Sym s; for (i = 0; i < nsym && gelf_getsym(data_sym, i, sym) != NULL; i++) { - if (GELF_ST_TYPE(sym->st_info) == STT_FUNC && - shn == sym->st_shndx && - sym->st_value <= addr && - addr < sym->st_value + sym->st_size) { - if (GELF_ST_BIND(sym->st_info) == STB_GLOBAL) - return (0); + if (GELF_ST_TYPE(sym->st_info) == STT_FUNC) { + symval = sym->st_value; + if (uses_funcdesc) { + opd_scn = elf_getscn(elf, sym->st_shndx); + opd_desc = elf_rawdata(opd_scn, NULL); + symval = + *(uint64_t*)((char *)opd_desc->d_buf + symval); + } + if ((uses_funcdesc || shn == sym->st_shndx) && + symval <= addr && + addr < symval + sym->st_size) { + if (GELF_ST_BIND(sym->st_info) == STB_GLOBAL) + return (0); - ret = 0; - s = *sym; + ret = 0; + s = *sym; + } } } @@ -1375,7 +1386,8 @@ process_obj(dtrace_hdl_t *dtp, const cha continue; if (dt_symtab_lookup(data_sym, isym, rela.r_offset, - shdr_rel.sh_info, &fsym) != 0) { + shdr_rel.sh_info, &fsym, + (emachine1 == EM_PPC64), elf) != 0) { dt_strtab_destroy(strtab); goto err; } @@ -1536,7 +1548,8 @@ process_obj(dtrace_hdl_t *dtp, const cha p = strhyphenate(p + 3); /* strlen("___") */ if (dt_symtab_lookup(data_sym, isym, rela.r_offset, - shdr_rel.sh_info, &fsym) != 0) + shdr_rel.sh_info, &fsym, + (emachine1 == EM_PPC64), elf) != 0) goto err; if (fsym.st_name > data_str->d_size) Modified: projects/elftoolchain-update-r3130/cddl/usr.bin/ctfconvert/ctfconvert.1 ============================================================================== --- projects/elftoolchain-update-r3130/cddl/usr.bin/ctfconvert/ctfconvert.1 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/cddl/usr.bin/ctfconvert/ctfconvert.1 Mon Dec 29 14:52:32 2014 (r276362) @@ -74,8 +74,8 @@ Write the output to file in .Sh EXIT STATUS .Ex -std .Sh SEE ALSO -.Xr ctfmerge 1 , -.Xr ctfdump 1 +.Xr ctfdump 1 , +.Xr ctfmerge 1 .Sh HISTORY The .Nm Modified: projects/elftoolchain-update-r3130/contrib/binutils/bfd/elf32-ppc.c ============================================================================== --- projects/elftoolchain-update-r3130/contrib/binutils/bfd/elf32-ppc.c Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/contrib/binutils/bfd/elf32-ppc.c Mon Dec 29 14:52:32 2014 (r276362) @@ -6185,7 +6185,7 @@ ppc_elf_relocate_section (bfd *output_bf howto = NULL; if (r_type < R_PPC_max) howto = ppc_elf_howto_table[r_type]; - switch (r_type) + switch ((int) r_type) { default: (*_bfd_error_handler) Modified: projects/elftoolchain-update-r3130/contrib/binutils/gas/config/tc-ppc.c ============================================================================== --- projects/elftoolchain-update-r3130/contrib/binutils/gas/config/tc-ppc.c Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/contrib/binutils/gas/config/tc-ppc.c Mon Dec 29 14:52:32 2014 (r276362) @@ -1548,7 +1548,7 @@ ppc_insert_operand (unsigned long insn, errmsg = NULL; insn = (*operand->insert) (insn, (long) val, ppc_cpu, &errmsg); if (errmsg != (const char *) NULL) - as_bad_where (file, line, errmsg); + as_bad_where (file, line, "%s", errmsg); } else insn |= ((long) val & operand->bitm) << operand->shift; @@ -2279,7 +2279,7 @@ md_assemble (char *str) { insn = (*operand->insert) (insn, 0L, ppc_cpu, &errmsg); if (errmsg != (const char *) NULL) - as_bad (errmsg); + as_bad ("%s", errmsg); continue; } @@ -2292,7 +2292,7 @@ md_assemble (char *str) { insn = (*operand->insert) (insn, 0L, ppc_cpu, &errmsg); if (errmsg != (const char *) NULL) - as_bad (errmsg); + as_bad ("%s", errmsg); } if ((operand->flags & PPC_OPERAND_NEXT) != 0) next_opindex = *opindex_ptr + 1; Modified: projects/elftoolchain-update-r3130/contrib/bsnmp/lib/snmpcrypto.c ============================================================================== --- projects/elftoolchain-update-r3130/contrib/bsnmp/lib/snmpcrypto.c Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/contrib/bsnmp/lib/snmpcrypto.c Mon Dec 29 14:52:32 2014 (r276362) @@ -366,7 +366,7 @@ snmp_pdu_decrypt(const struct snmp_pdu * return (SNMP_CODE_OK); } -int +enum snmp_code snmp_passwd_to_keys(struct snmp_user *user, char *passwd __unused) { if (user->auth_proto == SNMP_AUTH_NOAUTH && @@ -378,7 +378,7 @@ snmp_passwd_to_keys(struct snmp_user *us return (SNMP_CODE_FAILED); } -int +enum snmp_code snmp_get_local_keys(struct snmp_user *user, uint8_t *eid __unused, uint32_t elen __unused) { Modified: projects/elftoolchain-update-r3130/lib/libc/iconv/iconvlist.3 ============================================================================== --- projects/elftoolchain-update-r3130/lib/libc/iconv/iconvlist.3 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/lib/libc/iconv/iconvlist.3 Mon Dec 29 14:52:32 2014 (r276362) @@ -78,9 +78,9 @@ If an error occurs, will be NULL when calling .Fn do_one . .Sh SEE ALSO -.Xr iconv 3 , +.Xr __iconv_free_list 3 , .Xr __iconv_get_list 3 , -.Xr __iconv_free_list 3 +.Xr iconv 3 .Sh STANDARDS The .Nm Modified: projects/elftoolchain-update-r3130/lib/libc/locale/digittoint.3 ============================================================================== --- projects/elftoolchain-update-r3130/lib/libc/locale/digittoint.3 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/lib/libc/locale/digittoint.3 Mon Dec 29 14:52:32 2014 (r276362) @@ -64,5 +64,5 @@ the function will return 0. .Sh SEE ALSO .Xr ctype 3 , .Xr isdigit 3 , -.Xr isxdigit 3, +.Xr isxdigit 3 , .Xr xlocale 3 Modified: projects/elftoolchain-update-r3130/lib/libc/locale/xlocale.3 ============================================================================== --- projects/elftoolchain-update-r3130/lib/libc/locale/xlocale.3 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/lib/libc/locale/xlocale.3 Mon Dec 29 14:52:32 2014 (r276362) @@ -71,7 +71,7 @@ function. .Xr localeconv 3 , .Xr newlocale 3 , .Xr querylocale 3 , -.Xr uselocale 3 , +.Xr uselocale 3 .Sh CONVENIENCE FUNCTIONS The xlocale API includes a number of .Fa _l Modified: projects/elftoolchain-update-r3130/lib/libc/regex/re_format.7 ============================================================================== --- projects/elftoolchain-update-r3130/lib/libc/regex/re_format.7 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/lib/libc/regex/re_format.7 Mon Dec 29 14:52:32 2014 (r276362) @@ -314,10 +314,10 @@ compatible with but not specified by .St -p1003.2 , and should be used with caution in software intended to be portable to other systems. -The additional word delimiters +The additional word delimiters .Ql \e< and -.Ql \e> +.Ql \e> are provided to ease compatibility with traditional .Xr svr4 4 systems but are not portable and should be avoided. Modified: projects/elftoolchain-update-r3130/lib/libc/rpc/rpc.3 ============================================================================== --- projects/elftoolchain-update-r3130/lib/libc/rpc/rpc.3 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/lib/libc/rpc/rpc.3 Mon Dec 29 14:52:32 2014 (r276362) @@ -504,7 +504,6 @@ pages on which they are described: .Sh SEE ALSO .Xr getnetconfig 3 , .Xr getnetpath 3 , -.Xr rpcbind 3 , .Xr rpc_clnt_auth 3 , .Xr rpc_clnt_calls 3 , .Xr rpc_clnt_create 3 , @@ -513,5 +512,6 @@ pages on which they are described: .Xr rpc_svc_err 3 , .Xr rpc_svc_reg 3 , .Xr rpc_xdr 3 , +.Xr rpcbind 3 , .Xr xdr 3 , .Xr netconfig 5 Modified: projects/elftoolchain-update-r3130/lib/libc/rpc/rpc_svc_reg.3 ============================================================================== --- projects/elftoolchain-update-r3130/lib/libc/rpc/rpc_svc_reg.3 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/lib/libc/rpc/rpc_svc_reg.3 Mon Dec 29 14:52:32 2014 (r276362) @@ -176,8 +176,8 @@ Service implementors usually do not need .Sh SEE ALSO .Xr select 2 , .Xr rpc 3 , -.Xr rpcbind 3 , .Xr rpc_svc_calls 3 , .Xr rpc_svc_create 3 , .Xr rpc_svc_err 3 , +.Xr rpcbind 3 , .Xr rpcbind 8 Modified: projects/elftoolchain-update-r3130/lib/libc/tests/hash/Makefile ============================================================================== --- projects/elftoolchain-update-r3130/lib/libc/tests/hash/Makefile Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/lib/libc/tests/hash/Makefile Mon Dec 29 14:52:32 2014 (r276362) @@ -1,8 +1,14 @@ # $FreeBSD$ +.include <src.opts.mk> + TESTSDIR= ${TESTSBASE}/lib/libc/hash -NETBSD_ATF_TESTS_C= sha2_test +NETBSD_ATF_TESTS_C= + +.if ${MK_OPENSSL} != "no" +NETBSD_ATF_TESTS_C+= sha2_test +.endif NETBSD_ATF_TESTS_SH= hash_test Modified: projects/elftoolchain-update-r3130/lib/libdpv/dpv.3 ============================================================================== --- projects/elftoolchain-update-r3130/lib/libdpv/dpv.3 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/lib/libdpv/dpv.3 Mon Dec 29 14:52:32 2014 (r276362) @@ -435,8 +435,8 @@ or desired values. .El .Sh SEE ALSO .Xr dialog 1 , -.Xr dialog 3 , -.Xr Xdialog 1 +.Xr Xdialog 1 , +.Xr dialog 3 .Sh HISTORY The .Nm Modified: projects/elftoolchain-update-r3130/lib/libpam/modules/pam_guest/pam_guest.8 ============================================================================== --- projects/elftoolchain-update-r3130/lib/libpam/modules/pam_guest/pam_guest.8 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/lib/libpam/modules/pam_guest/pam_guest.8 Mon Dec 29 14:52:32 2014 (r276362) @@ -82,8 +82,8 @@ password. Requires the guest user to type in the guest account name as password. .El .Sh SEE ALSO -.Xr pam_getenv 3 , .Xr pam_get_item 3 , +.Xr pam_getenv 3 , .Xr pam.conf 5 , .Xr pam 8 .Sh AUTHORS Modified: projects/elftoolchain-update-r3130/lib/librtld_db/librtld_db.3 ============================================================================== --- projects/elftoolchain-update-r3130/lib/librtld_db/librtld_db.3 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/lib/librtld_db/librtld_db.3 Mon Dec 29 14:52:32 2014 (r276362) @@ -167,8 +167,8 @@ You can get the error string using .Xr ld 1 , .Xr ld-elf.so.1 1 , .Xr ld.so 1 , -.Xr libproc 3 , -.Xr rtld 1 +.Xr rtld 1 , +.Xr libproc 3 .Sh HISTORY The .Nm librtld_db Modified: projects/elftoolchain-update-r3130/lib/libusb/libusb20.3 ============================================================================== --- projects/elftoolchain-update-r3130/lib/libusb/libusb20.3 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/lib/libusb/libusb20.3 Mon Dec 29 14:52:32 2014 (r276362) @@ -1053,8 +1053,8 @@ This function does not return NULL. .It Pa /dev/usb .El .Sh SEE ALSO -.Xr usb 4 , .Xr libusb 3 , +.Xr usb 4 , .Xr usbconfig 8 , .Xr usbdump 8 . Modified: projects/elftoolchain-update-r3130/lib/libutil/quotafile.3 ============================================================================== --- projects/elftoolchain-update-r3130/lib/libutil/quotafile.3 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/lib/libutil/quotafile.3 Mon Dec 29 14:52:32 2014 (r276362) @@ -273,8 +273,8 @@ and set to indicate the error. .Sh SEE ALSO .Xr quotactl 2 , -.Xr quota.user 5 , -.Xr quota.group 5 +.Xr quota.group 5 , +.Xr quota.user 5 .Sh HISTORY The .Nm quotafile Modified: projects/elftoolchain-update-r3130/lib/msun/man/cexp.3 ============================================================================== --- projects/elftoolchain-update-r3130/lib/msun/man/cexp.3 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/lib/msun/man/cexp.3 Mon Dec 29 14:52:32 2014 (r276362) @@ -103,7 +103,7 @@ is not finite, the sign of the result is .Sh SEE ALSO .Xr complex 3 , .Xr exp 3 , -.Xr math 3 , +.Xr math 3 .Sh STANDARDS The .Fn cexp Modified: projects/elftoolchain-update-r3130/lib/msun/man/complex.3 ============================================================================== --- projects/elftoolchain-update-r3130/lib/msun/man/complex.3 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/lib/msun/man/complex.3 Mon Dec 29 14:52:32 2014 (r276362) @@ -103,9 +103,9 @@ ctan tangent ctanh hyperbolic tangent .El .Sh SEE ALSO -.Xr math 3 , .Xr fenv 3 , .Xr ieee 3 , +.Xr math 3 , .Xr tgmath 3 .Rs .%T "ISO/IEC 9899:TC3" Modified: projects/elftoolchain-update-r3130/lib/msun/man/lgamma.3 ============================================================================== --- projects/elftoolchain-update-r3130/lib/msun/man/lgamma.3 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/lib/msun/man/lgamma.3 Mon Dec 29 14:52:32 2014 (r276362) @@ -99,7 +99,7 @@ returns the sign of \(*G(x). and .Fn lgammal_r x signgamp provide the same functionality as -.Fn lgamma x , +.Fn lgamma x , .Fn lgammaf x , and .Fn lgammal x , Modified: projects/elftoolchain-update-r3130/lib/msun/man/sin.3 ============================================================================== --- projects/elftoolchain-update-r3130/lib/msun/man/sin.3 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/lib/msun/man/sin.3 Mon Dec 29 14:52:32 2014 (r276362) @@ -70,9 +70,9 @@ functions return the sine value. .Xr asin 3 , .Xr atan 3 , .Xr atan2 3 , -.Xr csin 3 , .Xr cos 3 , .Xr cosh 3 , +.Xr csin 3 , .Xr math 3 , .Xr sinh 3 , .Xr tan 3 , Modified: projects/elftoolchain-update-r3130/lib/ncurses/Makefile ============================================================================== --- projects/elftoolchain-update-r3130/lib/ncurses/Makefile Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/lib/ncurses/Makefile Mon Dec 29 14:52:32 2014 (r276362) @@ -3,4 +3,11 @@ SUBDIR= ncurses form menu panel \ ncursesw formw menuw panelw +SUBDIR_PARALLEL= + +.for subdir in ${SUBDIR:Nncurses*:N*w} +SUBDIR_DEPEND_${subdir}= ncurses +SUBDIR_DEPEND_${subdir}w= ncursesw +.endfor + .include <bsd.subdir.mk> Modified: projects/elftoolchain-update-r3130/libexec/rtld-elf/powerpc/reloc.c ============================================================================== --- projects/elftoolchain-update-r3130/libexec/rtld-elf/powerpc/reloc.c Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/libexec/rtld-elf/powerpc/reloc.c Mon Dec 29 14:52:32 2014 (r276362) @@ -483,7 +483,7 @@ reloc_jmpslot(Elf_Addr *wherep, Elf_Addr */ offset = target - (Elf_Addr)wherep; - if (abs(offset) < 32*1024*1024) { /* inside 32MB? */ + if (abs((int)offset) < 32*1024*1024) { /* inside 32MB? */ /* b value # branch directly */ *wherep = 0x48000000 | (offset & 0x03fffffc); __syncicache(wherep, 4); Modified: projects/elftoolchain-update-r3130/sbin/bsdlabel/bsdlabel.8 ============================================================================== --- projects/elftoolchain-update-r3130/sbin/bsdlabel/bsdlabel.8 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/sbin/bsdlabel/bsdlabel.8 Mon Dec 29 14:52:32 2014 (r276362) @@ -109,7 +109,7 @@ argument forces .Nm to use a layout suitable for a different architecture. Current valid values are -.Cm i386 , amd64 , +.Cm i386 , amd64 , and .Cm pc98 . If this option is omitted, Modified: projects/elftoolchain-update-r3130/sbin/camcontrol/camcontrol.8 ============================================================================== --- projects/elftoolchain-update-r3130/sbin/camcontrol/camcontrol.8 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/sbin/camcontrol/camcontrol.8 Mon Dec 29 14:52:32 2014 (r276362) @@ -1613,7 +1613,7 @@ For example: .It FC A Fibre Channel Transport ID consists of .Dq fcp, -followed by a 64-bit Fibre Channel World Wide Name. +followed by a 64-bit Fibre Channel World Wide Name. For example: .Pp .Dl fcp,0x1234567812345678 @@ -1735,11 +1735,11 @@ May also be specified as .Dq exclusive_access . .It wr_ex_ro Write Exclusive Registrants Only mode. -May also be specified as +May also be specified as .Dq write_exclusive_reg_only . .It ex_ac_ro Exclusive Access Registrants Only mode. -May also be specified as +May also be specified as .Dq exclusive_access_reg_only . .It wr_ex_ar Write Exclusive All Registrants mode. @@ -1747,7 +1747,7 @@ May also be specified as .Dq write_exclusive_all_regs . .It ex_ac_ar Exclusive Access All Registrants mode. -May also be specified as +May also be specified as .Dq exclusive_access_all_regs . .El .It Fl U @@ -1931,7 +1931,7 @@ camcontrol persist da0 -v -i read_keys .Pp This will read any persistent reservation keys registered with da0, and display any errors encountered when sending the PERSISTENT RESERVE IN -.Tn SCSI +.Tn SCSI command. .Bd -literal -offset indent camcontrol persist da0 -v -o register -a -K 0x12345678 @@ -1976,9 +1976,9 @@ camcontrol persist da0 -v -o register_mo .Ed .Pp This will move the registration from the current initiator, whose -Registration Key is 0x87654321, to the Fibre Channel initiator with the +Registration Key is 0x87654321, to the Fibre Channel initiator with the Fiber Channel World Wide Node Name 0x1234567812345678. -A new registration key, 0x12345678, will be registered for the initiator +A new registration key, 0x12345678, will be registered for the initiator with the Fibre Channel World Wide Node Name 0x1234567812345678, and the current initiator will be unregistered from the target. The reservation will be moved to relative target port 2 on the target Modified: projects/elftoolchain-update-r3130/sbin/dhclient/dhclient.conf.5 ============================================================================== --- projects/elftoolchain-update-r3130/sbin/dhclient/dhclient.conf.5 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/sbin/dhclient/dhclient.conf.5 Mon Dec 29 14:52:32 2014 (r276362) @@ -524,8 +524,8 @@ In many cases, it is sufficient to just file - the defaults are usually fine. .Sh SEE ALSO .Xr dhclient.leases 5 , -.Xr dhcpd.conf 5 , .Xr dhcp-options 5 , +.Xr dhcpd.conf 5 , .Xr dhclient 8 , .Xr dhcpd 8 .Rs Modified: projects/elftoolchain-update-r3130/sbin/dhclient/dhclient.leases.5 ============================================================================== --- projects/elftoolchain-update-r3130/sbin/dhclient/dhclient.leases.5 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/sbin/dhclient/dhclient.leases.5 Mon Dec 29 14:52:32 2014 (r276362) @@ -75,8 +75,8 @@ Current lease file. .El .Sh SEE ALSO .Xr dhclient.conf 5 , -.Xr dhcpd.conf 5 , .Xr dhcp-options 5 , +.Xr dhcpd.conf 5 , .Xr dhclient 8 , .Xr dhcpd 8 .Rs Modified: projects/elftoolchain-update-r3130/sbin/geom/class/label/glabel.8 ============================================================================== --- projects/elftoolchain-update-r3130/sbin/geom/class/label/glabel.8 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/sbin/geom/class/label/glabel.8 Mon Dec 29 14:52:32 2014 (r276362) @@ -227,11 +227,11 @@ maximum amount of debug information is p .It Va kern.geom.label.*.enable : No 1 Most .Nm LABEL -providers implement a +providers implement a .Xr sysctl 8 flag and a tunable variable named in the above format. This flag controls if the label provider will be active, tasting devices -and creating label nodes in the +and creating label nodes in the .Xr devfs 5 tree. It is sometimes desirable to disable certain label types if they conflict with other classes in complex GEOM topologies. Modified: projects/elftoolchain-update-r3130/sbin/ifconfig/ifconfig.8 ============================================================================== --- projects/elftoolchain-update-r3130/sbin/ifconfig/ifconfig.8 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/sbin/ifconfig/ifconfig.8 Mon Dec 29 14:52:32 2014 (r276362) @@ -2819,9 +2819,9 @@ tried to alter an interface's configurat .Xr devd.conf 5 , .\" .Xr eon 5 , .Xr devd 8 , +.Xr jail 8 , .Xr rc 8 , .Xr routed 8 , -.Xr jail 8 , .Xr sysctl 8 .Sh HISTORY The Modified: projects/elftoolchain-update-r3130/sbin/ipfw/ipfw.8 ============================================================================== --- projects/elftoolchain-update-r3130/sbin/ipfw/ipfw.8 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/sbin/ipfw/ipfw.8 Mon Dec 29 14:52:32 2014 (r276362) @@ -76,7 +76,7 @@ in-kernel NAT. .Nm .Oo Cm set Ar N Oc Cm table .Brq Ar name | all -.Cm info +.Cm info .Nm .Oo Cm set Ar N Oc Cm table .Brq Ar name | all @@ -1872,7 +1872,7 @@ addresses or other search keys (e.g., po In the rest of this section we will use the term ``key''. Table name needs to match the following spec: .Ar table-name . -Tables with the same name can be created in different +Tables with the same name can be created in different .Ar sets . However, rule links to the tables in .Ar set 0 @@ -1972,7 +1972,7 @@ command. Addition of all items are performed atomically. By default, error in addition of one entry does not influence addition of other entries. However, non-zero error code is returned -in that case. +in that case. Special .Cm atomic keyword may be specified before @@ -1984,7 +1984,7 @@ One or more entries can be removed from command. By default, error in removal of one entry does not influence removing of other entries. However, non-zero error code is returned -in that case. +in that case. .Pp It may be possible to check what entry will be found on particular .Ar table-key Modified: projects/elftoolchain-update-r3130/sbin/iscontrol/iscontrol.8 ============================================================================== --- projects/elftoolchain-update-r3130/sbin/iscontrol/iscontrol.8 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/sbin/iscontrol/iscontrol.8 Mon Dec 29 14:52:32 2014 (r276362) @@ -43,7 +43,7 @@ .Sh DESCRIPTION .Bf -symbolic This command, along with its kernel counterpart -.Xr iscsi_initiator 4 , +.Xr iscsi_initiator 4 , is obsolete. Users are advised to use .Xr iscsictl 8 @@ -121,8 +121,8 @@ whatever options are specified, and star .Xr iscsi_initiator 4 , .Xr sa 4 , .Xr iscsi.conf 5 , -.Xr iscsictl 8 , -.Xr camcontrol 8 +.Xr camcontrol 8 , +.Xr iscsictl 8 .Sh STANDARDS RFC 3720 .\"Sh HISTORY Modified: projects/elftoolchain-update-r3130/sbin/mount/mount.8 ============================================================================== --- projects/elftoolchain-update-r3130/sbin/mount/mount.8 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/sbin/mount/mount.8 Mon Dec 29 14:52:32 2014 (r276362) @@ -548,6 +548,7 @@ support for a particular file system mig .Xr ext2fs 5 , .Xr fstab 5 , .Xr procfs 5 , +.Xr tmpfs 5 , .Xr automount 8 , .Xr fstyp 8 , .Xr kldload 8 , @@ -558,7 +559,6 @@ support for a particular file system mig .Xr mount_smbfs 8 , .Xr mount_udf 8 , .Xr mount_unionfs 8 , -.Xr tmpfs 5 , .Xr umount 8 , .Xr zfs 8 , .Xr zpool 8 Modified: projects/elftoolchain-update-r3130/sbin/mount_fusefs/mount_fusefs.8 ============================================================================== --- projects/elftoolchain-update-r3130/sbin/mount_fusefs/mount_fusefs.8 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/sbin/mount_fusefs/mount_fusefs.8 Mon Dec 29 14:52:32 2014 (r276362) @@ -326,8 +326,8 @@ does not call any external utility and a .Sh SEE ALSO .Xr fstat 1 , .Xr mount 8 , -.Xr umount 8 , -.Xr sudo 8 +.Xr sudo 8 , +.Xr umount 8 .Sh HISTORY .Nm appears as the part of the FreeBSD implementation of the Fuse userspace filesystem Modified: projects/elftoolchain-update-r3130/sbin/mount_nfs/mount_nfs.8 ============================================================================== --- projects/elftoolchain-update-r3130/sbin/mount_nfs/mount_nfs.8 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/sbin/mount_nfs/mount_nfs.8 Mon Dec 29 14:52:32 2014 (r276362) @@ -393,7 +393,7 @@ Use the specified version number for NFS See the .Cm nfsv2 , .Cm nfsv3 , -and +and .Cm nfsv4 options for details. .It Cm wcommitsize Ns = Ns Aq Ar value Modified: projects/elftoolchain-update-r3130/sbin/newfs/newfs.8 ============================================================================== --- projects/elftoolchain-update-r3130/sbin/newfs/newfs.8 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/sbin/newfs/newfs.8 Mon Dec 29 14:52:32 2014 (r276362) @@ -310,10 +310,10 @@ on file systems that contain many small .Xr fsck 8 , .Xr gjournal 8 , .Xr growfs 8 , +.Xr gvinum 8 , .Xr makefs 8 , .Xr mount 8 , -.Xr tunefs 8 , -.Xr gvinum 8 +.Xr tunefs 8 .Rs .%A M. McKusick .%A W. Joy Modified: projects/elftoolchain-update-r3130/sbin/routed/routed.8 ============================================================================== --- projects/elftoolchain-update-r3130/sbin/routed/routed.8 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/sbin/routed/routed.8 Mon Dec 29 14:52:32 2014 (r276362) @@ -254,7 +254,7 @@ The following options are available: allow .Nm to accept a RIP request from non-router node. -When specified once, +When specified once, .Nm replies to a route information query from neighbor nodes. When specified twice, Modified: projects/elftoolchain-update-r3130/share/man/man4/ada.4 ============================================================================== --- projects/elftoolchain-update-r3130/share/man/man4/ada.4 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/share/man/man4/ada.4 Mon Dec 29 14:52:32 2014 (r276362) @@ -138,7 +138,7 @@ The default is sorting enabled for HDDs These variables determine whether device read-ahead and write caches should be enabled globally or per-device or disabled. Set to 1 to enable write cache, 0 to disable, -1 to leave it as-is. -Values modified at runtime take effect only after device reset +Values modified at runtime take effect only after device reset .Pq using the reset subcommand of Xr camcontrol 8 . Because of that, this setting should be changed in .Pa /boot/loader.conf Modified: projects/elftoolchain-update-r3130/share/man/man4/man4.i386/glxsb.4 ============================================================================== --- projects/elftoolchain-update-r3130/share/man/man4/man4.i386/glxsb.4 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/share/man/man4/man4.i386/glxsb.4 Mon Dec 29 14:52:32 2014 (r276362) @@ -70,8 +70,8 @@ device driver with AES keys of length != .Sh SEE ALSO .Xr crypto 4 , .Xr intro 4 , -.Xr pci 4 , .Xr ipsec 4 , +.Xr pci 4 , .Xr random 4 , .Xr crypto 9 .Sh HISTORY Modified: projects/elftoolchain-update-r3130/share/man/man4/man4.powerpc/snd_ai2s.4 ============================================================================== --- projects/elftoolchain-update-r3130/share/man/man4/man4.powerpc/snd_ai2s.4 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/share/man/man4/man4.powerpc/snd_ai2s.4 Mon Dec 29 14:52:32 2014 (r276362) @@ -65,8 +65,8 @@ Apple Tumbler Audio Apple Snapper Audio .El .Sh SEE ALSO -.Xr sound 4 , -.Xr snd_davbus 4 +.Xr snd_davbus 4 , +.Xr sound 4 .Sh HISTORY The .Nm Modified: projects/elftoolchain-update-r3130/share/man/man4/man4.powerpc/snd_davbus.4 ============================================================================== --- projects/elftoolchain-update-r3130/share/man/man4/man4.powerpc/snd_davbus.4 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/share/man/man4/man4.powerpc/snd_davbus.4 Mon Dec 29 14:52:32 2014 (r276362) @@ -63,8 +63,8 @@ Apple Burgundy Audio Apple Screamer Audio .El .Sh SEE ALSO -.Xr sound 4 , -.Xr snd_ai2s 4 +.Xr snd_ai2s 4 , +.Xr sound 4 .Sh HISTORY The .Nm Modified: projects/elftoolchain-update-r3130/share/man/man4/tcp.4 ============================================================================== --- projects/elftoolchain-update-r3130/share/man/man4/tcp.4 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/share/man/man4/tcp.4 Mon Dec 29 14:52:32 2014 (r276362) @@ -521,11 +521,11 @@ This is needed to help with connection e when a broken firewall is in the network path. .It Va pmtud_blackhole_detection Turn on automatic path MTU blackhole detection. -In case of retransmits we will +In case of retransmits OS will lower the MSS to check if it's MTU problem. If current MSS is greater than -configured value to try, it will be set to it, otherwise, MSS will be set to -default values +configured value to try, it will be set to configured value, otherwise, +MSS will be set to default values .Po Va net.inet.tcp.mssdflt and .Va net.inet.tcp.v6mssdflt @@ -535,11 +535,12 @@ MSS to try for IPv4 if PMTU blackhole de .It Va v6pmtud_blackhole_mss MSS to try for IPv6 if PMTU blackhole detection is turned on. .It Va pmtud_blackhole_activated -Number of times the code was activated to attempt a MSS downshift. -.It Va pmtud_blackhole_min_activated -Number of times the blackhole MSS was used in an attempt to downshift. +Number of times configured values were used in an attempt to downshift. +.It Va pmtud_blackhole_activated_min_mss +Number of times default MSS was used in an attempt to downshift. .It Va pmtud_blackhole_failed -Number of times that we failed to connect after we downshifted the MSS. +Number of connections for which retransmits continued even after MSS +downshift. .El .Sh ERRORS A socket operation may fail with one of the following errors returned: Modified: projects/elftoolchain-update-r3130/share/man/man5/src.conf.5 ============================================================================== --- projects/elftoolchain-update-r3130/share/man/man5/src.conf.5 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/share/man/man5/src.conf.5 Mon Dec 29 14:52:32 2014 (r276362) @@ -1143,7 +1143,7 @@ support files (fonts and keymaps). Set this to not add warning flags to the compiler invocations. Useful as a temporary workaround when code enters the tree which triggers warnings in environments that differ from the -original develoepr. +original developer. .It Va WITHOUT_WIRELESS .\" from FreeBSD: head/tools/build/options/WITHOUT_WIRELESS 183242 2008-09-21 22:02:26Z sam Set to not build programs used for 802.11 wireless networks; especially Modified: projects/elftoolchain-update-r3130/share/man/man7/build.7 ============================================================================== --- projects/elftoolchain-update-r3130/share/man/man7/build.7 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/share/man/man7/build.7 Mon Dec 29 14:52:32 2014 (r276362) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 25, 2014 +.Dd December 18, 2014 .Dt BUILD 7 .Os .Sh NAME Modified: projects/elftoolchain-update-r3130/share/man/man7/crypto.7 ============================================================================== --- projects/elftoolchain-update-r3130/share/man/man7/crypto.7 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/share/man/man7/crypto.7 Mon Dec 29 14:52:32 2014 (r276362) @@ -97,7 +97,7 @@ This algorithm implements Integer Counte This is similar to what most people call counter mode, but instead of the counter being split into a nonce and a counter part, then entire nonce is used as the initial counter. -This does mean that if a counter is required that rolls over at 32 bits, +This does mean that if a counter is required that rolls over at 32 bits, the transaction need to be split into two parts where the counter rolls over. The counter incremented as a 128-bit big endian number. .Pp Modified: projects/elftoolchain-update-r3130/share/man/man7/hier.7 ============================================================================== --- projects/elftoolchain-update-r3130/share/man/man7/hier.7 Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/share/man/man7/hier.7 Mon Dec 29 14:52:32 2014 (r276362) @@ -50,7 +50,7 @@ default bootstrapping configuration file .Xr loader.conf 5 .It Pa dtb/ Compiled flattened device tree (FDT) files; see -.Xr fdt 4 +.Xr fdt 4 and .Xr dtc 1 .It Pa firmware/ @@ -64,8 +64,8 @@ third-party loadable kernel modules; see .Xr kldstat 8 .It Pa zfs/ -Contains -.Xr zfs 8 +Contains +.Xr zfs 8 zpool cache files. .El .It Pa /cdrom/ Modified: projects/elftoolchain-update-r3130/share/mk/bsd.progs.mk ============================================================================== --- projects/elftoolchain-update-r3130/share/mk/bsd.progs.mk Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/share/mk/bsd.progs.mk Mon Dec 29 14:52:32 2014 (r276362) @@ -43,7 +43,7 @@ PROG ?= $t .if defined(PROG) # just one of many PROG_OVERRIDE_VARS += BINDIR DPSRCS MAN SRCS -PROG_VARS += CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS LDADD LDFLAGS ${PROG_OVERRIDE_VARS} +PROG_VARS += CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS LDADD LIBADD LDFLAGS ${PROG_OVERRIDE_VARS} .for v in ${PROG_VARS:O:u} .if empty(${PROG_OVERRIDE_VARS:M$v}) .if defined(${v}.${PROG}) Modified: projects/elftoolchain-update-r3130/share/mk/src.libnames.mk ============================================================================== --- projects/elftoolchain-update-r3130/share/mk/src.libnames.mk Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/share/mk/src.libnames.mk Mon Dec 29 14:52:32 2014 (r276362) @@ -110,6 +110,7 @@ _LIBRARIES= \ memstat \ mp \ nandfs \ + ncurses \ ncursesw \ netgraph \ ngatm \ Modified: projects/elftoolchain-update-r3130/sys/amd64/ia32/ia32_sigtramp.S ============================================================================== --- projects/elftoolchain-update-r3130/sys/amd64/ia32/ia32_sigtramp.S Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/sys/amd64/ia32/ia32_sigtramp.S Mon Dec 29 14:52:32 2014 (r276362) @@ -86,34 +86,14 @@ ia32_osigcode: * executed, we would have a window where the ring 0 code is * executed with the wrong gsbase. * - * Instead, reflect the lcall $7,$0 back to ring 3 trampoline - * which sets up the frame for int $0x80. + * Instead, set LDT descriptor 0 as code segment, which reflects + * the lcall $7,$0 back to ring 3 trampoline. The trampoline sets up + * the frame for int $0x80. */ ALIGN_TEXT lcall_tramp: - .code64 - /* - * There, we are in 64bit mode and need to return to 32bit. - * First, convert call frame from 64 to 32 bit format. - */ - pushq %rax - movl 16(%rsp),%eax - movl %eax,20(%rsp) /* ret %cs */ - movl 8(%rsp),%eax - movl %eax,16(%rsp) /* ret %rip -> %eip */ - popq %rax - addq $8,%rsp - /* Now return to 32bit */ - pushq $0x33 /* _ucode32sel UPL */ - callq 1f -1: - addq $2f-1b,(%rsp) - lretq -2: - /* Back in 32bit mode */ - .code32 cmpl $SYS_vfork,%eax - je 4f + je 1f pushl %ebp movl %esp,%ebp pushl 0x24(%ebp) /* arg 6 */ @@ -122,21 +102,20 @@ lcall_tramp: pushl 0x18(%ebp) pushl 0x14(%ebp) pushl 0x10(%ebp) /* arg 1 */ - pushl 0xc(%ebp) /* gap */ + subl $4,%esp /* gap */ int $0x80 leavel -3: lretl -4: +1: /* * vfork handling is special and relies on the libc stub saving - * the return ip in %ecx. If vfork failed, then there is no - * child which can corrupt the frame created by call gate. + * the return ip in %ecx. Also, we assume that the call was done + * with ucode32 selector in %cs. */ int $0x80 - jb 3b - addl $8,%esp - jmpl *%ecx + movl $0x33,4(%esp) /* GUCODE32_SEL | SEL_UPL */ + movl %ecx,(%esp) + lretl #endif ALIGN_TEXT Modified: projects/elftoolchain-update-r3130/sys/amd64/ia32/ia32_syscall.c ============================================================================== --- projects/elftoolchain-update-r3130/sys/amd64/ia32/ia32_syscall.c Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/sys/amd64/ia32/ia32_syscall.c Mon Dec 29 14:52:32 2014 (r276362) @@ -223,39 +223,28 @@ int setup_lcall_gate(void) { struct i386_ldt_args uap; - struct user_segment_descriptor descs[2]; - struct gate_descriptor *ssd; + struct user_segment_descriptor desc; uint32_t lcall_addr; int error; bzero(&uap, sizeof(uap)); uap.start = 0; - uap.num = 2; - - /* - * This is the easiest way to cut the space for system - * descriptor in ldt. Manually adjust the descriptor type to - * the call gate later. - */ - bzero(&descs[0], sizeof(descs)); - descs[0].sd_type = SDT_SYSNULL; - descs[1].sd_type = SDT_SYSNULL; - error = amd64_set_ldt(curthread, &uap, descs); + uap.num = 1; + lcall_addr = curproc->p_sysent->sv_psstrings - sz_lcall_tramp; + bzero(&desc, sizeof(desc)); + desc.sd_type = SDT_MEMERA; + desc.sd_dpl = SEL_UPL; + desc.sd_p = 1; + desc.sd_def32 = 1; + desc.sd_gran = 1; + desc.sd_lolimit = 0xffff; + desc.sd_hilimit = 0xf; + desc.sd_lobase = lcall_addr; + desc.sd_hibase = lcall_addr >> 24; + error = amd64_set_ldt(curthread, &uap, &desc); if (error != 0) return (error); - lcall_addr = curproc->p_sysent->sv_psstrings - sz_lcall_tramp; - mtx_lock(&dt_lock); - ssd = (struct gate_descriptor *)(curproc->p_md.md_ldt->ldt_base); - bzero(ssd, sizeof(*ssd)); - ssd->gd_looffset = lcall_addr; - ssd->gd_hioffset = lcall_addr >> 16; - ssd->gd_selector = _ucodesel; - ssd->gd_type = SDT_SYSCGT; - ssd->gd_dpl = SEL_UPL; - ssd->gd_p = 1; - mtx_unlock(&dt_lock); - return (0); } #endif Modified: projects/elftoolchain-update-r3130/sys/amd64/vmm/io/vatpic.c ============================================================================== --- projects/elftoolchain-update-r3130/sys/amd64/vmm/io/vatpic.c Mon Dec 29 14:14:40 2014 (r276361) +++ projects/elftoolchain-update-r3130/sys/amd64/vmm/io/vatpic.c Mon Dec 29 14:52:32 2014 (r276362) @@ -73,6 +73,7 @@ struct atpic { uint8_t request; /* Interrupt Request Register (IIR) */ uint8_t service; /* Interrupt Service (ISR) */ uint8_t mask; /* Interrupt Mask Register (IMR) */ + uint8_t smm; /* special mask mode */ int acnt[8]; /* sum of pin asserts and deasserts */ int lowprio; /* lowest priority irq */ @@ -131,8 +132,16 @@ vatpic_get_highest_isrpin(struct atpic * ATPIC_PIN_FOREACH(pin, atpic, i) { bit = (1 << pin); - if (atpic->service & bit) - return (pin); + if (atpic->service & bit) { + /* + * An IS bit that is masked by an IMR bit will not be + * cleared by a non-specific EOI in Special Mask Mode. + */ + if (atpic->smm && (atpic->mask & bit) != 0) + continue; + else + return (pin); + } } return (-1); @@ -153,6 +162,15 @@ vatpic_get_highest_irrpin(struct atpic * if (atpic->sfn) serviced &= ~(1 << 2); + /* + * In 'Special Mask Mode', when a mask bit is set in OCW1 it inhibits + * further interrupts at that level and enables interrupts from all + * other levels that are not masked. In other words the ISR has no *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412291452.sBTEqXLH078513>