Date: Wed, 24 Dec 2014 15:32:24 +0000 (UTC) From: Andrew Turner <andrew@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r276183 - in projects/arm_intrng: . bin/sh cddl/contrib/opensolaris/lib/libdtrace/common contrib/elftoolchain/common contrib/elftoolchain/elfcopy contrib/elftoolchain/readelf contrib/gc... Message-ID: <201412241532.sBOFWO4Q091322@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: andrew Date: Wed Dec 24 15:32:23 2014 New Revision: 276183 URL: https://svnweb.freebsd.org/changeset/base/276183 Log: Merge to r276182 Deleted: projects/arm_intrng/sys/modules/dtrace/dtnfsclient/ projects/arm_intrng/sys/modules/nfs_common/ projects/arm_intrng/sys/modules/nfsclient/ projects/arm_intrng/sys/modules/nfsserver/ projects/arm_intrng/sys/net/if_stf.h projects/arm_intrng/sys/netinet/in_gif.h projects/arm_intrng/sys/netinet6/in6_gif.h projects/arm_intrng/sys/nfs/nfs_common.c projects/arm_intrng/sys/nfsclient/nfs_bio.c projects/arm_intrng/sys/nfsclient/nfs_kdtrace.c projects/arm_intrng/sys/nfsclient/nfs_krpc.c projects/arm_intrng/sys/nfsclient/nfs_nfsiod.c projects/arm_intrng/sys/nfsclient/nfs_node.c projects/arm_intrng/sys/nfsclient/nfs_subs.c projects/arm_intrng/sys/nfsclient/nfs_vfsops.c projects/arm_intrng/sys/nfsclient/nfs_vnops.c projects/arm_intrng/sys/nfsserver/nfs_fha_old.c projects/arm_intrng/sys/nfsserver/nfs_serv.c projects/arm_intrng/sys/nfsserver/nfs_srvkrpc.c projects/arm_intrng/sys/nfsserver/nfs_srvsubs.c Modified: projects/arm_intrng/Makefile.inc1 projects/arm_intrng/ObsoleteFiles.inc projects/arm_intrng/UPDATING projects/arm_intrng/bin/sh/error.c projects/arm_intrng/bin/sh/error.h projects/arm_intrng/bin/sh/eval.c projects/arm_intrng/bin/sh/expand.c projects/arm_intrng/bin/sh/expand.h projects/arm_intrng/bin/sh/trap.c projects/arm_intrng/bin/sh/trap.h projects/arm_intrng/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c projects/arm_intrng/contrib/elftoolchain/common/elfdefinitions.h projects/arm_intrng/contrib/elftoolchain/elfcopy/sections.c projects/arm_intrng/contrib/elftoolchain/readelf/readelf.c projects/arm_intrng/contrib/gcc/config/arm/arm.c projects/arm_intrng/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c projects/arm_intrng/contrib/ntp/ntpd/ntp_config.c projects/arm_intrng/contrib/ntp/ntpd/ntp_control.c projects/arm_intrng/contrib/ntp/ntpd/ntp_crypto.c projects/arm_intrng/contrib/ntp/ntpd/ntp_proto.c projects/arm_intrng/contrib/ntp/util/ntp-keygen.c projects/arm_intrng/etc/hosts.allow projects/arm_intrng/etc/services projects/arm_intrng/gnu/lib/libssp/Makefile projects/arm_intrng/lib/libbsnmp/libbsnmp/Makefile projects/arm_intrng/lib/libproc/proc_sym.c projects/arm_intrng/lib/libstand/cd9660.c projects/arm_intrng/lib/libstand/ext2fs.c projects/arm_intrng/lib/libstand/nandfs.c projects/arm_intrng/lib/libstand/nfs.c projects/arm_intrng/lib/libstand/read.c projects/arm_intrng/lib/libstand/stand.h projects/arm_intrng/lib/libstand/tftp.c projects/arm_intrng/lib/libstand/twiddle.c projects/arm_intrng/lib/libstand/ufs.c projects/arm_intrng/lib/libstand/write.c projects/arm_intrng/lib/msun/src/math_private.h projects/arm_intrng/share/misc/committers-ports.dot projects/arm_intrng/share/mk/bsd.lib.mk projects/arm_intrng/sys/amd64/amd64/trap.c projects/arm_intrng/sys/amd64/include/vmm.h (contents, props changed) projects/arm_intrng/sys/amd64/vmm/amd/svm.c (contents, props changed) projects/arm_intrng/sys/amd64/vmm/intel/vmcs.c projects/arm_intrng/sys/amd64/vmm/intel/vmcs.h projects/arm_intrng/sys/amd64/vmm/intel/vmx.c projects/arm_intrng/sys/amd64/vmm/vmm.c projects/arm_intrng/sys/arm/allwinner/a20/std.a20 projects/arm_intrng/sys/arm/allwinner/std.a10 projects/arm_intrng/sys/arm/altera/socfpga/std.socfpga projects/arm_intrng/sys/arm/broadcom/bcm2835/std.bcm2835 projects/arm_intrng/sys/arm/conf/DOCKSTAR projects/arm_intrng/sys/arm/conf/DREAMPLUG-1001 projects/arm_intrng/sys/arm/conf/EA3250 projects/arm_intrng/sys/arm/conf/EFIKA_MX projects/arm_intrng/sys/arm/conf/IMX53 projects/arm_intrng/sys/arm/conf/IMX6 projects/arm_intrng/sys/arm/freescale/imx/imx51_machdep.c projects/arm_intrng/sys/arm/freescale/imx/imx53_machdep.c projects/arm_intrng/sys/arm/freescale/imx/imx6_machdep.c projects/arm_intrng/sys/arm/freescale/imx/std.imx51 projects/arm_intrng/sys/arm/freescale/imx/std.imx53 projects/arm_intrng/sys/arm/freescale/imx/std.imx6 projects/arm_intrng/sys/arm/freescale/vybrid/std.vybrid projects/arm_intrng/sys/arm/include/cpuconf.h projects/arm_intrng/sys/arm/mv/mpic.c projects/arm_intrng/sys/arm/mv/std-pj4b.mv projects/arm_intrng/sys/arm/rockchip/std.rk30xx projects/arm_intrng/sys/arm/samsung/exynos/std.exynos5250 projects/arm_intrng/sys/arm/samsung/exynos/std.exynos5420 projects/arm_intrng/sys/arm/ti/std.ti projects/arm_intrng/sys/arm/ti/ti_gpio.c projects/arm_intrng/sys/arm/ti/ti_gpio.h projects/arm_intrng/sys/arm/ti/ti_i2c.c projects/arm_intrng/sys/arm/xilinx/std.zynq7 projects/arm_intrng/sys/boot/amd64/boot1.efi/Makefile projects/arm_intrng/sys/boot/amd64/boot1.efi/generate-fat.sh projects/arm_intrng/sys/boot/amd64/efi/Makefile projects/arm_intrng/sys/boot/arm/uboot/Makefile projects/arm_intrng/sys/boot/common/console.c projects/arm_intrng/sys/boot/common/loader.8 projects/arm_intrng/sys/boot/forth/loader.conf projects/arm_intrng/sys/boot/i386/libi386/spinconsole.c projects/arm_intrng/sys/boot/powerpc/uboot/Makefile projects/arm_intrng/sys/cam/ctl/ctl.c projects/arm_intrng/sys/cam/ctl/ctl_backend_ramdisk.c projects/arm_intrng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c projects/arm_intrng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h projects/arm_intrng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/arm_intrng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/arm_intrng/sys/cddl/dev/dtrace/amd64/dtrace_subr.c projects/arm_intrng/sys/cddl/dev/dtrace/i386/dtrace_subr.c projects/arm_intrng/sys/cddl/dev/dtrace/mips/dtrace_subr.c projects/arm_intrng/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c projects/arm_intrng/sys/conf/NOTES projects/arm_intrng/sys/conf/files projects/arm_intrng/sys/conf/newvers.sh projects/arm_intrng/sys/conf/options projects/arm_intrng/sys/dev/ath/if_ath_sysctl.c projects/arm_intrng/sys/dev/fxp/if_fxp.c projects/arm_intrng/sys/dev/fxp/if_fxpreg.h projects/arm_intrng/sys/dev/fxp/if_fxpvar.h projects/arm_intrng/sys/dev/gpio/gpio_if.m projects/arm_intrng/sys/dev/ipmi/ipmi_kcs.c projects/arm_intrng/sys/dev/isci/isci_controller.c projects/arm_intrng/sys/dev/isci/isci_sysctl.c projects/arm_intrng/sys/dev/mmc/mmc.c projects/arm_intrng/sys/dev/ofw/ofw_cpu.c projects/arm_intrng/sys/dev/vt/hw/efifb/efifb.c projects/arm_intrng/sys/dev/vt/hw/vga/vt_vga.c projects/arm_intrng/sys/fs/nfs/nfs_commonkrpc.c projects/arm_intrng/sys/fs/nfs/nfsport.h projects/arm_intrng/sys/fs/nfsclient/nfs.h projects/arm_intrng/sys/fs/nfsclient/nfs_clnode.c projects/arm_intrng/sys/fs/nfsclient/nfs_clport.c projects/arm_intrng/sys/fs/nfsclient/nfs_clvfsops.c projects/arm_intrng/sys/i386/i386/trap.c projects/arm_intrng/sys/kern/uipc_sockbuf.c projects/arm_intrng/sys/mips/mips/trap.c projects/arm_intrng/sys/modules/Makefile projects/arm_intrng/sys/modules/dtrace/Makefile projects/arm_intrng/sys/modules/dtrace/dtraceall/dtraceall.c projects/arm_intrng/sys/net/if_gif.c projects/arm_intrng/sys/net/if_stf.c projects/arm_intrng/sys/netinet/in_gif.c projects/arm_intrng/sys/netinet6/in6_gif.c projects/arm_intrng/sys/nfs/bootp_subr.c projects/arm_intrng/sys/powerpc/aim/trap.c projects/arm_intrng/sys/sys/dtrace_bsd.h projects/arm_intrng/sys/sys/mbuf.h projects/arm_intrng/sys/sys/param.h projects/arm_intrng/sys/vm/vm_page.c projects/arm_intrng/sys/vm/vm_page.h projects/arm_intrng/usr.sbin/freebsd-update/freebsd-update.sh Directory Properties: projects/arm_intrng/ (props changed) projects/arm_intrng/cddl/ (props changed) projects/arm_intrng/cddl/contrib/opensolaris/ (props changed) projects/arm_intrng/contrib/gcc/ (props changed) projects/arm_intrng/contrib/ntp/ (props changed) projects/arm_intrng/etc/ (props changed) projects/arm_intrng/gnu/lib/ (props changed) projects/arm_intrng/share/ (props changed) projects/arm_intrng/sys/ (props changed) projects/arm_intrng/sys/amd64/vmm/ (props changed) projects/arm_intrng/sys/boot/ (props changed) projects/arm_intrng/sys/cddl/contrib/opensolaris/ (props changed) projects/arm_intrng/sys/conf/ (props changed) Modified: projects/arm_intrng/Makefile.inc1 ============================================================================== --- projects/arm_intrng/Makefile.inc1 Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/Makefile.inc1 Wed Dec 24 15:32:23 2014 (r276183) @@ -1367,6 +1367,11 @@ _share= share/syscons/scrnmaps _gcc_tools= gnu/usr.bin/cc/cc_tools .endif +.if ${MK_INFO} != "no" +_texinfo= gnu/usr.bin/texinfo/libtxi \ + gnu/usr.bin/texinfo/makeinfo +.endif + .if ${MK_RESCUE} != "no" _rescue= rescue/rescue .endif @@ -1398,6 +1403,16 @@ build-tools: .MAKE ${MAKE} DIRPRFX=${_tool}/ depend && \ ${MAKE} DIRPRFX=${_tool}/ all .endfor +.for _tool in \ + ${_texinfo} + ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ + cd ${.CURDIR}/${_tool} && \ + ${MAKE} DIRPRFX=${_tool}/ obj && \ + ${MAKE} DIRPRFX=${_tool}/ depend && \ + ${MAKE} DIRPRFX=${_tool}/ all && \ + ${MAKE} DIRPRFX=${_tool}/ install DESTDIR=${WORLDTMP} +.endfor + # # kernel-tools: Build kernel-building tools Modified: projects/arm_intrng/ObsoleteFiles.inc ============================================================================== --- projects/arm_intrng/ObsoleteFiles.inc Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/ObsoleteFiles.inc Wed Dec 24 15:32:23 2014 (r276183) @@ -38,6 +38,10 @@ # xargs -n1 | sort | uniq -d; # done +# 20141223: remove in6_gif.h, in_gif.h and if_stf.h +OLD_FILES+=usr/include/net/if_stf.h +OLD_FILES+=usr/include/netinet/in_gif.h +OLD_FILES+=usr/include/netinet6/in6_gif.h # 20141202: update to mandoc CVS 20141201 OLD_FILES+=usr.bin/preconv OLD_FILES+=share/man/man1/preconv.1.gz Modified: projects/arm_intrng/UPDATING ============================================================================== --- projects/arm_intrng/UPDATING Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/UPDATING Wed Dec 24 15:32:23 2014 (r276183) @@ -31,6 +31,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20141222: + The old NFS client and server (kernel options NFSCLIENT, NFSSERVER) + kernel sources have been removed. The .h files remain, since some + utilities include them. This will need to be fixed later. + If "mount -t oldnfs ..." is attempted, it will fail. + If the "-o" option on mountd(8), nfsd(8) or nfsstat(1) is used, + the utilities will report errors. + 20141121: The handling of LOCAL_LIB_DIRS has been altered to skip addition of directories to top level SUBDIR variable when their parent Modified: projects/arm_intrng/bin/sh/error.c ============================================================================== --- projects/arm_intrng/bin/sh/error.c Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/bin/sh/error.c Wed Dec 24 15:32:23 2014 (r276183) @@ -90,13 +90,14 @@ exraise(int e) /* - * Called from trap.c when a SIGINT is received. (If the user specifies - * that SIGINT is to be trapped or ignored using the trap builtin, then - * this routine is not called.) Suppressint is nonzero when interrupts - * are held using the INTOFF macro. If SIGINTs are not suppressed and - * the shell is not a root shell, then we want to be terminated if we - * get here, as if we were terminated directly by a SIGINT. Arrange for - * this here. + * Called from trap.c when a SIGINT is received and not suppressed, or when + * an interrupt is pending and interrupts are re-enabled using INTON. + * (If the user specifies that SIGINT is to be trapped or ignored using the + * trap builtin, then this routine is not called.) Suppressint is nonzero + * when interrupts are held using the INTOFF macro. If SIGINTs are not + * suppressed and the shell is not a root shell, then we want to be + * terminated if we get here, as if we were terminated directly by a SIGINT. + * Arrange for this here. */ void @@ -104,16 +105,6 @@ onint(void) { sigset_t sigs; - /* - * The !in_dotrap here is safe. The only way we can arrive here - * with in_dotrap set is that a trap handler set SIGINT to SIG_DFL - * and killed itself. - */ - - if (suppressint && !in_dotrap) { - intpending++; - return; - } intpending = 0; sigemptyset(&sigs); sigprocmask(SIG_SETMASK, &sigs, NULL); @@ -130,6 +121,7 @@ onint(void) else { signal(SIGINT, SIG_DFL); kill(getpid(), SIGINT); + _exit(128 + SIGINT); } } Modified: projects/arm_intrng/bin/sh/error.h ============================================================================== --- projects/arm_intrng/bin/sh/error.h Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/bin/sh/error.h Wed Dec 24 15:32:23 2014 (r276183) @@ -75,11 +75,12 @@ extern volatile sig_atomic_t intpending; #define is_int_on() suppressint #define SETINTON(s) suppressint = (s) #define FORCEINTON {suppressint = 0; if (intpending) onint();} +#define SET_PENDING_INT intpending = 1 #define CLEAR_PENDING_INT intpending = 0 #define int_pending() intpending void exraise(int) __dead2; -void onint(void); +void onint(void) __dead2; void warning(const char *, ...) __printflike(1, 2); void error(const char *, ...) __printf0like(1, 2) __dead2; void exerror(int, const char *, ...) __printf0like(2, 3) __dead2; Modified: projects/arm_intrng/bin/sh/eval.c ============================================================================== --- projects/arm_intrng/bin/sh/eval.c Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/bin/sh/eval.c Wed Dec 24 15:32:23 2014 (r276183) @@ -539,13 +539,13 @@ expredir(union node *n) case NFROMTO: case NAPPEND: case NCLOBBER: - expandarg(redir->nfile.fname, &fn, EXP_TILDE | EXP_REDIR); + expandarg(redir->nfile.fname, &fn, EXP_TILDE); redir->nfile.expfname = fn.list->text; break; case NFROMFD: case NTOFD: if (redir->ndup.vname) { - expandarg(redir->ndup.vname, &fn, EXP_TILDE | EXP_REDIR); + expandarg(redir->ndup.vname, &fn, EXP_TILDE); fixredir(redir, fn.list->text, 1); } break; Modified: projects/arm_intrng/bin/sh/expand.c ============================================================================== --- projects/arm_intrng/bin/sh/expand.c Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/bin/sh/expand.c Wed Dec 24 15:32:23 2014 (r276183) @@ -171,17 +171,12 @@ expandarg(union node *arg, struct arglis STPUTC('\0', expdest); p = grabstackstr(expdest); exparg.lastp = &exparg.list; - /* - * TODO - EXP_REDIR - */ if (flag & EXP_FULL) { ifsbreakup(p, &exparg); *exparg.lastp = NULL; exparg.lastp = &exparg.list; expandmeta(exparg.list, flag); } else { - if (flag & EXP_REDIR) /*XXX - for now, just remove escapes */ - rmescapes(p); sp = (struct strlist *)stalloc(sizeof (struct strlist)); sp->text = p; *exparg.lastp = sp; @@ -209,7 +204,7 @@ expandarg(union node *arg, struct arglis * expansion, and tilde expansion if requested via EXP_TILDE/EXP_VARTILDE. * Processing ends at a CTLENDVAR or CTLENDARI character as well as '\0'. * This is used to expand word in ${var+word} etc. - * If EXP_FULL, EXP_CASE or EXP_REDIR are set, keep and/or generate CTLESC + * If EXP_FULL or EXP_CASE are set, keep and/or generate CTLESC * characters to allow for further processing. * If EXP_FULL is set, also preserve CTLQUOTEMARK characters. */ @@ -217,7 +212,7 @@ static char * argstr(char *p, int flag) { char c; - int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); /* do CTLESC */ + int quotes = flag & (EXP_FULL | EXP_CASE); /* do CTLESC */ int firsteq = 1; int split_lit; int lit_quoted; @@ -303,7 +298,7 @@ exptilde(char *p, int flag) char c, *startp = p; struct passwd *pw; char *home; - int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); + int quotes = flag & (EXP_FULL | EXP_CASE); while ((c = *p) != '\0') { switch(c) { @@ -437,7 +432,7 @@ expbackq(union node *cmd, int quoted, in char lastc; int startloc = dest - stackblock(); char const *syntax = quoted? DQSYNTAX : BASESYNTAX; - int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); + int quotes = flag & (EXP_FULL | EXP_CASE); size_t nnl; INTOFF; @@ -637,7 +632,7 @@ evalvar(char *p, int flag) int varlen; int varlenb; int easy; - int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); + int quotes = flag & (EXP_FULL | EXP_CASE); varflags = (unsigned char)*p++; subtype = varflags & VSTYPE; @@ -862,7 +857,7 @@ varisset(const char *name, int nulok) static void strtodest(const char *p, int flag, int subtype, int quoted) { - if (flag & (EXP_FULL | EXP_CASE | EXP_REDIR) && subtype != VSLENGTH) + if (flag & (EXP_FULL | EXP_CASE) && subtype != VSLENGTH) STPUTS_QUOTES(p, quoted ? DQSYNTAX : BASESYNTAX, expdest); else STPUTS(p, expdest); @@ -1104,7 +1099,6 @@ expandmeta(struct strlist *str, int flag struct strlist **savelastp; struct strlist *sp; char c; - /* TODO - EXP_REDIR */ while (str) { savelastp = exparg.lastp; Modified: projects/arm_intrng/bin/sh/expand.h ============================================================================== --- projects/arm_intrng/bin/sh/expand.h Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/bin/sh/expand.h Wed Dec 24 15:32:23 2014 (r276183) @@ -50,7 +50,6 @@ struct arglist { #define EXP_FULL 0x1 /* perform word splitting & file globbing */ #define EXP_TILDE 0x2 /* do normal tilde expansion */ #define EXP_VARTILDE 0x4 /* expand tildes in an assignment */ -#define EXP_REDIR 0x8 /* file glob for a redirection (1 match only) */ #define EXP_CASE 0x10 /* keeps quotes around for CASE pattern */ #define EXP_SPLIT_LIT 0x20 /* IFS split literal text ${v+-a b c} */ #define EXP_LIT_QUOTED 0x40 /* for EXP_SPLIT_LIT, start off quoted */ Modified: projects/arm_intrng/bin/sh/trap.c ============================================================================== --- projects/arm_intrng/bin/sh/trap.c Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/bin/sh/trap.c Wed Dec 24 15:32:23 2014 (r276183) @@ -75,7 +75,7 @@ __FBSDID("$FreeBSD$"); static char sigmode[NSIG]; /* current value of signal */ volatile sig_atomic_t pendingsig; /* indicates some signal received */ volatile sig_atomic_t pendingsig_waitcmd; /* indicates SIGINT/SIGQUIT received */ -int in_dotrap; /* do we execute in a trap handler? */ +static int in_dotrap; /* do we execute in a trap handler? */ static char *volatile trap[NSIG]; /* trap handler commands */ static volatile sig_atomic_t gotsig[NSIG]; /* indicates specified signal received */ @@ -380,7 +380,15 @@ onsig(int signo) { if (signo == SIGINT && trap[SIGINT] == NULL) { - onint(); + /* + * The !in_dotrap here is safe. The only way we can arrive + * here with in_dotrap set is that a trap handler set SIGINT to + * SIG_DFL and killed itself. + */ + if (suppressint && !in_dotrap) + SET_PENDING_INT; + else + onint(); return; } Modified: projects/arm_intrng/bin/sh/trap.h ============================================================================== --- projects/arm_intrng/bin/sh/trap.h Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/bin/sh/trap.h Wed Dec 24 15:32:23 2014 (r276183) @@ -35,7 +35,6 @@ extern volatile sig_atomic_t pendingsig; extern volatile sig_atomic_t pendingsig_waitcmd; -extern int in_dotrap; void clear_traps(void); int have_traps(void); Modified: projects/arm_intrng/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c ============================================================================== --- projects/arm_intrng/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c Wed Dec 24 15:32:23 2014 (r276183) @@ -171,6 +171,7 @@ dtrace_dof_init(void) if (s != NULL && strcmp(s, ".SUNW_dof") == 0) { dofdata = elf_getdata(scn, NULL); dof = dofdata->d_buf; + break; } } } Modified: projects/arm_intrng/contrib/elftoolchain/common/elfdefinitions.h ============================================================================== --- projects/arm_intrng/contrib/elftoolchain/common/elfdefinitions.h Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/contrib/elftoolchain/common/elfdefinitions.h Wed Dec 24 15:32:23 2014 (r276183) @@ -770,6 +770,8 @@ _ELF_DEFINE_EM(EM_ETPU, 178, "Freescale Extended Time Processing Unit") \ _ELF_DEFINE_EM(EM_SLE9X, 179, \ "Infineon Technologies SLE9X core") \ +_ELF_DEFINE_EM(EM_AARCH64, 183, \ + "AArch64 (64-bit ARM)") \ _ELF_DEFINE_EM(EM_AVR32, 185, \ "Atmel Corporation 32-bit microprocessor family") \ _ELF_DEFINE_EM(EM_STM8, 186, \ Modified: projects/arm_intrng/contrib/elftoolchain/elfcopy/sections.c ============================================================================== --- projects/arm_intrng/contrib/elftoolchain/elfcopy/sections.c Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/contrib/elftoolchain/elfcopy/sections.c Wed Dec 24 15:32:23 2014 (r276183) @@ -1139,12 +1139,6 @@ add_to_shstrtab(struct elfcopy *ecp, con struct section *s; s = ecp->shstrtab; - if (s->buf == NULL) { - insert_to_strtab(s, ""); - insert_to_strtab(s, ".symtab"); - insert_to_strtab(s, ".strtab"); - insert_to_strtab(s, ".shstrtab"); - } insert_to_strtab(s, name); } @@ -1206,6 +1200,11 @@ init_shstrtab(struct elfcopy *ecp) s->loadable = 0; s->type = SHT_STRTAB; s->vma = 0; + + insert_to_strtab(s, ""); + insert_to_strtab(s, ".symtab"); + insert_to_strtab(s, ".strtab"); + insert_to_strtab(s, ".shstrtab"); } void Modified: projects/arm_intrng/contrib/elftoolchain/readelf/readelf.c ============================================================================== --- projects/arm_intrng/contrib/elftoolchain/readelf/readelf.c Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/contrib/elftoolchain/readelf/readelf.c Wed Dec 24 15:32:23 2014 (r276183) @@ -487,6 +487,7 @@ elf_machine(unsigned int mach) case EM_SEP: return "Sharp embedded microprocessor"; case EM_ARCA: return "Arca RISC Microprocessor"; case EM_UNICORE: return "Microprocessor series from PKU-Unity Ltd"; + case EM_AARCH64: return "AArch64"; default: snprintf(s_mach, sizeof(s_mach), "<unknown: %#x>", mach); return (s_mach); @@ -1041,6 +1042,67 @@ r_type(unsigned int mach, unsigned int t case 37: return "R_386_TLS_TPOFF32"; default: return ""; } + case EM_AARCH64: + switch(type) { + case 0: return "R_AARCH64_NONE"; + case 257: return "R_AARCH64_ABS64"; + case 258: return "R_AARCH64_ABS32"; + case 259: return "R_AARCH64_ABS16"; + case 260: return "R_AARCH64_PREL64"; + case 261: return "R_AARCH64_PREL32"; + case 262: return "R_AARCH64_PREL16"; + case 263: return "R_AARCH64_MOVW_UABS_G0"; + case 264: return "R_AARCH64_MOVW_UABS_G0_NC"; + case 265: return "R_AARCH64_MOVW_UABS_G1"; + case 266: return "R_AARCH64_MOVW_UABS_G1_NC"; + case 267: return "R_AARCH64_MOVW_UABS_G2"; + case 268: return "R_AARCH64_MOVW_UABS_G2_NC"; + case 269: return "R_AARCH64_MOVW_UABS_G3"; + case 270: return "R_AARCH64_MOVW_SABS_G0"; + case 271: return "R_AARCH64_MOVW_SABS_G1"; + case 272: return "R_AARCH64_MOVW_SABS_G2"; + case 273: return "R_AARCH64_LD_PREL_LO19"; + case 274: return "R_AARCH64_ADR_PREL_LO21"; + case 275: return "R_AARCH64_ADR_PREL_PG_HI21"; + case 276: return "R_AARCH64_ADR_PREL_PG_HI21_NC"; + case 277: return "R_AARCH64_ADD_ABS_LO12_NC"; + case 278: return "R_AARCH64_LDST8_ABS_LO12_NC"; + case 279: return "R_AARCH64_TSTBR14"; + case 280: return "R_AARCH64_CONDBR19"; + case 282: return "R_AARCH64_JUMP26"; + case 283: return "R_AARCH64_CALL26"; + case 284: return "R_AARCH64_LDST16_ABS_LO12_NC"; + case 285: return "R_AARCH64_LDST32_ABS_LO12_NC"; + case 286: return "R_AARCH64_LDST64_ABS_LO12_NC"; + case 287: return "R_AARCH64_MOVW_PREL_G0"; + case 288: return "R_AARCH64_MOVW_PREL_G0_NC"; + case 289: return "R_AARCH64_MOVW_PREL_G1"; + case 290: return "R_AARCH64_MOVW_PREL_G1_NC"; + case 291: return "R_AARCH64_MOVW_PREL_G2"; + case 292: return "R_AARCH64_MOVW_PREL_G2_NC"; + case 293: return "R_AARCH64_MOVW_PREL_G3"; + case 299: return "R_AARCH64_LDST128_ABS_LO12_NC"; + case 300: return "R_AARCH64_MOVW_GOTOFF_G0"; + case 301: return "R_AARCH64_MOVW_GOTOFF_G0_NC"; + case 302: return "R_AARCH64_MOVW_GOTOFF_G1"; + case 303: return "R_AARCH64_MOVW_GOTOFF_G1_NC"; + case 304: return "R_AARCH64_MOVW_GOTOFF_G2"; + case 305: return "R_AARCH64_MOVW_GOTOFF_G2_NC"; + case 306: return "R_AARCH64_MOVW_GOTOFF_G3"; + case 307: return "R_AARCH64_GOTREL64"; + case 308: return "R_AARCH64_GOTREL32"; + case 309: return "R_AARCH64_GOT_LD_PREL19"; + case 310: return "R_AARCH64_LD64_GOTOFF_LO15"; + case 311: return "R_AARCH64_ADR_GOT_PAGE"; + case 312: return "R_AARCH64_LD64_GOT_LO12_NC"; + case 313: return "R_AARCH64_LD64_GOTPAGE_LO15"; + case 1024: return "R_AARCH64_COPY"; + case 1025: return "R_AARCH64_GLOB_DAT"; + case 1026: return "R_AARCH64_JUMP_SLOT"; + case 1027: return "R_AARCH64_RELATIVE"; + case 1031: return "R_AARCH64_TLSDESC"; + default: return ""; + } case EM_ARM: switch(type) { case 0: return "R_ARM_NONE"; Modified: projects/arm_intrng/contrib/gcc/config/arm/arm.c ============================================================================== --- projects/arm_intrng/contrib/gcc/config/arm/arm.c Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/contrib/gcc/config/arm/arm.c Wed Dec 24 15:32:23 2014 (r276183) @@ -604,6 +604,8 @@ static const struct processors all_archi {"armv6k", mpcore, "6K", FL_CO_PROC | FL_FOR_ARCH6K, NULL}, {"armv6z", arm1176jzs, "6Z", FL_CO_PROC | FL_FOR_ARCH6Z, NULL}, {"armv6zk", arm1176jzs, "6ZK", FL_CO_PROC | FL_FOR_ARCH6ZK, NULL}, + /* Clang compatibility... define __ARM_ARCH_7A__, but codegen is still 6ZK. */ + {"armv7a", arm1176jzs, "7A", FL_CO_PROC | FL_FOR_ARCH6ZK, NULL}, {"ep9312", ep9312, "4T", FL_LDSCHED | FL_CIRRUS | FL_FOR_ARCH4, NULL}, {"iwmmxt", iwmmxt, "5TE", FL_LDSCHED | FL_STRONG | FL_FOR_ARCH5TE | FL_XSCALE | FL_IWMMXT , NULL}, {NULL, arm_none, NULL, 0 , NULL} Modified: projects/arm_intrng/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c ============================================================================== --- projects/arm_intrng/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/contrib/netbsd-tests/lib/libc/stdlib/t_hsearch.c Wed Dec 24 15:32:23 2014 (r276183) @@ -231,6 +231,7 @@ ATF_TC_BODY(hsearch_two, tc) hdestroy(); } +#if defined(__FreeBSD__) && 1100027 <= __FreeBSD_version #ifdef __NetBSD__ ATF_TC(hsearch_r_basic); ATF_TC_HEAD(hsearch_r_basic, tc) @@ -385,6 +386,7 @@ ATF_TC_BODY(hsearch_r_two, tc) hdestroy_r(&t); } +#endif ATF_TP_ADD_TCS(tp) { @@ -395,13 +397,15 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, hsearch_duplicate); ATF_TP_ADD_TC(tp, hsearch_nonexistent); ATF_TP_ADD_TC(tp, hsearch_two); - + +#if defined(__FreeBSD__) && 1100027 <= __FreeBSD_version #ifdef __NetBSD__ ATF_TP_ADD_TC(tp, hsearch_r_basic); #endif ATF_TP_ADD_TC(tp, hsearch_r_duplicate); ATF_TP_ADD_TC(tp, hsearch_r_nonexistent); ATF_TP_ADD_TC(tp, hsearch_r_two); +#endif return atf_no_error(); } Modified: projects/arm_intrng/contrib/ntp/ntpd/ntp_config.c ============================================================================== --- projects/arm_intrng/contrib/ntp/ntpd/ntp_config.c Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/contrib/ntp/ntpd/ntp_config.c Wed Dec 24 15:32:23 2014 (r276183) @@ -1887,7 +1887,7 @@ getconfig( for (i = 0; i < 8; i++) for (j = 1; j < 100; ++j) { - rankey[i] = (char) (ntp_random() & 0xff); + rankey[i] = (char) (arc4random() & 0xff); if (rankey[i] != 0) break; } rankey[8] = 0; Modified: projects/arm_intrng/contrib/ntp/ntpd/ntp_control.c ============================================================================== --- projects/arm_intrng/contrib/ntp/ntpd/ntp_control.c Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/contrib/ntp/ntpd/ntp_control.c Wed Dec 24 15:32:23 2014 (r276183) @@ -24,6 +24,10 @@ #include <netinet/in.h> #include <arpa/inet.h> +#ifndef MIN +#define MIN(a, b) (((a) <= (b)) ? (a) : (b)) +#endif + /* * Structure to hold request procedure information */ @@ -893,6 +897,7 @@ ctl_putdata( ) { int overhead; + unsigned int currentlen; overhead = 0; if (!bin) { @@ -916,12 +921,22 @@ ctl_putdata( /* * Save room for trailing junk */ - if (dlen + overhead + datapt > dataend) { + while (dlen + overhead + datapt > dataend) { /* * Not enough room in this one, flush it out. */ + currentlen = MIN(dlen, dataend - datapt); + + memcpy(datapt, dp, currentlen); + + datapt += currentlen; + dp += currentlen; + dlen -= currentlen; + datalinelen += currentlen; + ctl_flushpkt(CTL_MORE); } + memmove((char *)datapt, dp, (unsigned)dlen); datapt += dlen; datalinelen += dlen; Modified: projects/arm_intrng/contrib/ntp/ntpd/ntp_crypto.c ============================================================================== --- projects/arm_intrng/contrib/ntp/ntpd/ntp_crypto.c Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/contrib/ntp/ntpd/ntp_crypto.c Wed Dec 24 15:32:23 2014 (r276183) @@ -864,12 +864,24 @@ crypto_recv( * errors. */ if (vallen == (u_int) EVP_PKEY_size(host_pkey)) { - RSA_private_decrypt(vallen, + u_int32 *cookiebuf = malloc( + RSA_size(host_pkey->pkey.rsa)); + if (cookiebuf == NULL) { + rval = XEVNT_CKY; + break; + } + if (RSA_private_decrypt(vallen, (u_char *)ep->pkt, - (u_char *)&temp32, + (u_char *)cookiebuf, host_pkey->pkey.rsa, - RSA_PKCS1_OAEP_PADDING); - cookie = ntohl(temp32); + RSA_PKCS1_OAEP_PADDING) != 4) { + rval = XEVNT_CKY; + free(cookiebuf); + break; + } else { + cookie = ntohl(*cookiebuf); + free(cookiebuf); + } } else { rval = XEVNT_CKY; break; @@ -3914,7 +3926,7 @@ crypto_setup(void) rand_file); exit (-1); } - get_systime(&seed); + arc4random_buf(&seed, sizeof(l_fp)); RAND_seed(&seed, sizeof(l_fp)); RAND_write_file(rand_file); OpenSSL_add_all_algorithms(); Modified: projects/arm_intrng/contrib/ntp/ntpd/ntp_proto.c ============================================================================== --- projects/arm_intrng/contrib/ntp/ntpd/ntp_proto.c Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/contrib/ntp/ntpd/ntp_proto.c Wed Dec 24 15:32:23 2014 (r276183) @@ -649,6 +649,7 @@ receive( has_mac)) { is_authentic = AUTH_ERROR; sys_badauth++; + return; } else { is_authentic = AUTH_OK; } Modified: projects/arm_intrng/contrib/ntp/util/ntp-keygen.c ============================================================================== --- projects/arm_intrng/contrib/ntp/util/ntp-keygen.c Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/contrib/ntp/util/ntp-keygen.c Wed Dec 24 15:32:23 2014 (r276183) @@ -642,7 +642,7 @@ gen_md5( for (i = 1; i <= MD5KEYS; i++) { for (j = 0; j < 16; j++) { while (1) { - temp = ntp_random() & 0xff; + temp = arc4random() & 0xff; if (temp == '#') continue; if (temp > 0x20 && temp < 0x7f) @@ -675,7 +675,7 @@ gen_rsa( FILE *str; fprintf(stderr, "Generating RSA keys (%d bits)...\n", modulus); - rsa = RSA_generate_key(modulus, 3, cb, "RSA"); + rsa = RSA_generate_key(modulus, 65537, cb, "RSA"); fprintf(stderr, "\n"); if (rsa == NULL) { fprintf(stderr, "RSA generate keys fails\n%s\n", @@ -954,7 +954,7 @@ gen_gqpar( */ fprintf(stderr, "Generating GQ parameters (%d bits)...\n", modulus); - rsa = RSA_generate_key(modulus, 3, cb, "GQ"); + rsa = RSA_generate_key(modulus, 65537, cb, "GQ"); fprintf(stderr, "\n"); if (rsa == NULL) { fprintf(stderr, "RSA generate keys fails\n%s\n", Modified: projects/arm_intrng/etc/hosts.allow ============================================================================== --- projects/arm_intrng/etc/hosts.allow Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/etc/hosts.allow Wed Dec 24 15:32:23 2014 (r276183) @@ -4,15 +4,15 @@ # # NOTE: The hosts.deny file is deprecated. # Place both 'allow' and 'deny' rules in the hosts.allow file. -# See hosts_options(5) for the format of this file. -# hosts_access(5) no longer fully applies. - -# _____ _ _ -# | ____| __ __ __ _ _ __ ___ _ __ | | ___ | | -# | _| \ \/ / / _` | | '_ ` _ \ | '_ \ | | / _ \ | | -# | |___ > < | (_| | | | | | | | | |_) | | | | __/ |_| -# |_____| /_/\_\ \__,_| |_| |_| |_| | .__/ |_| \___| (_) -# |_| +# See hosts_options(5) for the format of this file. +# hosts_access(5) no longer fully applies. +# +# _____ _ _ +# | ____| __ __ __ _ _ __ ___ _ __ | | ___ | | +# | _| \ \/ / / _` | | '_ ` _ \ | '_ \ | | / _ \ | | +# | |___ > < | (_| | | | | | | | | |_) | | | | __/ |_| +# |_____| /_/\_\ \__,_| |_| |_| |_| | .__/ |_| \___| (_) +# |_| # !!! This is an example! You will need to modify it for your specific # !!! requirements! Modified: projects/arm_intrng/etc/services ============================================================================== --- projects/arm_intrng/etc/services Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/etc/services Wed Dec 24 15:32:23 2014 (r276183) @@ -2345,6 +2345,8 @@ mdns 5353/tcp #Multicast DNS mdns 5353/udp #Multicast DNS postgresql 5432/tcp #PostgreSQL Database postgresql 5432/udp #PostgreSQL Database +vami 5480/tcp #VMware Appliance Management Interface, HTTPS-like +vami 5480/udp #VMware Appliance Management Interface, HTTPS-like rplay 5555/udp amqp 5672/sctp #AMQP amqp 5672/tcp #AMQP Modified: projects/arm_intrng/gnu/lib/libssp/Makefile ============================================================================== --- projects/arm_intrng/gnu/lib/libssp/Makefile Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/gnu/lib/libssp/Makefile Wed Dec 24 15:32:23 2014 (r276183) @@ -15,6 +15,7 @@ SRCDIR= ${GCCLIB}/libssp LIB= ssp SHLIB_MAJOR= 0 +LD_FATAL_WARNINGS= no SRCS= ssp.c gets-chk.c memcpy-chk.c memmove-chk.c mempcpy-chk.c \ memset-chk.c snprintf-chk.c sprintf-chk.c stpcpy-chk.c \ Modified: projects/arm_intrng/lib/libbsnmp/libbsnmp/Makefile ============================================================================== --- projects/arm_intrng/lib/libbsnmp/libbsnmp/Makefile Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/lib/libbsnmp/libbsnmp/Makefile Wed Dec 24 15:32:23 2014 (r276183) @@ -9,6 +9,7 @@ CONTRIB= ${.CURDIR}/../../../contrib/bsn LIB= bsnmp SHLIB_MAJOR= 6 +LD_FATAL_WARNINGS= no CFLAGS+= -I${CONTRIB} -DHAVE_ERR_H -DHAVE_GETADDRINFO -DHAVE_STRLCPY CFLAGS+= -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DQUADFMT='"llu"' -DQUADXFMT='"llx"' Modified: projects/arm_intrng/lib/libproc/proc_sym.c ============================================================================== --- projects/arm_intrng/lib/libproc/proc_sym.c Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/lib/libproc/proc_sym.c Wed Dec 24 15:32:23 2014 (r276183) @@ -501,13 +501,16 @@ ctf_file_t * proc_name2ctf(struct proc_handle *p, const char *name) { #ifndef NO_CTF + ctf_file_t *ctf; prmap_t *map; int error; if ((map = proc_name2map(p, name)) == NULL) return (NULL); - return (ctf_open(map->pr_mapname, &error)); + ctf = ctf_open(map->pr_mapname, &error); + free(map); + return (ctf); #else (void)p; (void)name; Modified: projects/arm_intrng/lib/libstand/cd9660.c ============================================================================== --- projects/arm_intrng/lib/libstand/cd9660.c Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/lib/libstand/cd9660.c Wed Dec 24 15:32:23 2014 (r276183) @@ -281,7 +281,7 @@ cd9660_open(const char *path, struct ope buf = malloc(buf_size = ISO_DEFAULT_BLOCK_SIZE); vd = buf; for (bno = 16;; bno++) { - twiddle(); + twiddle(1); rc = f->f_dev->dv_strategy(f->f_devdata, F_READ, cdb2devb(bno), ISO_DEFAULT_BLOCK_SIZE, buf, &read); if (rc) @@ -314,7 +314,7 @@ cd9660_open(const char *path, struct ope while (off < dsize) { if ((off % ISO_DEFAULT_BLOCK_SIZE) == 0) { - twiddle(); + twiddle(1); rc = f->f_dev->dv_strategy (f->f_devdata, F_READ, cdb2devb(bno + boff), @@ -374,7 +374,7 @@ cd9660_open(const char *path, struct ope /* Check for Rock Ridge since we didn't in the loop above. */ bno = isonum_733(rec.extent) + isonum_711(rec.ext_attr_length); - twiddle(); + twiddle(1); rc = f->f_dev->dv_strategy(f->f_devdata, F_READ, cdb2devb(bno), ISO_DEFAULT_BLOCK_SIZE, buf, &read); if (rc) @@ -431,7 +431,7 @@ buf_read_file(struct open_file *f, char if (fp->f_buf == (char *)0) fp->f_buf = malloc(ISO_DEFAULT_BLOCK_SIZE); - twiddle(); + twiddle(16); rc = f->f_dev->dv_strategy(f->f_devdata, F_READ, cdb2devb(blkno), ISO_DEFAULT_BLOCK_SIZE, fp->f_buf, &read); if (rc) Modified: projects/arm_intrng/lib/libstand/ext2fs.c ============================================================================== --- projects/arm_intrng/lib/libstand/ext2fs.c Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/lib/libstand/ext2fs.c Wed Dec 24 15:32:23 2014 (r276183) @@ -353,7 +353,7 @@ ext2fs_open(const char *upath, struct op /* allocate space and read super block */ fs = (struct ext2fs *)malloc(sizeof(*fs)); fp->f_fs = fs; - twiddle(); + twiddle(1); error = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, EXT2_SBLOCK, EXT2_SBSIZE, (char *)fs, &buf_size); if (error) @@ -395,7 +395,7 @@ ext2fs_open(const char *upath, struct op len = blkgrps * fs->fs_bsize; fp->f_bg = malloc(len); - twiddle(); + twiddle(1); error = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, EXT2_SBLOCK + EXT2_SBSIZE / DEV_BSIZE, len, (char *)fp->f_bg, &buf_size); @@ -507,7 +507,7 @@ ext2fs_open(const char *upath, struct op if (error) goto out; - twiddle(); + twiddle(1); error = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, fsb_to_db(fs, disk_block), fs->fs_bsize, buf, &buf_size); @@ -568,7 +568,7 @@ read_inode(ino_t inumber, struct open_fi * Read inode and save it. */ buf = malloc(fs->fs_bsize); - twiddle(); + twiddle(1); error = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, ino_to_db(fs, fp->f_bg, inumber), fs->fs_bsize, buf, &rsize); if (error) @@ -665,7 +665,7 @@ block_map(struct open_file *f, daddr_t f if (fp->f_blk[level] == (char *)0) fp->f_blk[level] = malloc(fs->fs_bsize); - twiddle(); + twiddle(1); error = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, fsb_to_db(fp->f_fs, ind_block_num), fs->fs_bsize, fp->f_blk[level], &fp->f_blksize[level]); @@ -723,7 +723,7 @@ buf_read_file(struct open_file *f, char bzero(fp->f_buf, block_size); fp->f_buf_size = block_size; } else { - twiddle(); + twiddle(4); error = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, fsb_to_db(fs, disk_block), block_size, fp->f_buf, &fp->f_buf_size); Modified: projects/arm_intrng/lib/libstand/nandfs.c ============================================================================== --- projects/arm_intrng/lib/libstand/nandfs.c Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/lib/libstand/nandfs.c Wed Dec 24 15:32:23 2014 (r276183) @@ -921,7 +921,7 @@ nandfs_bmap_lookup(struct nandfs *fs, st return (0); } - twiddle(); + twiddle(1); NANDFS_DEBUG("calling get_map with %jx\n", ind_block_num); map = nandfs_get_map(fs, node, ind_block_num, phys); if (map == NULL) Modified: projects/arm_intrng/lib/libstand/nfs.c ============================================================================== --- projects/arm_intrng/lib/libstand/nfs.c Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/lib/libstand/nfs.c Wed Dec 24 15:32:23 2014 (r276183) @@ -662,7 +662,7 @@ nfs_read(struct open_file *f, void *buf, (int)fp->off); #endif while ((int)size > 0) { - twiddle(); + twiddle(16); cc = nfs_readdata(fp, fp->off, (void *)addr, size); /* XXX maybe should retry on certain errors */ if (cc == -1) { @@ -1311,7 +1311,7 @@ nfs_read(struct open_file *f, void *buf, (int)fp->off); #endif while ((int)size > 0) { - twiddle(); + twiddle(16); cc = nfs_readdata(fp, fp->off, (void *)addr, size); /* XXX maybe should retry on certain errors */ if (cc == -1) { Modified: projects/arm_intrng/lib/libstand/read.c ============================================================================== --- projects/arm_intrng/lib/libstand/read.c Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/lib/libstand/read.c Wed Dec 24 15:32:23 2014 (r276183) @@ -77,7 +77,7 @@ read(int fd, void *dest, size_t bcount) return (-1); } if (f->f_flags & F_RAW) { - twiddle(); + twiddle(4); errno = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, btodb(f->f_offset), bcount, dest, &resid); if (errno) Modified: projects/arm_intrng/lib/libstand/stand.h ============================================================================== --- projects/arm_intrng/lib/libstand/stand.h Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/lib/libstand/stand.h Wed Dec 24 15:32:23 2014 (r276183) @@ -242,7 +242,8 @@ extern int sprintf(char *buf, const char extern int snprintf(char *buf, size_t size, const char *cfmt, ...) __printflike(3, 4); extern void vsprintf(char *buf, const char *cfmt, __va_list); -extern void twiddle(void); +extern void twiddle(u_int callerdiv); +extern void twiddle_divisor(u_int globaldiv); extern void ngets(char *, int); #define gets(x) ngets((x), 0) Modified: projects/arm_intrng/lib/libstand/tftp.c ============================================================================== --- projects/arm_intrng/lib/libstand/tftp.c Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/lib/libstand/tftp.c Wed Dec 24 15:32:23 2014 (r276183) @@ -447,14 +447,12 @@ tftp_read(struct open_file *f, void *add size_t *resid /* out */) { struct tftp_handle *tftpfile; - static int tc = 0; tftpfile = (struct tftp_handle *) f->f_fsdata; while (size > 0) { int needblock, count; - if (!(tc++ % 16)) - twiddle(); + twiddle(32); needblock = tftpfile->off / tftpfile->tftp_blksize + 1; Modified: projects/arm_intrng/lib/libstand/twiddle.c ============================================================================== --- projects/arm_intrng/lib/libstand/twiddle.c Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/lib/libstand/twiddle.c Wed Dec 24 15:32:23 2014 (r276183) @@ -42,11 +42,28 @@ __FBSDID("$FreeBSD$"); /* Extra functions from NetBSD standalone printf.c */ +static u_int globaldiv; + void -twiddle() +twiddle(u_int callerdiv) { - static int pos; + static u_int callercnt, globalcnt, pos; + + callercnt++; + if (callerdiv > 1 && (callercnt % callerdiv) != 0) + return; + + globalcnt++; + if (globaldiv > 1 && (globalcnt % globaldiv) != 0) + return; putchar("|/-\\"[pos++ & 3]); putchar('\b'); } + +void +twiddle_divisor(u_int gdiv) +{ + + globaldiv = gdiv; +} Modified: projects/arm_intrng/lib/libstand/ufs.c ============================================================================== --- projects/arm_intrng/lib/libstand/ufs.c Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/lib/libstand/ufs.c Wed Dec 24 15:32:23 2014 (r276183) @@ -155,7 +155,7 @@ read_inode(inumber, f) * Read inode and save it. */ buf = malloc(fs->fs_bsize); - twiddle(); + twiddle(1); rc = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, fsbtodb(fs, ino_to_fsba(fs, inumber)), fs->fs_bsize, buf, &rsize); @@ -265,7 +265,7 @@ block_map(f, file_block, disk_block_p) if (fp->f_blk[level] == (char *)0) fp->f_blk[level] = malloc(fs->fs_bsize); - twiddle(); + twiddle(1); rc = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, fsbtodb(fp->f_fs, ind_block_num), fs->fs_bsize, @@ -346,7 +346,7 @@ buf_write_file(f, buf_p, size_p) if (fp->f_buf == (char *)0) fp->f_buf = malloc(fs->fs_bsize); - twiddle(); + twiddle(4); rc = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, fsbtodb(fs, disk_block), block_size, fp->f_buf, &fp->f_buf_size); @@ -365,7 +365,7 @@ buf_write_file(f, buf_p, size_p) * Write the block out to storage. */ - twiddle(); + twiddle(4); rc = (f->f_dev->dv_strategy)(f->f_devdata, F_WRITE, fsbtodb(fs, disk_block), block_size, fp->f_buf, &fp->f_buf_size); @@ -406,7 +406,7 @@ buf_read_file(f, buf_p, size_p) bzero(fp->f_buf, block_size); fp->f_buf_size = block_size; } else { - twiddle(); + twiddle(4); rc = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, fsbtodb(fs, disk_block), block_size, fp->f_buf, &fp->f_buf_size); @@ -515,7 +515,7 @@ ufs_open(upath, f) /* allocate space and read super block */ fs = malloc(SBLOCKSIZE); fp->f_fs = fs; - twiddle(); + twiddle(1); /* * Try reading the superblock in each of its possible locations. */ @@ -649,7 +649,7 @@ ufs_open(upath, f) if (rc) goto out; - twiddle(); + twiddle(1); rc = (f->f_dev->dv_strategy)(f->f_devdata, F_READ, fsbtodb(fs, disk_block), fs->fs_bsize, buf, &buf_size); Modified: projects/arm_intrng/lib/libstand/write.c ============================================================================== --- projects/arm_intrng/lib/libstand/write.c Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/lib/libstand/write.c Wed Dec 24 15:32:23 2014 (r276183) @@ -80,7 +80,7 @@ write(fd, dest, bcount) return (-1); } if (f->f_flags & F_RAW) { - twiddle(); + twiddle(4); errno = (f->f_dev->dv_strategy)(f->f_devdata, F_WRITE, btodb(f->f_offset), bcount, dest, &resid); if (errno) Modified: projects/arm_intrng/lib/msun/src/math_private.h ============================================================================== --- projects/arm_intrng/lib/msun/src/math_private.h Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/lib/msun/src/math_private.h Wed Dec 24 15:32:23 2014 (r276183) @@ -456,9 +456,8 @@ typedef union { * to -0.0+I*0.0. * * The C11 standard introduced the macros CMPLX(), CMPLXF() and CMPLXL() - * to construct complex values. The functions below are modelled after - * these macros, with the exception that they cannot be used to - * construct compile-time complex values. + * to construct complex values. Compilers that conform to the C99 + * standard require the following functions to avoid the above issues. */ #ifndef CMPLXF Modified: projects/arm_intrng/share/misc/committers-ports.dot ============================================================================== --- projects/arm_intrng/share/misc/committers-ports.dot Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/share/misc/committers-ports.dot Wed Dec 24 15:32:23 2014 (r276183) @@ -67,6 +67,7 @@ beech [label="Beech Rintoul\nbeech@FreeB bf [label="Brendan Fabeny\nbf@FreeBSD.org\n2010/06/02"] bland [label="Alexander Nedotsukov\nbland@FreeBSD.org\n2003/08/14"] bmah [label="Bruce A. Mah\nbmah@FreeBSD.org\n2000/08/23"] +bofh [label="Muhammad Moinur Rahman\nbofh@FreeBSD.org\n2014/12/23"] brix [label="Henrik Brix Andersen\nbrix@FreeBSD.org\n2007/10/31"] brooks [label="Brooks Davies\nbrooks@FreeBSD.org\n2004/05/03"] bsam [label="Boris Samorodov\nbsam@FreeBSD.org\n2006/07/20"] @@ -263,6 +264,7 @@ bdrewery -> sbruno bdrewery -> trociny bapt -> bdrewery +bapt -> bofh bapt -> eadler bapt -> grembo bapt -> jlaffaye @@ -430,6 +432,7 @@ marcus -> bland marcus -> eik marcus -> jmallett +marino -> bofh marino -> robak makc -> alonso Modified: projects/arm_intrng/share/mk/bsd.lib.mk ============================================================================== --- projects/arm_intrng/share/mk/bsd.lib.mk Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/share/mk/bsd.lib.mk Wed Dec 24 15:32:23 2014 (r276183) @@ -207,7 +207,12 @@ _LIBS+= ${SHLIB_NAME} SOLINKOPTS= -shared -Wl,-x .if !defined(ALLOW_SHARED_TEXTREL) -SOLINKOPTS+= -Wl,--fatal-warnings -Wl,--warn-shared-textrel +.if defined(LD_FATAL_WARNINGS) && ${LD_FATAL_WARNINGS} == "no" +SOLINKOPTS+= -Wl,--no-fatal-warnings +.else +SOLINKOPTS+= -Wl,--fatal-warnings +.endif +SOLINKOPTS+= -Wl,--warn-shared-textrel .endif .if target(beforelinking) Modified: projects/arm_intrng/sys/amd64/amd64/trap.c ============================================================================== --- projects/arm_intrng/sys/amd64/amd64/trap.c Wed Dec 24 15:28:45 2014 (r276182) +++ projects/arm_intrng/sys/amd64/amd64/trap.c Wed Dec 24 15:32:23 2014 (r276183) @@ -614,7 +614,8 @@ trap_check(struct trapframe *frame) { #ifdef KDTRACE_HOOKS - if (dtrace_trap_func != NULL && (*dtrace_trap_func)(frame)) + if (dtrace_trap_func != NULL && + (*dtrace_trap_func)(frame, frame->tf_trapno) != 0) return; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412241532.sBOFWO4Q091322>