Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Catch up with head.
  • Loading branch information
hrs-allbsd committed Dec 10, 2013
2 parents 09825e6 + 2787af4 commit 70078aa
Show file tree
Hide file tree
Showing 511 changed files with 28,451 additions and 5,518 deletions.
3 changes: 3 additions & 0 deletions ObsoleteFiles.inc
Expand Up @@ -38,6 +38,9 @@
# xargs -n1 | sort | uniq -d;
# done

# 20131202: libcapsicum and libcasper moved to /lib/
OLD_LIBS+=usr/lib/libcapsicum.so.0
OLD_LIBS+=usr/lib/libcasper.so.0
# 20131109: extattr(2) mlinks fixed
OLD_FILES+=usr/share/man/man2/extattr_delete_list.2.gz
OLD_FILES+=usr/share/man/man2/extattr_get_list.2.gz
Expand Down
75 changes: 41 additions & 34 deletions bin/sh/eval.c
Expand Up @@ -750,6 +750,45 @@ isdeclarationcmd(struct narg *arg)
(have_command || !isfunc("local"))));
}

static void
xtracecommand(struct arglist *varlist, struct arglist *arglist)
{
struct strlist *sp;
char sep = 0;
const char *p, *ps4;

ps4 = expandstr(ps4val());
out2str(ps4 != NULL ? ps4 : ps4val());
for (sp = varlist->list ; sp ; sp = sp->next) {
if (sep != 0)
out2c(' ');
p = strchr(sp->text, '=');
if (p != NULL) {
p++;
outbin(sp->text, p - sp->text, out2);
out2qstr(p);
} else
out2qstr(sp->text);
sep = ' ';
}
for (sp = arglist->list ; sp ; sp = sp->next) {
if (sep != 0)
out2c(' ');
/* Disambiguate command looking like assignment. */
if (sp == arglist->list &&
strchr(sp->text, '=') != NULL &&
strchr(sp->text, '\'') == NULL) {
out2c('\'');
out2str(sp->text);
out2c('\'');
} else
out2qstr(sp->text);
sep = ' ';
}
out2c('\n');
flushout(&errout);
}

/*
* Check if a builtin can safely be executed in the same process,
* even though it should be in a subshell (command substitution).
Expand Down Expand Up @@ -847,40 +886,8 @@ evalcommand(union node *cmd, int flags, struct backcmd *backcmd)
argv -= argc;

/* Print the command if xflag is set. */
if (xflag) {
char sep = 0;
const char *p, *ps4;
ps4 = expandstr(ps4val());
out2str(ps4 != NULL ? ps4 : ps4val());
for (sp = varlist.list ; sp ; sp = sp->next) {
if (sep != 0)
out2c(' ');
p = strchr(sp->text, '=');
if (p != NULL) {
p++;
outbin(sp->text, p - sp->text, out2);
out2qstr(p);
} else
out2qstr(sp->text);
sep = ' ';
}
for (sp = arglist.list ; sp ; sp = sp->next) {
if (sep != 0)
out2c(' ');
/* Disambiguate command looking like assignment. */
if (sp == arglist.list &&
strchr(sp->text, '=') != NULL &&
strchr(sp->text, '\'') == NULL) {
out2c('\'');
out2str(sp->text);
out2c('\'');
} else
out2qstr(sp->text);
sep = ' ';
}
out2c('\n');
flushout(&errout);
}
if (xflag)
xtracecommand(&varlist, &arglist);

/* Now locate the command. */
if (argc == 0) {
Expand Down
13 changes: 6 additions & 7 deletions bin/test/test.c
Expand Up @@ -172,7 +172,7 @@ static char **t_wp;
static int parenlevel;

static int aexpr(enum token);
static int binop(void);
static int binop(enum token);
static int equalf(const char *, const char *);
static int filstat(char *, enum token);
static int getn(const char *);
Expand Down Expand Up @@ -312,21 +312,20 @@ primary(enum token n)
}
}

if (TOKEN_TYPE(t_lex(nargc > 0 ? t_wp[1] : NULL)) == BINOP)
return binop();
nn = t_lex(nargc > 0 ? t_wp[1] : NULL);
if (TOKEN_TYPE(nn) == BINOP)
return binop(nn);

return strlen(*t_wp) > 0;
}

