Date: Tue, 22 Jan 2013 16:52:05 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r245794 - in projects/mtree: . bin/ps bin/sh contrib/compiler-rt contrib/compiler-rt/lib contrib/compiler-rt/lib/arm contrib/libcxxrt gnu/usr.bin/gdb/kgdb gnu/usr.bin/grep lib lib/libc/... Message-ID: <201301221652.r0MGq5NX036110@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Tue Jan 22 16:52:04 2013 New Revision: 245794 URL: http://svnweb.freebsd.org/changeset/base/245794 Log: MFH @ r245793 Added: projects/mtree/lib/libc/arm/Symbol_oabi.map - copied unchanged from r245793, head/lib/libc/arm/Symbol_oabi.map projects/mtree/lib/libc/arm/aeabi/ - copied from r245793, head/lib/libc/arm/aeabi/ - copied from r245793, head/lib/libvmmapi/ - copied unchanged from r245793, head/share/man/man4/bhyve.4 - copied unchanged from r245793, head/sys/amd64/include/vmm.h - copied unchanged from r245793, head/sys/amd64/include/vmm_dev.h - copied unchanged from r245793, head/sys/amd64/include/vmm_instruction_emul.h - copied from r245793, head/sys/amd64/vmm/ - copied from r245793, head/sys/dev/blackhole/ - copied from r245793, head/sys/dev/bvm/ - copied from r245793, head/sys/modules/blackhole/ - copied from r245793, head/sys/modules/vmm/ - copied from r245793, head/usr.sbin/bhyve/ - copied from r245793, head/usr.sbin/bhyvectl/ - copied from r245793, head/usr.sbin/bhyveload/ projects/mtree/usr.sbin/bsdinstall/partedit/scripted.c - copied unchanged from r245793, head/usr.sbin/bsdinstall/partedit/scripted.c projects/mtree/usr.sbin/bsdinstall/scripts/script - copied unchanged from r245793, head/usr.sbin/bsdinstall/scripts/script Directory Properties: projects/mtree/lib/libvmmapi/ (props changed) projects/mtree/share/man/man4/bhyve.4 (props changed) projects/mtree/sys/amd64/include/vmm.h (props changed) projects/mtree/sys/amd64/include/vmm_dev.h (props changed) projects/mtree/sys/amd64/include/vmm_instruction_emul.h (props changed) projects/mtree/sys/amd64/vmm/ (props changed) projects/mtree/sys/dev/blackhole/ (props changed) projects/mtree/sys/dev/bvm/ (props changed) projects/mtree/sys/modules/blackhole/ (props changed) projects/mtree/sys/modules/vmm/ (props changed) projects/mtree/usr.sbin/bhyve/ (props changed) projects/mtree/usr.sbin/bhyvectl/ (props changed) projects/mtree/usr.sbin/bhyveload/ (props changed) Deleted: projects/mtree/usr.sbin/makefs/getid.c Modified: projects/mtree/Makefile.inc1 projects/mtree/bin/ps/fmt.c projects/mtree/bin/ps/ps.c projects/mtree/bin/sh/TOUR projects/mtree/bin/sh/eval.c projects/mtree/bin/sh/init.h projects/mtree/bin/sh/input.c projects/mtree/bin/sh/main.c projects/mtree/bin/sh/mkinit.c projects/mtree/bin/sh/sh.1 projects/mtree/bin/sh/var.c projects/mtree/contrib/compiler-rt/LICENSE.TXT projects/mtree/contrib/compiler-rt/lib/arm/aeabi_uldivmod.S projects/mtree/contrib/compiler-rt/lib/arm/divsi3.S projects/mtree/contrib/compiler-rt/lib/arm/udivsi3.S projects/mtree/contrib/compiler-rt/lib/cmpdi2.c projects/mtree/contrib/compiler-rt/lib/fixsfdi.c projects/mtree/contrib/compiler-rt/lib/int_endianness.h projects/mtree/contrib/compiler-rt/lib/int_lib.h projects/mtree/contrib/compiler-rt/lib/ucmpdi2.c projects/mtree/contrib/libcxxrt/exception.cc projects/mtree/gnu/usr.bin/gdb/kgdb/main.c projects/mtree/gnu/usr.bin/grep/grep.c projects/mtree/lib/Makefile projects/mtree/lib/libc/arm/Makefile.inc projects/mtree/lib/libc/arm/SYS.h projects/mtree/lib/libc/arm/Symbol.map projects/mtree/lib/libc/arm/gen/Makefile.inc projects/mtree/lib/libc/quad/Makefile.inc projects/mtree/lib/libc/sys/kqueue.2 projects/mtree/lib/libcompiler_rt/Makefile projects/mtree/lib/libthr/thread/thr_init.c projects/mtree/lib/libthr/thread/thr_kern.c projects/mtree/libexec/rtld-elf/Makefile projects/mtree/release/rc.local projects/mtree/sbin/newfs_msdos/newfs_msdos.c projects/mtree/share/man/man4/Makefile projects/mtree/share/man/man5/make.conf.5 projects/mtree/share/man/man9/VFS_SET.9 projects/mtree/share/mk/bsd.libnames.mk projects/mtree/sys/amd64/amd64/pmap.c projects/mtree/sys/arm/arm/intr.c projects/mtree/sys/arm/arm/machdep.c projects/mtree/sys/arm/include/intr.h projects/mtree/sys/arm/ti/ti_scm.c projects/mtree/sys/boot/arm/uboot/Makefile projects/mtree/sys/boot/fdt/dts/beaglebone.dts projects/mtree/sys/boot/i386/efi/Makefile projects/mtree/sys/boot/sparc64/loader/main.c projects/mtree/sys/cam/scsi/scsi_all.c projects/mtree/sys/conf/Makefile.arm projects/mtree/sys/conf/files.amd64 projects/mtree/sys/conf/files.i386 projects/mtree/sys/conf/ldscript.arm projects/mtree/sys/contrib/dev/acpica/components/disassembler/dmresrc.c projects/mtree/sys/contrib/dev/acpica/include/acglobal.h projects/mtree/sys/contrib/octeon-sdk/cvmx-helper-board.c projects/mtree/sys/dev/ath/if_ath_tx.c projects/mtree/sys/dev/ath/if_athvar.h projects/mtree/sys/dev/hpt27xx/hpt27xx_config.c projects/mtree/sys/dev/hpt27xx/os_bsd.h projects/mtree/sys/dev/hpt27xx/osm_bsd.c projects/mtree/sys/dev/mmc/mmc.c projects/mtree/sys/dev/mmc/mmcreg.h projects/mtree/sys/dev/usb/quirk/usb_quirk.c projects/mtree/sys/dev/usb/storage/umass.c projects/mtree/sys/dev/usb/usbdevs projects/mtree/sys/i386/i386/pmap.c projects/mtree/sys/modules/Makefile projects/mtree/sys/modules/hpt27xx/Makefile projects/mtree/sys/net/if_lagg.c projects/mtree/sys/netinet/tcp_input.c projects/mtree/tools/install.sh projects/mtree/usr.bin/grep/grep.c projects/mtree/usr.bin/tr/tr.c projects/mtree/usr.bin/w/w.c projects/mtree/usr.bin/xinstall/install.1 projects/mtree/usr.bin/xinstall/xinstall.c projects/mtree/usr.sbin/Makefile.amd64 projects/mtree/usr.sbin/bsdconfig/share/script.subr projects/mtree/usr.sbin/bsdinstall/bsdinstall.8 projects/mtree/usr.sbin/bsdinstall/partedit/Makefile projects/mtree/usr.sbin/bsdinstall/partedit/diskeditor.c projects/mtree/usr.sbin/bsdinstall/partedit/part_wizard.c projects/mtree/usr.sbin/bsdinstall/partedit/partedit.c projects/mtree/usr.sbin/bsdinstall/partedit/partedit.h projects/mtree/usr.sbin/bsdinstall/scripts/Makefile projects/mtree/usr.sbin/inetd/inetd.c projects/mtree/usr.sbin/makefs/Makefile projects/mtree/usr.sbin/makefs/makefs.h Directory Properties: projects/mtree/ (props changed) projects/mtree/contrib/compiler-rt/ (props changed) projects/mtree/contrib/libcxxrt/ (props changed) projects/mtree/gnu/usr.bin/gdb/ (props changed) projects/mtree/lib/libc/ (props changed) projects/mtree/sbin/ (props changed) projects/mtree/share/man/man4/ (props changed) projects/mtree/sys/ (props changed) projects/mtree/sys/boot/ (props changed) projects/mtree/sys/boot/i386/efi/ (props changed) projects/mtree/sys/conf/ (props changed) projects/mtree/sys/contrib/dev/acpica/ (props changed) projects/mtree/sys/contrib/dev/acpica/components/disassembler/ (props changed) projects/mtree/sys/contrib/dev/acpica/include/ (props changed) projects/mtree/sys/contrib/octeon-sdk/ (props changed) Modified: projects/mtree/Makefile.inc1 ============================================================================== --- projects/mtree/Makefile.inc1 Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/Makefile.inc1 Tue Jan 22 16:52:04 2013 (r245794) @@ -15,7 +15,6 @@ # -DNO_PORTSUPDATE do not update ports in ${MAKE} update # -DNO_ROOT install without using root privilege # -DNO_DOCUPDATE do not update doc in ${MAKE} update -# -DNO_WWWUPDATE do not update www in ${MAKE} update # -DNO_CTF do not run the DTrace CTF conversion tools on built objects # LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list # LOCAL_LIB_DIRS="list of dirs" to add additional dirs to libraries target @@ -696,6 +695,8 @@ EXTRA_DISTRIBUTIONS+= games EXTRA_DISTRIBUTIONS+= lib32 .endif +MTREE_MAGIC?= "#mtree 2.0" + distributeworld installworld: installcheck mkdir -p ${INSTALLTMP} progs=$$(for prog in ${ITOOLS}; do \ @@ -719,7 +720,7 @@ distributeworld installworld: installche cp $$libs $$progs ${INSTALLTMP} cp -R $${PATH_LOCALE:-"/usr/share/locale"} ${INSTALLTMP}/locale .if defined(NO_ROOT) - echo "#mtree v2.0" > ${METALOG} + echo "${MTREE_MAGIC}" > ${METALOG} .endif .if make(distributeworld) .for dist in ${EXTRA_DISTRIBUTIONS} @@ -759,7 +760,7 @@ distributeworld installworld: installche @# the relevent mtree line. cd ${DESTDIR}/${DISTDIR}; \ find ./${dist} | sort -u ${METALOG} - | \ - awk 'BEGIN { print "#mtree 2.0" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}\//, "./"); print } }' > \ + awk 'BEGIN { print "${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}\//, "./"); print } }' > \ ${DESTDIR}/${DISTDIR}/${dist}.meta .endfor .endif @@ -1013,6 +1014,13 @@ update: @echo "--------------------------------------------------------------" @echo ">>> Running ${SUP}" @echo "--------------------------------------------------------------" + @echo "!! WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!" + @echo "!! Update methods with ${SUP} are deprecated." + @echo "!! Please see http://www.freebsd.org/handbook/svn.html" + @echo "!! and convert your update method to SVN_UPDATE or" + @echo "!! freebsd-update(8)." + @echo "!! WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!" + @sleep 5 .if defined(SUPFILE) @${SUP} ${SUPFLAGS} ${SUPFILE} .endif @@ -1028,9 +1036,6 @@ update: .if defined(DOCSUPFILE) && !defined(NO_DOCUPDATE) @${SUP} ${SUPFLAGS} ${DOCSUPFILE} .endif -.if defined(WWWSUPFILE) && !defined(NO_WWWUPDATE) - @${SUP} ${SUPFLAGS} ${WWWSUPFILE} -.endif .endif .if defined(CVS_UPDATE) @cd ${.CURDIR} ; \ @@ -1038,6 +1043,13 @@ update: echo "--------------------------------------------------------------" ; \ echo ">>> Updating ${.CURDIR} from CVS repository" ${CVSROOT} ; \ echo "--------------------------------------------------------------" ; \ + echo "!! WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!" ; \ + echo "!! Update methods with ${SUP} are deprecated." ; \ + echo "!! Please see http://www.freebsd.org/handbook/svn.html" ; \ + echo "!! and convert your update method to SVN_UPDATE or" ; \ + echo "!! freebsd-update(8)." ; \ + echo "!! WARNING WARNING WARNING WARNING WARNING WARNING WARNING !!" ; \ + sleep 5 ; \ echo ${CVS} -R -q update ${CVSFLAGS} ; \ ${CVS} -R -q update ${CVSFLAGS} ; \ fi @@ -1117,7 +1129,7 @@ _lex= usr.bin/lex _yacc= usr.bin/yacc .endif -.if defined(DB_FROM_SRC) && ${BOOTSTRAPPING} < 1000026 +.if ${BOOTSTRAPPING} < 1000026 _nmtree= lib/libnetbsd \ usr.sbin/nmtree .endif Modified: projects/mtree/bin/ps/fmt.c ============================================================================== --- projects/mtree/bin/ps/fmt.c Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/bin/ps/fmt.c Tue Jan 22 16:52:04 2013 (r245794) @@ -123,7 +123,7 @@ fmt_argv(char **argv, char *cmd, char *t if (cp == NULL) errx(1, "malloc failed"); if (ap == NULL) { - if (showthreads && thread != NULL) { + if (thread != NULL) { asprintf(&ap, "%s/%s", cmd, thread); sprintf(cp, "[%.*s]", (int)maxlen, ap); free(ap); Modified: projects/mtree/bin/ps/ps.c ============================================================================== --- projects/mtree/bin/ps/ps.c Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/bin/ps/ps.c Tue Jan 22 16:52:04 2013 (r245794) @@ -1168,7 +1168,7 @@ fmt(char **(*fn)(kvm_t *, const struct k const char *s; s = fmt_argv((*fn)(kd, ki->ki_p, termwidth), comm, - ki->ki_p->ki_numthreads > 1 ? thread : NULL, maxlen); + showthreads && ki->ki_p->ki_numthreads > 1 ? thread : NULL, maxlen); return (s); } Modified: projects/mtree/bin/sh/TOUR ============================================================================== --- projects/mtree/bin/sh/TOUR Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/bin/sh/TOUR Tue Jan 22 16:52:04 2013 (r245794) @@ -33,10 +33,6 @@ programs is: There are undoubtedly too many of these. Mkinit searches all the C source files for entries looking like: - INIT { - x = 1; /* executed during initialization */ - } - RESET { x = 2; /* executed when the shell does a longjmp back to the main command loop */ Modified: projects/mtree/bin/sh/eval.c ============================================================================== --- projects/mtree/bin/sh/eval.c Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/bin/sh/eval.c Tue Jan 22 16:52:04 2013 (r245794) @@ -193,7 +193,9 @@ evaltree(union node *n, int flags) { int do_etest; union node *next; + struct stackmark smark; + setstackmark(&smark); do_etest = 0; if (n == NULL) { TRACE(("evaltree(NULL) called\n")); @@ -292,8 +294,10 @@ evaltree(union node *n, int flags) break; } n = next; + popstackmark(&smark); } while (n != NULL); out: + popstackmark(&smark); if (pendingsigs) dotrap(); if (eflag && exitstatus != 0 && do_etest) @@ -347,10 +351,8 @@ evalfor(union node *n, int flags) struct arglist arglist; union node *argp; struct strlist *sp; - struct stackmark smark; int status; - setstackmark(&smark); arglist.lastp = &arglist.list; for (argp = n->nfor.args ; argp ; argp = argp->narg.next) { oexitstatus = exitstatus; @@ -375,7 +377,6 @@ evalfor(union node *n, int flags) } } loopnest--; - popstackmark(&smark); exitstatus = status; } @@ -392,16 +393,13 @@ evalcase(union node *n) union node *cp; union node *patp; struct arglist arglist; - struct stackmark smark; - setstackmark(&smark); arglist.lastp = &arglist.list; oexitstatus = exitstatus; expandarg(n->ncase.expr, &arglist, EXP_TILDE); for (cp = n->ncase.cases ; cp ; cp = cp->nclist.next) { for (patp = cp->nclist.pattern ; patp ; patp = patp->narg.next) { if (casematch(patp, arglist.list->text)) { - popstackmark(&smark); while (cp->nclist.next && cp->type == NCLISTFALLTHRU && cp->nclist.body == NULL) @@ -415,7 +413,6 @@ evalcase(union node *n) } } } - popstackmark(&smark); exitstatus = 0; return (NULL); } @@ -610,7 +607,7 @@ evalbackcmd(union node *n, struct backcm { int pip[2]; struct job *jp; - struct stackmark smark; /* unnecessary */ + struct stackmark smark; struct jmploc jmploc; struct jmploc *savehandler; struct localvar *savelocalvars; @@ -751,7 +748,6 @@ safe_builtin(int idx, int argc, char **a static void evalcommand(union node *cmd, int flags, struct backcmd *backcmd) { - struct stackmark smark; union node *argp; struct arglist arglist; struct arglist varlist; @@ -778,7 +774,6 @@ evalcommand(union node *cmd, int flags, /* First expand the arguments. */ TRACE(("evalcommand(%p, %d) called\n", (void *)cmd, flags)); - setstackmark(&smark); arglist.lastp = &arglist.list; varlist.lastp = &varlist.list; varflag = 1; @@ -1149,7 +1144,6 @@ out: setvar("_", lastarg, 0); if (do_clearcmdentry) clearcmdentry(); - popstackmark(&smark); } Modified: projects/mtree/bin/sh/init.h ============================================================================== --- projects/mtree/bin/sh/init.h Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/bin/sh/init.h Tue Jan 22 16:52:04 2013 (r245794) @@ -33,5 +33,4 @@ * $FreeBSD$ */ -void init(void); void reset(void); Modified: projects/mtree/bin/sh/input.c ============================================================================== --- projects/mtree/bin/sh/input.c Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/bin/sh/input.c Tue Jan 22 16:52:04 2013 (r245794) @@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$"); #define EOF_NLEFT -99 /* value of parsenleft when EOF pushed back */ -MKINIT struct strpush { struct strpush *prev; /* preceding string on stack */ char *prevstring; @@ -78,7 +77,6 @@ struct strpush { * contains information about the current file being read. */ -MKINIT struct parsefile { struct parsefile *prev; /* preceding file on stack */ int linno; /* current line */ @@ -96,8 +94,11 @@ int plinno = 1; /* input line number * int parsenleft; /* copy of parsefile->nleft */ MKINIT int parselleft; /* copy of parsefile->lleft */ char *parsenextc; /* copy of parsefile->nextc */ -MKINIT struct parsefile basepf; /* top level input file */ -char basebuf[BUFSIZ + 1]; /* buffer for top level input file */ +static char basebuf[BUFSIZ + 1];/* buffer for top level input file */ +static struct parsefile basepf = { /* top level input file */ + .nextc = basebuf, + .buf = basebuf +}; static struct parsefile *parsefile = &basepf; /* current input file */ int whichprompt; /* 1 == PS1, 2 == PS2 */ @@ -111,12 +112,6 @@ static void popstring(void); INCLUDE "input.h" INCLUDE "error.h" -MKINIT char basebuf[]; - -INIT { - basepf.nextc = basepf.buf = basebuf; -} - RESET { popallfiles(); parselleft = parsenleft = 0; /* clear input buffer */ Modified: projects/mtree/bin/sh/main.c ============================================================================== --- projects/mtree/bin/sh/main.c Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/bin/sh/main.c Tue Jan 22 16:52:04 2013 (r245794) @@ -139,7 +139,7 @@ main(int argc, char *argv[]) #endif rootpid = getpid(); rootshell = 1; - init(); + initvar(); setstackmark(&smark); setstackmark(&smark2); procargs(argc, argv); Modified: projects/mtree/bin/sh/mkinit.c ============================================================================== --- projects/mtree/bin/sh/mkinit.c Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/bin/sh/mkinit.c Tue Jan 22 16:52:04 2013 (r245794) @@ -101,7 +101,7 @@ struct block { */ struct event { - const char *name; /* name of event (e.g. INIT) */ + const char *name; /* name of event (e.g. RESET) */ const char *routine; /* name of routine called on event */ const char *comment; /* comment describing routine */ struct text code; /* code for handling event */ @@ -114,11 +114,6 @@ char writer[] = "\ */\n\ \n"; -char init[] = "\ -/*\n\ - * Initialization code.\n\ - */\n"; - char reset[] = "\ /*\n\ * This routine is called when an error or an interrupt occurs in an\n\ @@ -127,7 +122,6 @@ char reset[] = "\ struct event event[] = { - { "INIT", "init", init, { NULL, 0, NULL, NULL } }, { "RESET", "reset", reset, { NULL, 0, NULL, NULL } }, { NULL, NULL, NULL, { NULL, 0, NULL, NULL } } }; Modified: projects/mtree/bin/sh/sh.1 ============================================================================== --- projects/mtree/bin/sh/sh.1 Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/bin/sh/sh.1 Tue Jan 22 16:52:04 2013 (r245794) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd January 14, 2013 +.Dd January 20, 2013 .Dt SH 1 .Os .Sh NAME @@ -138,10 +138,10 @@ variable to some file by placing the fol .Pa .profile in the home directory, substituting for -.Pa .shinit +.Pa .shrc the filename desired: .Pp -.Dl "ENV=$HOME/.shinit; export ENV" +.Dl "ENV=$HOME/.shrc; export ENV" .Pp The first non-option argument specified on the command line will be treated as the Modified: projects/mtree/bin/sh/var.c ============================================================================== --- projects/mtree/bin/sh/var.c Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/bin/sh/var.c Tue Jan 22 16:52:04 2013 (r245794) @@ -146,29 +146,11 @@ static int varequal(const char *, const static struct var *find_var(const char *, struct var ***, int *); static int localevar(const char *); -/* - * Initialize the variable symbol tables and import the environment. - */ - -#ifdef mkinit -INCLUDE "var.h" -MKINIT char **environ; -INIT { - char **envp; - - initvar(); - for (envp = environ ; *envp ; envp++) { - if (strchr(*envp, '=')) { - setvareq(*envp, VEXPORT|VTEXTFIXED); - } - } -} -#endif - +extern char **environ; /* - * This routine initializes the builtin variables. It is called when the - * shell is initialized. + * This routine initializes the builtin variables and imports the environment. + * It is called when the shell is initialized. */ void @@ -178,6 +160,7 @@ initvar(void) const struct varinit *ip; struct var *vp; struct var **vpp; + char **envp; for (ip = varinit ; (vp = ip->var) != NULL ; ip++) { if (find_var(ip->text, &vpp, &vp->name_len) != NULL) @@ -201,6 +184,11 @@ initvar(void) fmtstr(ppid, sizeof(ppid), "%d", (int)getppid()); setvarsafe("PPID", ppid, 0); } + for (envp = environ ; *envp ; envp++) { + if (strchr(*envp, '=')) { + setvareq(*envp, VEXPORT|VTEXTFIXED); + } + } } /* @@ -356,7 +344,7 @@ setvareq(char *s, int flags) * a regular variable function callback, but why bother? * * Note: this assumes iflag is not set to 1 initially. - * As part of init(), this is called before arguments + * As part of initvar(), this is called before arguments * are looked at. */ if ((vp == &vmpath || (vp == &vmail && ! mpathset())) && Modified: projects/mtree/contrib/compiler-rt/LICENSE.TXT ============================================================================== --- projects/mtree/contrib/compiler-rt/LICENSE.TXT Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/contrib/compiler-rt/LICENSE.TXT Tue Jan 22 16:52:04 2013 (r245794) @@ -14,7 +14,7 @@ Full text of the relevant licenses is in University of Illinois/NCSA Open Source License -Copyright (c) 2009-2012 by the contributors listed in CREDITS.TXT +Copyright (c) 2009-2013 by the contributors listed in CREDITS.TXT All rights reserved. @@ -55,7 +55,7 @@ SOFTWARE. ============================================================================== -Copyright (c) 2009-2012 by the contributors listed in CREDITS.TXT +Copyright (c) 2009-2013 by the contributors listed in CREDITS.TXT Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal Modified: projects/mtree/contrib/compiler-rt/lib/arm/aeabi_uldivmod.S ============================================================================== --- projects/mtree/contrib/compiler-rt/lib/arm/aeabi_uldivmod.S Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/contrib/compiler-rt/lib/arm/aeabi_uldivmod.S Tue Jan 22 16:52:04 2013 (r245794) @@ -27,4 +27,5 @@ DEFINE_COMPILERRT_FUNCTION(__aeabi_uldiv ldr r2, [sp, #8] ldr r3, [sp, #12] add sp, sp, #16 - pop {r11, pc} \ No newline at end of file + pop {r11, pc} + Modified: projects/mtree/contrib/compiler-rt/lib/arm/divsi3.S ============================================================================== --- projects/mtree/contrib/compiler-rt/lib/arm/divsi3.S Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/contrib/compiler-rt/lib/arm/divsi3.S Tue Jan 22 16:52:04 2013 (r245794) @@ -25,7 +25,16 @@ // Ok, APCS and AAPCS agree on 32 bit args, so it's safe to use the same routine. DEFINE_AEABI_FUNCTION_ALIAS(__aeabi_idiv, __divsi3) DEFINE_COMPILERRT_FUNCTION(__divsi3) - ESTABLISH_FRAME +#if __ARM_ARCH_7S__ + tst r1,r1 + beq LOCAL_LABEL(divzero) + sdiv r0, r0, r1 + bx lr +LOCAL_LABEL(divzero): + mov r0,#0 + bx lr +#else +ESTABLISH_FRAME // Set aside the sign of the quotient. eor r4, r0, r1 // Take absolute value of a and b via abs(x) = (x^(x >> 31)) - (x >> 31). @@ -39,3 +48,4 @@ DEFINE_COMPILERRT_FUNCTION(__divsi3) eor r0, r0, r4, asr #31 sub r0, r0, r4, asr #31 CLEAR_FRAME_AND_RETURN +#endif Modified: projects/mtree/contrib/compiler-rt/lib/arm/udivsi3.S ============================================================================== --- projects/mtree/contrib/compiler-rt/lib/arm/udivsi3.S Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/contrib/compiler-rt/lib/arm/udivsi3.S Tue Jan 22 16:52:04 2013 (r245794) @@ -33,6 +33,15 @@ // Ok, APCS and AAPCS agree on 32 bit args, so it's safe to use the same routine. DEFINE_AEABI_FUNCTION_ALIAS(__aeabi_uidiv, __udivsi3) DEFINE_COMPILERRT_FUNCTION(__udivsi3) +#if __ARM_ARCH_7S__ + tst r1,r1 + beq LOCAL_LABEL(divzero) + udiv r0, r0, r1 + bx lr + LOCAL_LABEL(divzero): + mov r0,#0 + bx lr +#else // We use a simple digit by digit algorithm; before we get into the actual // divide loop, we must calculate the left-shift amount necessary to align // the MSB of the divisor with that of the dividend (If this shift is @@ -78,3 +87,4 @@ LOCAL_LABEL(return): // Move the quotient to r0 and return. mov r0, q CLEAR_FRAME_AND_RETURN +#endif Modified: projects/mtree/contrib/compiler-rt/lib/cmpdi2.c ============================================================================== --- projects/mtree/contrib/compiler-rt/lib/cmpdi2.c Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/contrib/compiler-rt/lib/cmpdi2.c Tue Jan 22 16:52:04 2013 (r245794) @@ -36,3 +36,16 @@ __cmpdi2(di_int a, di_int b) return 2; return 1; } + +#ifdef __ARM_EABI__ +/* Returns: if (a < b) returns -1 +* if (a == b) returns 0 +* if (a > b) returns 1 +*/ +COMPILER_RT_ABI si_int +__aeabi_lcmp(di_int a, di_int b) +{ + return __cmpdi2(a, b) - 1; +} +#endif + Modified: projects/mtree/contrib/compiler-rt/lib/fixsfdi.c ============================================================================== --- projects/mtree/contrib/compiler-rt/lib/fixsfdi.c Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/contrib/compiler-rt/lib/fixsfdi.c Tue Jan 22 16:52:04 2013 (r245794) @@ -23,7 +23,7 @@ /* seee eeee emmm mmmm mmmm mmmm mmmm mmmm */ -ARM_EABI_FNALIAS(d2lz, fixsfdi) +ARM_EABI_FNALIAS(f2lz, fixsfdi) COMPILER_RT_ABI di_int __fixsfdi(float a) Modified: projects/mtree/contrib/compiler-rt/lib/int_endianness.h ============================================================================== --- projects/mtree/contrib/compiler-rt/lib/int_endianness.h Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/contrib/compiler-rt/lib/int_endianness.h Tue Jan 22 16:52:04 2013 (r245794) @@ -31,7 +31,7 @@ /* .. */ -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__minix) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__minix) #include <sys/endian.h> #if _BYTE_ORDER == _BIG_ENDIAN @@ -44,6 +44,19 @@ #endif /* *BSD */ +#if defined(__OpenBSD__) || defined(__Bitrig__) +#include <machine/endian.h> + +#if _BYTE_ORDER == _BIG_ENDIAN +#define _YUGA_LITTLE_ENDIAN 0 +#define _YUGA_BIG_ENDIAN 1 +#elif _BYTE_ORDER == _LITTLE_ENDIAN +#define _YUGA_LITTLE_ENDIAN 1 +#define _YUGA_BIG_ENDIAN 0 +#endif /* _BYTE_ORDER */ + +#endif /* OpenBSD and Bitrig. */ + /* .. */ /* Mac OSX has __BIG_ENDIAN__ or __LITTLE_ENDIAN__ automatically set by the compiler (at least with GCC) */ Modified: projects/mtree/contrib/compiler-rt/lib/int_lib.h ============================================================================== --- projects/mtree/contrib/compiler-rt/lib/int_lib.h Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/contrib/compiler-rt/lib/int_lib.h Tue Jan 22 16:52:04 2013 (r245794) @@ -25,7 +25,15 @@ #if __ARM_EABI__ # define ARM_EABI_FNALIAS(aeabi_name, name) \ void __aeabi_##aeabi_name() __attribute__((alias("__" #name))); -# define COMPILER_RT_ABI __attribute__((pcs("aapcs"))) + +# if !defined(__clang__) && defined(__GNUC__) && \ + (__GNUC__ < 4 || __GNUC__ == 4 && __GNUC_MINOR__ < 5) +/* The pcs attribute was introduced in GCC 4.5.0 */ +# define COMPILER_RT_ABI +# else +# define COMPILER_RT_ABI __attribute__((pcs("aapcs"))) +# endif + #else # define ARM_EABI_FNALIAS(aeabi_name, name) # define COMPILER_RT_ABI Modified: projects/mtree/contrib/compiler-rt/lib/ucmpdi2.c ============================================================================== --- projects/mtree/contrib/compiler-rt/lib/ucmpdi2.c Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/contrib/compiler-rt/lib/ucmpdi2.c Tue Jan 22 16:52:04 2013 (r245794) @@ -36,3 +36,16 @@ __ucmpdi2(du_int a, du_int b) return 2; return 1; } + +#ifdef __ARM_EABI__ +/* Returns: if (a < b) returns -1 +* if (a == b) returns 0 +* if (a > b) returns 1 +*/ +COMPILER_RT_ABI si_int +__aeabi_ulcmp(di_int a, di_int b) +{ + return __ucmpdi2(a, b) - 1; +} +#endif + Modified: projects/mtree/contrib/libcxxrt/exception.cc ============================================================================== --- projects/mtree/contrib/libcxxrt/exception.cc Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/contrib/libcxxrt/exception.cc Tue Jan 22 16:52:04 2013 (r245794) @@ -801,7 +801,7 @@ extern "C" void __cxa_decrement_exceptio */ extern "C" void __cxa_rethrow() { - __cxa_thread_info *ti = thread_info_fast(); + __cxa_thread_info *ti = thread_info(); __cxa_eh_globals *globals = &ti->globals; // Note: We don't remove this from the caught list here, because // __cxa_end_catch will be called when we unwind out of the try block. We Modified: projects/mtree/gnu/usr.bin/gdb/kgdb/main.c ============================================================================== --- projects/mtree/gnu/usr.bin/gdb/kgdb/main.c Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/gnu/usr.bin/gdb/kgdb/main.c Tue Jan 22 16:52:04 2013 (r245794) @@ -333,11 +333,24 @@ main(int argc, char *argv[]) args.argv = malloc(sizeof(char *)); args.argv[0] = argv[0]; - while ((ch = getopt(argc, argv, "ac:d:fn:qr:vw")) != -1) { + while ((ch = getopt(argc, argv, "ab:c:d:fn:qr:vw")) != -1) { switch (ch) { case 'a': annotation_level++; break; + case 'b': + { + int i; + char *p; + + i = strtol (optarg, &p, 0); + if (i == 0 && p == optarg) + warnx("warning: could not set baud rate to `%s'.\n", + optarg); + else + baud_rate = i; + } + break; case 'c': /* use given core file. */ if (vmcore != NULL) { warnx("option %c: can only be specified once", Modified: projects/mtree/gnu/usr.bin/grep/grep.c ============================================================================== --- projects/mtree/gnu/usr.bin/grep/grep.c Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/gnu/usr.bin/grep/grep.c Tue Jan 22 16:52:04 2013 (r245794) @@ -304,7 +304,7 @@ reset (int fd, char const *file, struct if (directories == SKIP_DIRECTORIES && S_ISDIR (stats->stat.st_mode)) return 0; #ifndef DJGPP - if (devices == SKIP_DEVICES && (S_ISCHR(stats->stat.st_mode) || S_ISBLK(stats->stat.st_mode) || S_ISSOCK(stats->stat.st_mode))) + if (devices == SKIP_DEVICES && (S_ISCHR(stats->stat.st_mode) || S_ISBLK(stats->stat.st_mode) || S_ISSOCK(stats->stat.st_mode) || S_ISFIFO(stats->stat.st_mode))) #else if (devices == SKIP_DEVICES && (S_ISCHR(stats->stat.st_mode) || S_ISBLK(stats->stat.st_mode))) #endif @@ -942,6 +942,7 @@ grepfile (char const *file, struct stats int desc; int count; int status; + int flags; if (! file) { @@ -950,7 +951,7 @@ grepfile (char const *file, struct stats } else { - while ((desc = open (file, O_RDONLY)) < 0 && errno == EINTR) + while ((desc = open (file, O_RDONLY | O_NONBLOCK)) < 0 && errno == EINTR) continue; if (desc < 0) @@ -990,6 +991,9 @@ grepfile (char const *file, struct stats return 1; } + flags = fcntl(desc, F_GETFL); + flags &= ~O_NONBLOCK; + fcntl(desc, F_SETFL, flags); filename = file; } Modified: projects/mtree/lib/Makefile ============================================================================== --- projects/mtree/lib/Makefile Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/lib/Makefile Tue Jan 22 16:52:04 2013 (r245794) @@ -115,6 +115,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ ${_libusbhid} \ ${_libusb} \ ${_libvgl} \ + ${_libvmmapi} \ libwrap \ liby \ libz \ @@ -198,6 +199,10 @@ _libproc= libproc _librtld_db= librtld_db .endif +.if ${MACHINE_CPUARCH} == "amd64" +_libvmmapi= libvmmapi +.endif + .if ${MACHINE_CPUARCH} == "ia64" _libefi= libefi .endif Modified: projects/mtree/lib/libc/arm/Makefile.inc ============================================================================== --- projects/mtree/lib/libc/arm/Makefile.inc Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/lib/libc/arm/Makefile.inc Tue Jan 22 16:52:04 2013 (r245794) @@ -8,3 +8,11 @@ SOFTFLOAT_BITS=32 # Long double is just double precision. MDSRCS+=machdep_ldisd.c SYM_MAPS+=${.CURDIR}/arm/Symbol.map + +.if ${MK_ARM_EABI} == "no" +# This contains the symbols that were removed when moving to the ARM EABI +SYM_MAPS+=${.CURDIR}/arm/Symbol_oabi.map +.else +.include "${.CURDIR}/arm/aeabi/Makefile.inc" +.endif + Modified: projects/mtree/lib/libc/arm/SYS.h ============================================================================== --- projects/mtree/lib/libc/arm/SYS.h Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/lib/libc/arm/SYS.h Tue Jan 22 16:52:04 2013 (r245794) @@ -39,7 +39,15 @@ #include <sys/syscall.h> #include <machine/swi.h> +#ifdef __ARM_EABI__ +#define SYSTRAP(x) \ + mov ip, r7; \ + ldr r7, =SYS_ ## x; \ + swi 0; \ + mov r7, ip +#else #define SYSTRAP(x) swi 0 | SYS_ ## x +#endif #define CERROR _C_LABEL(cerror) #define CURBRK _C_LABEL(curbrk) Modified: projects/mtree/lib/libc/arm/Symbol.map ============================================================================== --- projects/mtree/lib/libc/arm/Symbol.map Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/lib/libc/arm/Symbol.map Tue Jan 22 16:52:04 2013 (r245794) @@ -46,10 +46,6 @@ FBSDprivate_1.0 { _set_tp; __aeabi_read_tp; ___longjmp; - __umodsi3; - __modsi3; - __udivsi3; - __divsi3; __makecontext; __longjmp; signalcontext; Copied: projects/mtree/lib/libc/arm/Symbol_oabi.map (from r245793, head/lib/libc/arm/Symbol_oabi.map) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mtree/lib/libc/arm/Symbol_oabi.map Tue Jan 22 16:52:04 2013 (r245794, copy of r245793, head/lib/libc/arm/Symbol_oabi.map) @@ -0,0 +1,16 @@ +/* + * $FreeBSD$ + */ + +/* + * This only needs to contain symbols that are not listed in + * symbol maps from other parts of libc (i.e., not found in + * stdlib/Symbol.map, string/Symbol.map, sys/Symbol.map, ...) + * and are not used in the ARM EABI. + */ +FBSDprivate_1.0 { + __umodsi3; + __modsi3; + __udivsi3; + __divsi3; +}; Modified: projects/mtree/lib/libc/arm/gen/Makefile.inc ============================================================================== --- projects/mtree/lib/libc/arm/gen/Makefile.inc Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/lib/libc/arm/gen/Makefile.inc Tue Jan 22 16:52:04 2013 (r245794) @@ -3,4 +3,8 @@ SRCS+= _ctx_start.S _setjmp.S _set_tp.c alloca.S fabs.c \ getcontextx.c infinity.c ldexp.c makecontext.c \ - __aeabi_read_tp.S setjmp.S signalcontext.c sigsetjmp.S divsi3.S flt_rounds.c + __aeabi_read_tp.S setjmp.S signalcontext.c sigsetjmp.S flt_rounds.c + +.if ${MK_ARM_EABI} == "no" +SRCS+= divsi3.S +.endif Modified: projects/mtree/lib/libc/quad/Makefile.inc ============================================================================== --- projects/mtree/lib/libc/quad/Makefile.inc Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/lib/libc/quad/Makefile.inc Tue Jan 22 16:52:04 2013 (r245794) @@ -8,6 +8,10 @@ SRCS+= cmpdi2.c divdi3.c moddi3.c qdivrem.c ucmpdi2.c udivdi3.c umoddi3.c +.elif ${LIBC_ARCH} == "arm" && ${MK_ARM_EABI} != "no" + +SRCS+= adddi3.c anddi3.c floatunsdidf.c iordi3.c lshldi3.c notdi2.c \ + qdivrem.c subdi3.c xordi3.c .else SRCS+= adddi3.c anddi3.c ashldi3.c ashrdi3.c cmpdi2.c divdi3.c fixdfdi.c \ Modified: projects/mtree/lib/libc/sys/kqueue.2 ============================================================================== --- projects/mtree/lib/libc/sys/kqueue.2 Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/lib/libc/sys/kqueue.2 Tue Jan 22 16:52:04 2013 (r245794) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 15, 2012 +.Dd January 21, 2013 .Dt KQUEUE 2 .Os .Sh NAME @@ -417,7 +417,9 @@ and facilities, and has a lower precedence. The filter will record all attempts to deliver a signal to a process, even if the signal has -been marked as SIG_IGN. +been marked as SIG_IGN, except for the +.Dv SIGCHLD +signal, which, if ignored, won't be recorded by the filter. Event notification happens after normal signal delivery processing. .Va data Modified: projects/mtree/lib/libcompiler_rt/Makefile ============================================================================== --- projects/mtree/lib/libcompiler_rt/Makefile Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/lib/libcompiler_rt/Makefile Tue Jan 22 16:52:04 2013 (r245794) @@ -136,18 +136,22 @@ SRCF+= adddf3 \ addsf3 \ divdf3 \ divsf3 \ - divsi3 \ extendsfdf2 \ fixdfsi \ fixsfsi \ floatsidf \ floatsisf \ - modsi3 \ muldf3 \ mulsf3 \ subdf3 \ subsf3 \ - truncdfsf2 \ + truncdfsf2 +.endif + +.if ${MACHINE_CPUARCH} != "mips" && \ + (${MACHINE_CPUARCH} != "arm" || ${MK_ARM_EABI} != "no") +SRCF+= divsi3 \ + modsi3 \ udivsi3 \ umodsi3 .endif @@ -181,6 +185,13 @@ SRCS+= ${file}.c . endif .endfor +.if ${MACHINE_CPUARCH} == "arm" && ${MK_ARM_EABI} != "no" +SRCS+= aeabi_idivmod.S \ + aeabi_ldivmod.S \ + aeabi_uidivmod.S \ + aeabi_uldivmod.S +.endif + .if ${MACHINE_CPUARCH} != "mips" . if ${MK_INSTALLLIB} != "no" SYMLINKS+=libcompiler_rt.a ${LIBDIR}/libgcc.a Modified: projects/mtree/lib/libthr/thread/thr_init.c ============================================================================== --- projects/mtree/lib/libthr/thread/thr_init.c Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/lib/libthr/thread/thr_init.c Tue Jan 22 16:52:04 2013 (r245794) @@ -363,6 +363,12 @@ _libpthread_init(struct pthread *curthre _thr_signal_init(); if (_thread_event_mask & TD_CREATE) _thr_report_creation(curthread, curthread); + /* + * Always use our rtld lock implementation. + * It is faster because it postpones signal handlers + * instead of calling sigprocmask(2). + */ + _thr_rtld_init(); } } Modified: projects/mtree/lib/libthr/thread/thr_kern.c ============================================================================== --- projects/mtree/lib/libthr/thread/thr_kern.c Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/lib/libthr/thread/thr_kern.c Tue Jan 22 16:52:04 2013 (r245794) @@ -57,11 +57,6 @@ _thr_setthreaded(int threaded) return (0); __isthreaded = threaded; - if (threaded != 0) { - _thr_rtld_init(); - } else { - _thr_rtld_fini(); - } return (0); } Modified: projects/mtree/libexec/rtld-elf/Makefile ============================================================================== --- projects/mtree/libexec/rtld-elf/Makefile Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/libexec/rtld-elf/Makefile Tue Jan 22 16:52:04 2013 (r245794) @@ -42,6 +42,16 @@ LDFLAGS+= -shared -Wl,-Bsymbolic DPADD= ${LIBC_PIC} LDADD= -lc_pic +.if ${MACHINE_CPUARCH} == "arm" && ${MK_ARM_EABI} != "no" +# Some of the required math functions (div & mod) are implemented in libgcc +# on ARM. The library also needs to be placed first to be correctly linked. +# As some of the functions are used before we have shared libraries. +DPADD+= ${LIBGCC} +LDADD+= -lgcc +.endif + + + .if ${MK_SYMVER} == "yes" LIBCDIR= ${TOPSRCDIR}/lib/libc VERSION_DEF= ${LIBCDIR}/Versions.def Modified: projects/mtree/release/rc.local ============================================================================== --- projects/mtree/release/rc.local Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/release/rc.local Tue Jan 22 16:52:04 2013 (r245794) @@ -45,6 +45,16 @@ else fi export TERM +if [ -f /etc/installerconfig ]; then + if bsdinstall script /etc/installerconfig; then + dialog --backtitle "FreeBSD Installer" --title "Complete" --no-cancel --ok-label "Reboot" --pause "Installation of FreeBSD complete! Rebooting in 10 seconds" 10 30 10 + reboot + else + dialog --backtitle "FreeBSD Installer" --title "Error" --textbox /tmp/bsdinstall_log 0 0 + fi + exit +fi + dialog --backtitle "FreeBSD Installer" --title "Welcome" --extra-button --extra-label "Shell" --ok-label "Install" --cancel-label "Live CD" --yesno "Welcome to FreeBSD! Would you like to begin an installation or use the live CD?" 0 0 case $? in Modified: projects/mtree/sbin/newfs_msdos/newfs_msdos.c ============================================================================== --- projects/mtree/sbin/newfs_msdos/newfs_msdos.c Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/sbin/newfs_msdos/newfs_msdos.c Tue Jan 22 16:52:04 2013 (r245794) @@ -808,7 +808,7 @@ getdiskinfo(int fd, const char *fname, c struct stat st; if (fstat(fd, &st)) - err(1, "Cannot get disk size"); + err(1, "cannot get disk size"); /* create a fake geometry for a file image */ ms = st.st_size; dlp.d_secsize = 512; @@ -832,18 +832,18 @@ getdiskinfo(int fd, const char *fname, c if (ioctl(fd, DIOCGDINFO, &dlp) == -1) { if (bpb->bpbBytesPerSec == 0 && ioctl(fd, DIOCGSECTORSIZE, &dlp.d_secsize) == -1) - errx(1, "Cannot get sector size, %s", strerror(errno)); + err(1, "cannot get sector size"); dlp.d_secperunit = ms / dlp.d_secsize; if (bpb->bpbSecPerTrack == 0 && ioctl(fd, DIOCGFWSECTORS, &dlp.d_nsectors) == -1) { - warnx("Cannot get number of sectors per track, %s", strerror(errno)); + warn("cannot get number of sectors per track"); dlp.d_nsectors = 63; } if (bpb->bpbHeads == 0 && ioctl(fd, DIOCGFWHEADS, &dlp.d_ntracks) == -1) { - warnx("Cannot get number of heads, %s", strerror(errno)); + warn("cannot get number of heads"); if (dlp.d_secperunit <= 63*1*1024) dlp.d_ntracks = 1; else if (dlp.d_secperunit <= 63*16*1024) Modified: projects/mtree/share/man/man4/Makefile ============================================================================== --- projects/mtree/share/man/man4/Makefile Tue Jan 22 16:23:08 2013 (r245793) +++ projects/mtree/share/man/man4/Makefile Tue Jan 22 16:52:04 2013 (r245794) @@ -70,6 +70,7 @@ MAN= aac.4 \ bce.4 \ bfe.4 \ bge.4 \ + ${_bhyve.4} \ bktr.4 \ blackhole.4 \ bpf.4 \ @@ -784,6 +785,7 @@ MLINKS+=lindev.4 full.4 .endif .if ${MACHINE_CPUARCH} == "amd64" +_bhyve.4= bhyve.4 _qlxgb.4= qlxgb.4 _sfxge.4= sfxge.4 Copied: projects/mtree/share/man/man4/bhyve.4 (from r245793, head/share/man/man4/bhyve.4) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/mtree/share/man/man4/bhyve.4 Tue Jan 22 16:52:04 2013 (r245794, copy of r245793, head/share/man/man4/bhyve.4) @@ -0,0 +1,68 @@ +.\" +.\" Copyright (c) 2012 NetApp Inc +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd January 5, 2013 +.Dt BHYVE 4 +.Os +.Sh NAME +.Nm bhyve +.Nd virtual machine monitor +.Sh SYNOPSIS +.Cd "/usr/sbin/bhyve" +.Cd "/usr/sbin/bhyveload" +.Cd "/usr/sbin/bhyvectl" +.Cd "/boot/kernel/vmm.ko" +.Sh DESCRIPTION +.Nm +is a virtual machine monitor that is hosted by FreeBSD. It is used to host +unmodified guest operating systems on top of FreeBSD. +.Pp +.Nm +relies heavily on hardware assist provided by the CPU and chipset to virtualize +processor and memory resources. +.Sh SEE ALSO +.Xr bhyve 8 , +.Xr bhyveload 8 , *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301221652.r0MGq5NX036110>