static int
binop(void)
binop(enum token n)
{
const char *opnd1, *op, *opnd2;
enum token n;

opnd1 = *t_wp;
op = nargc > 0 ? t_wp[1] : NULL;
n = t_lex(nargc > 0 ? (--nargc, *++t_wp) : NULL);
op = nargc > 0 ? (--nargc, *++t_wp) : NULL;

if ((opnd2 = nargc > 0 ? (--nargc, *++t_wp) : NULL) == NULL)
syntax(op, "argument expected");
Expand Down
Expand Up @@ -64,7 +64,7 @@ child=$!
# ksh doing work. (This actually goes one step further and assumes that we
# catch some non-static function in ksh.)
#
script | tee /dev/fd/2 | grep 'ksh`[a-zA-Z_]' > /dev/null
script | tee /dev/fd/2 | egrep 'ksh(93)?`[a-zA-Z_]' > /dev/null
status=$?

kill $child
Expand Down
Expand Up @@ -62,7 +62,7 @@ child=$!
#
# The only thing we can be sure of here is that ksh is doing some work.
#
script | tee /dev/fd/2 | grep -w ksh > /dev/null
script | tee /dev/fd/2 | egrep -w 'ksh(93)?' > /dev/null
status=$?

kill $child
Expand Down
Expand Up @@ -63,7 +63,7 @@ child=$!
# This test is essentially the same as that in the ufunc test; see that
# test for the rationale.
#
script | tee /dev/fd/2 | grep 'ksh`[a-zA-Z_]' > /dev/null
script | tee /dev/fd/2 | egrep 'ksh(93)?`[a-zA-Z_]' > /dev/null
status=$?

kill $child
Expand Down
2 changes: 1 addition & 1 deletion cddl/contrib/opensolaris/cmd/zpool/zpool-features.7
Expand Up @@ -259,7 +259,7 @@ configuration.
.El
.Pp
This features allows ZFS to maintain more information about how free space
is organized within the pool. If this feature is
is organized within the pool. If this feature is
.Sy enabled ,
ZFS will
set this feature to
Expand Down
6 changes: 6 additions & 0 deletions cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
Expand Up @@ -1702,6 +1702,12 @@ show_import(nvlist_t *config)
"resilvered.\n"));
break;

case ZPOOL_STATUS_NON_NATIVE_ASHIFT:
(void) printf(gettext("status: One or more devices were "
"configured to use a non-native block size.\n"
"\tExpect reduced performance.\n"));
break;

default:
/*
* No other status can be seen when importing pools.
Expand Down
18 changes: 10 additions & 8 deletions cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
Expand Up @@ -1709,8 +1709,6 @@ dtrace_program_link(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t dflags,
*/
return (0);
}
/* XXX Should get a temp file name here. */
snprintf(tfile, sizeof(tfile), "%s.tmp", file);
#endif

/*
Expand Down Expand Up @@ -1785,9 +1783,11 @@ dtrace_program_link(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t dflags,
"failed to open %s: %s", file, strerror(errno)));
}
#else
if ((fd = open(tfile, O_RDWR | O_CREAT | O_TRUNC, 0666)) == -1)
snprintf(tfile, sizeof(tfile), "%s.XXXXXX", file);
if ((fd = mkstemp(tfile)) == -1)
return (dt_link_error(dtp, NULL, -1, NULL,
"failed to open %s: %s", tfile, strerror(errno)));
"failed to create temporary file %s: %s",
tfile, strerror(errno)));
#endif

/*
Expand Down Expand Up @@ -1830,13 +1830,15 @@ dtrace_program_link(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, uint_t dflags,
status = dump_elf32(dtp, dof, fd);

if (status != 0 || lseek(fd, 0, SEEK_SET) != 0) {
#else
/* We don't write the ELF header, just the DOF section */
if (dt_write(dtp, fd, dof, dof->dofh_filesz) < dof->dofh_filesz) {
#endif
return (dt_link_error(dtp, NULL, -1, NULL,
"failed to write %s: %s", file, strerror(errno)));
}
#else
/* We don't write the ELF header, just the DOF section */
if (dt_write(dtp, fd, dof, dof->dofh_filesz) < dof->dofh_filesz)
return (dt_link_error(dtp, NULL, -1, NULL,
"failed to write %s: %s", tfile, strerror(errno)));
#endif

if (!dtp->dt_lazyload) {
#if defined(sun)
Expand Down
8 changes: 0 additions & 8 deletions cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
Expand Up @@ -487,33 +487,25 @@ static const dt_ident_t _dtrace_globals[] = {
DT_VERS_1_0, &dt_idops_func, "void(...)" },
{ "typeref", DT_IDENT_FUNC, 0, DIF_SUBR_TYPEREF, DT_ATTR_STABCMN, DT_VERS_1_1,
&dt_idops_func, "uintptr_t *(void *, size_t, string, size_t)" },
#if defined(sun)
{ "uaddr", DT_IDENT_ACTFUNC, 0, DT_ACT_UADDR, DT_ATTR_STABCMN,
DT_VERS_1_2, &dt_idops_func, "_usymaddr(uintptr_t)" },
#endif
{ "ucaller", DT_IDENT_SCALAR, 0, DIF_VAR_UCALLER, DT_ATTR_STABCMN,
DT_VERS_1_2, &dt_idops_type, "uint64_t" },
#if defined(sun)
{ "ufunc", DT_IDENT_ACTFUNC, 0, DT_ACT_USYM, DT_ATTR_STABCMN,
DT_VERS_1_2, &dt_idops_func, "_usymaddr(uintptr_t)" },
#endif
{ "uid", DT_IDENT_SCALAR, 0, DIF_VAR_UID, DT_ATTR_STABCMN, DT_VERS_1_0,
&dt_idops_type, "uid_t" },
#if defined(sun)
{ "umod", DT_IDENT_ACTFUNC, 0, DT_ACT_UMOD, DT_ATTR_STABCMN,
DT_VERS_1_2, &dt_idops_func, "_usymaddr(uintptr_t)" },
#endif
{ "uregs", DT_IDENT_ARRAY, 0, DIF_VAR_UREGS, DT_ATTR_STABCMN, DT_VERS_1_0,
&dt_idops_regs, NULL },
{ "ustack", DT_IDENT_ACTFUNC, 0, DT_ACT_USTACK, DT_ATTR_STABCMN, DT_VERS_1_0,
&dt_idops_func, "stack(...)" },
{ "ustackdepth", DT_IDENT_SCALAR, 0, DIF_VAR_USTACKDEPTH,
DT_ATTR_STABCMN, DT_VERS_1_2,
&dt_idops_type, "uint32_t" },
#if defined(sun)
{ "usym", DT_IDENT_ACTFUNC, 0, DT_ACT_USYM, DT_ATTR_STABCMN,
DT_VERS_1_2, &dt_idops_func, "_usymaddr(uintptr_t)" },
#endif
{ "vtimestamp", DT_IDENT_SCALAR, 0, DIF_VAR_VTIMESTAMP,
DT_ATTR_STABCMN, DT_VERS_1_0,
&dt_idops_type, "uint64_t" },
Expand Down
54 changes: 53 additions & 1 deletion contrib/gcc/ChangeLog.gcc43
Expand Up @@ -45,18 +45,40 @@
* flags.h (force_align_functions_log): Delete.
* toplev.c (force_align_functions_log): Delete.

2007-06-28 Geoffrey Keating <geoffk@apple.com> (r126088)

* doc/invoke.texi (C++ Dialect Options): Document
fvisibility-ms-compat.
* c.opt (fvisibility-ms-compat): New.

2007-06-05 Joerg Wunsch <j.gnu@uriah.heep.sax.de> (r125346)

PR preprocessor/23479
* doc/extend.texi: Document the 0b-prefixed binary integer
constant extension.

2007-05-31 Eric Christopher <echristo@apple.com>
2007-05-31 Eric Christopher <echristo@apple.com> (r125246)

* expr.c (convert_move): Assert that we don't have a BLKmode
operand.
(store_expr): Handle BLKmode moves by calling emit_block_move.

2007-05-31 Daniel Berlin <dberlin@dberlin.org> (r125239)

* c-typeck.c (build_indirect_ref): Include type in error message.
(build_binary_op): Pass types to binary_op_error.
* c-common.c (binary_op_error): Take two type arguments, print out
types with error.
* c-common.h (binary_op_error): Update prototype.

2007-05-27 Eric Christopher <echristo@apple.com> (r125116)

* config/rs6000/rs6000.c (rs6000_emit_prologue): Update
sp_offset depending on stack size. Save r12 depending
on registers we're saving later.
(rs6000_emit_epilogue): Update sp_offset depending only
on stack size.

2007-05-24 Richard Sandiford <rsandifo@nildram.co.uk> (r125037)

* postreload-gcse.c (reg_changed_after_insn_p): New function.
Expand Down Expand Up @@ -381,6 +403,36 @@

* config.gcc: Support core2 processor.

2007-01-11 Joseph Myers <joseph@codesourcery.com> (r120688)

* c-common.c (vector_types_convertible_p): Treat opaque types as
always convertible if they have the same size, but not otherwise.

2007-01-08 Mark Shinwell <shinwell@codesourcery.com> (r120572)

* c.opt: Add -flax-vector-conversions.
* c-typeck.c (convert_for_assignment): Pass flag to
vector_types_convertible_p to allow emission of note.
(digest_init): Likewise.
* c-opts.c: Handle -flax-vector-conversions.
* c-common.c (flag_lax_vector_conversions): New.
(vector_types_convertible_p): Unless -flax-vector conversions
has been passed, disallow conversions between vectors with
differing numbers of subparts and/or element types. If such
a conversion is disallowed, possibly emit a note on the first
occasion only to inform the user of -flax-vector-conversions.
The new last argument specifies this.
* c-common.h (flag_lax_vector_conversions): New.
(vector_types_convertible_p): Add extra argument.
* config/i386/i386.c (ix86_init_mmx_sse_builtins): Use
char_type_node for V*QI type vectors.
* config/rs6000/rs6000-c.c (altivec_overloaded_builtins):
Update to satisfy new typechecking rules.
* config/rs6000/altivec.h (vec_cmple): Use vec_cmpge, for both
C and C++ variants.
* doc/invoke.texi (C Dialect Options): Document
-flax-vector-conversions.

2007-01-05 Manuel Lopez-Ibanez <manu@gcc.gnu.org> (r120505)

PR c/19978
Expand Down

0 comments on commit 70078aa

Please sign in to comment.