MFC
This commit is contained in:
commit
1fff3a5663
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/projects/largeSMP/; revision=222106
@ -1132,6 +1132,10 @@ _kgzip= usr.sbin/kgzip
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.if ${MK_BINUTILS} != "no"
|
||||
_binutils= gnu/usr.bin/binutils
|
||||
.endif
|
||||
|
||||
.if ${MK_CLANG} != "no"
|
||||
.if ${CC:T:Mclang} == "clang"
|
||||
_clang= usr.bin/clang
|
||||
@ -1139,12 +1143,16 @@ _clang_libs= lib/clang
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.if ${MK_GCC} != "no"
|
||||
_cc= gnu/usr.bin/cc
|
||||
.endif
|
||||
|
||||
cross-tools:
|
||||
.for _tool in \
|
||||
${_clang_libs} \
|
||||
${_clang} \
|
||||
gnu/usr.bin/binutils \
|
||||
gnu/usr.bin/cc \
|
||||
${_binutils} \
|
||||
${_cc} \
|
||||
usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \
|
||||
${_btxld} \
|
||||
${_crunchide} \
|
||||
|
@ -1652,7 +1652,7 @@ simplify_cond (rtx exp, int insn_code, int insn_index)
|
||||
rtx ret;
|
||||
|
||||
/* This lets us free all storage allocated below, if appropriate. */
|
||||
obstack_finish (rtl_obstack);
|
||||
(void) obstack_finish (rtl_obstack);
|
||||
|
||||
memcpy (tests, XVEC (exp, 0)->elem, len * sizeof (rtx));
|
||||
|
||||
|
@ -1099,7 +1099,7 @@ create_node (size_t size)
|
||||
|
||||
obstack_blank (&irp, size);
|
||||
result = obstack_base (&irp);
|
||||
obstack_finish (&irp);
|
||||
(void) obstack_finish (&irp);
|
||||
/* Default values of members are NULL and zero. */
|
||||
memset (result, 0, size);
|
||||
return result;
|
||||
@ -1170,7 +1170,7 @@ next_sep_el (const char **pstr, int sep, int par_flag)
|
||||
}
|
||||
obstack_1grow (&irp, '\0');
|
||||
out_str = obstack_base (&irp);
|
||||
obstack_finish (&irp);
|
||||
(void) obstack_finish (&irp);
|
||||
|
||||
*pstr = p;
|
||||
if (**pstr == sep)
|
||||
@ -1221,7 +1221,7 @@ get_str_vect (const char *str, int *els_num, int sep, int paren_p)
|
||||
return NULL;
|
||||
obstack_blank (&irp, sizeof (char *) * (*els_num + 1));
|
||||
vect = (char **) obstack_base (&irp);
|
||||
obstack_finish (&irp);
|
||||
(void) obstack_finish (&irp);
|
||||
pstr = &str;
|
||||
for (i = 0; i < *els_num; i++)
|
||||
vect [i] = next_sep_el (pstr, sep, paren_p);
|
||||
@ -3343,7 +3343,7 @@ alloc_empty_reserv_sets (void)
|
||||
|
||||
obstack_blank (&irp, els_in_reservs * sizeof (set_el_t));
|
||||
result = (reserv_sets_t) obstack_base (&irp);
|
||||
obstack_finish (&irp);
|
||||
(void) obstack_finish (&irp);
|
||||
memset (result, 0, els_in_reservs * sizeof (set_el_t));
|
||||
return result;
|
||||
}
|
||||
@ -4117,10 +4117,10 @@ initiate_excl_sets (void)
|
||||
|
||||
obstack_blank (&irp, els_in_cycle_reserv * sizeof (set_el_t));
|
||||
excl_set = (reserv_sets_t) obstack_base (&irp);
|
||||
obstack_finish (&irp);
|
||||
(void) obstack_finish (&irp);
|
||||
obstack_blank (&irp, description->units_num * sizeof (reserv_sets_t));
|
||||
unit_excl_set_table = (reserv_sets_t *) obstack_base (&irp);
|
||||
obstack_finish (&irp);
|
||||
(void) obstack_finish (&irp);
|
||||
/* Evaluate unit exclusion sets. */
|
||||
for (i = 0; i < description->decls_num; i++)
|
||||
{
|
||||
@ -4129,7 +4129,7 @@ initiate_excl_sets (void)
|
||||
{
|
||||
obstack_blank (&irp, els_in_cycle_reserv * sizeof (set_el_t));
|
||||
unit_excl_set = (reserv_sets_t) obstack_base (&irp);
|
||||
obstack_finish (&irp);
|
||||
(void) obstack_finish (&irp);
|
||||
memset (unit_excl_set, 0, els_in_cycle_reserv * sizeof (set_el_t));
|
||||
for (el = DECL_UNIT (decl)->excl_list;
|
||||
el != NULL;
|
||||
@ -4224,16 +4224,16 @@ initiate_presence_absence_pattern_sets (void)
|
||||
|
||||
obstack_blank (&irp, description->units_num * sizeof (pattern_reserv_t));
|
||||
unit_presence_set_table = (pattern_reserv_t *) obstack_base (&irp);
|
||||
obstack_finish (&irp);
|
||||
(void) obstack_finish (&irp);
|
||||
obstack_blank (&irp, description->units_num * sizeof (pattern_reserv_t));
|
||||
unit_final_presence_set_table = (pattern_reserv_t *) obstack_base (&irp);
|
||||
obstack_finish (&irp);
|
||||
(void) obstack_finish (&irp);
|
||||
obstack_blank (&irp, description->units_num * sizeof (pattern_reserv_t));
|
||||
unit_absence_set_table = (pattern_reserv_t *) obstack_base (&irp);
|
||||
obstack_finish (&irp);
|
||||
(void) obstack_finish (&irp);
|
||||
obstack_blank (&irp, description->units_num * sizeof (pattern_reserv_t));
|
||||
unit_final_absence_set_table = (pattern_reserv_t *) obstack_base (&irp);
|
||||
obstack_finish (&irp);
|
||||
(void) obstack_finish (&irp);
|
||||
/* Evaluate unit presence/absence sets. */
|
||||
for (i = 0; i < description->decls_num; i++)
|
||||
{
|
||||
@ -4935,7 +4935,7 @@ store_alt_unit_usage (regexp_t regexp, regexp_t unit, int cycle,
|
||||
|
||||
obstack_blank (&unit_usages, sizeof (struct unit_usage));
|
||||
unit_usage_ptr = (struct unit_usage *) obstack_base (&unit_usages);
|
||||
obstack_finish (&unit_usages);
|
||||
(void) obstack_finish (&unit_usages);
|
||||
unit_usage_ptr->unit_decl = unit_decl;
|
||||
index = cycle * REGEXP_ONEOF (regexp)->regexps_num + alt_num;
|
||||
unit_usage_ptr->next = VEC_index (unit_usage_t, cycle_alt_unit_usages, index);
|
||||
@ -8975,7 +8975,7 @@ initiate_automaton_gen (int argc, char **argv)
|
||||
strlen (STANDARD_OUTPUT_DESCRIPTION_FILE_SUFFIX) + 1);
|
||||
obstack_1grow (&irp, '\0');
|
||||
output_description_file_name = obstack_base (&irp);
|
||||
obstack_finish (&irp);
|
||||
(void) obstack_finish (&irp);
|
||||
}
|
||||
|
||||
/* The following function checks existence at least one arc marked by
|
||||
|
@ -590,7 +590,7 @@ macro_input (char *buffer, unsigned size)
|
||||
void
|
||||
yyerror (const char *s)
|
||||
{
|
||||
error_at_line (&lexer_line, s);
|
||||
error_at_line (&lexer_line, "%s", s);
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -787,7 +787,7 @@ calc_wider_mode (void)
|
||||
|
||||
#define tagged_printf(FMT, ARG, TAG) do { \
|
||||
int count_; \
|
||||
printf (" " FMT ",%n", ARG, &count_); \
|
||||
count_ = printf (" " FMT ",", ARG); \
|
||||
printf ("%*s/* %s */\n", 27 - count_, "", TAG); \
|
||||
} while (0)
|
||||
|
||||
@ -822,7 +822,7 @@ enum machine_mode\n{");
|
||||
for (m = modes[c]; m; m = m->next)
|
||||
{
|
||||
int count_;
|
||||
printf (" %smode,%n", m->name, &count_);
|
||||
count_ = printf (" %smode,", m->name);
|
||||
printf ("%*s/* %s:%d */\n", 27 - count_, "",
|
||||
trim_filename (m->file), m->line);
|
||||
}
|
||||
|
@ -246,7 +246,7 @@ Gen_Perf::change (List_Node *prior, List_Node *curr)
|
||||
{
|
||||
if (option[DEBUG])
|
||||
{
|
||||
fprintf (stderr, " by changing asso_value['%c'] (char #%d) to %d\n",
|
||||
fprintf (stderr, " by changing asso_value['%c'] (char #%zd) to %d\n",
|
||||
*p, p - union_set + 1, asso_values[(unsigned char)(*p)]);
|
||||
fflush (stderr);
|
||||
}
|
||||
|
@ -497,8 +497,8 @@ Key_List::merge (List_Node *list1, List_Node *list2)
|
||||
*resultp = list1;
|
||||
break;
|
||||
}
|
||||
if (occurrence_sort && list1->occurrence < list2->occurrence
|
||||
|| hash_sort && list1->hash_value > list2->hash_value)
|
||||
if ((occurrence_sort && list1->occurrence < list2->occurrence)
|
||||
|| (hash_sort && list1->hash_value > list2->hash_value))
|
||||
{
|
||||
*resultp = list2;
|
||||
resultp = &list2->next; list2 = list1; list1 = *resultp;
|
||||
@ -1035,6 +1035,7 @@ Key_List::output_hash_function (void)
|
||||
if (option[CPLUSPLUS])
|
||||
printf ("%s::", option.get_class_name ());
|
||||
printf ("%s ", option.get_hash_name ());
|
||||
if (option[KRC] || option[C] || option [ANSIC] || option[CPLUSPLUS])
|
||||
printf (option[KRC] ?
|
||||
"(str, len)\n"
|
||||
" register char *str;\n"
|
||||
@ -1043,9 +1044,7 @@ Key_List::output_hash_function (void)
|
||||
"(str, len)\n"
|
||||
" register const char *str;\n"
|
||||
" register unsigned int len;\n" :
|
||||
option[ANSIC] | option[CPLUSPLUS] ?
|
||||
"(register const char *str, register unsigned int len)\n" :
|
||||
"");
|
||||
"(register const char *str, register unsigned int len)\n");
|
||||
|
||||
/* Note that when the hash function is called, it has already been verified
|
||||
that min_key_len <= len <= max_key_len. */
|
||||
@ -1442,7 +1441,7 @@ Key_List::output_lookup_array (void)
|
||||
|
||||
if (option[DEBUG])
|
||||
fprintf (stderr,
|
||||
"dup_ptr[%d]: hash_value = %d, index = %d, count = %d\n",
|
||||
"dup_ptr[%zd]: hash_value = %d, index = %d, count = %d\n",
|
||||
dup_ptr - duplicates,
|
||||
dup_ptr->hash_value, dup_ptr->index, dup_ptr->count);
|
||||
|
||||
@ -1986,6 +1985,7 @@ Key_List::output_lookup_function (void)
|
||||
if (option[CPLUSPLUS])
|
||||
printf ("%s::", option.get_class_name ());
|
||||
printf ("%s ", option.get_function_name ());
|
||||
if (option[KRC] || option[C] || option[ANSIC] || option[CPLUSPLUS])
|
||||
printf (option[KRC] ?
|
||||
"(str, len)\n"
|
||||
" register char *str;\n"
|
||||
@ -1994,9 +1994,7 @@ Key_List::output_lookup_function (void)
|
||||
"(str, len)\n"
|
||||
" register const char *str;\n"
|
||||
" register unsigned int len;\n" :
|
||||
option[ANSIC] | option[CPLUSPLUS] ?
|
||||
"(register const char *str, register unsigned int len)\n" :
|
||||
"");
|
||||
"(register const char *str, register unsigned int len)\n");
|
||||
|
||||
/* Output the function's body. */
|
||||
printf ("{\n");
|
||||
|
@ -237,7 +237,7 @@ Options::print_options (void)
|
||||
{
|
||||
putchar (*arg);
|
||||
arg++;
|
||||
if (*arg >= 'A' && *arg <= 'Z' || *arg >= 'a' && *arg <= 'z')
|
||||
if ((*arg >= 'A' && *arg <= 'Z') || (*arg >= 'a' && *arg <= 'z'))
|
||||
{
|
||||
putchar (*arg);
|
||||
arg++;
|
||||
|
@ -1587,7 +1587,7 @@ void header_desc::write_headings (FILE *f, int force)
|
||||
|
||||
buffer += as_string(h);
|
||||
buffer += '\0';
|
||||
fprintf(f, buffer.contents());
|
||||
fputs(buffer.contents(), f);
|
||||
} else
|
||||
fputs(g->text_string, f);
|
||||
h++;
|
||||
|
@ -995,7 +995,7 @@ next_command(void)
|
||||
inline bool
|
||||
odd(const int n)
|
||||
{
|
||||
return (n & 1 == 1) ? true : false;
|
||||
return ((n & 1) == 1) ? true : false;
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////
|
||||
|
@ -611,14 +611,16 @@ int state_set::is_in(int_value_state i)
|
||||
return (intset & (1 << (int)i)) != 0;
|
||||
}
|
||||
|
||||
// Note: this used to have a bug s.t. it always tested for bit 0 (benl 18/5/11)
|
||||
int state_set::is_in(units_value_state u)
|
||||
{
|
||||
return (unitsset & (1 << (int)u) != 0);
|
||||
return (unitsset & (1 << (int)u)) != 0;
|
||||
}
|
||||
|
||||
// Note: this used to have a bug s.t. it always tested for bit 0 (benl 18/5/11)
|
||||
int state_set::is_in(string_value_state s)
|
||||
{
|
||||
return (stringset & (1 << (int)s) != 0);
|
||||
return (stringset & (1 << (int)s)) != 0;
|
||||
}
|
||||
|
||||
void state_set::add(units_value_state, int n)
|
||||
|
@ -2157,7 +2157,7 @@ void glyph_node::debug_node()
|
||||
if (c)
|
||||
fprintf(stderr, "%c", c);
|
||||
else
|
||||
fprintf(stderr, ci->nm.contents());
|
||||
fputs(ci->nm.contents(), stderr);
|
||||
if (push_state)
|
||||
fprintf(stderr, " <push_state>");
|
||||
if (state)
|
||||
|
@ -870,9 +870,9 @@ output_charset(const int tfm_type)
|
||||
else if (!all_flag)
|
||||
continue;
|
||||
else if (tfm_type == MSL)
|
||||
printf(hp_msl_to_ucode_name(charcode));
|
||||
fputs(hp_msl_to_ucode_name(charcode), stdout);
|
||||
else
|
||||
printf(unicode_to_ucode_name(charcode));
|
||||
fputs(unicode_to_ucode_name(charcode), stdout);
|
||||
|
||||
printf("\t%d,%d",
|
||||
scale(char_table[i].width), scale(char_table[i].ascent));
|
||||
|
@ -49,6 +49,7 @@ RCSID("$Id: slc-gram.y 20767 2007-06-01 11:24:52Z lha $");
|
||||
#include "slc.h"
|
||||
extern FILE *yyin;
|
||||
extern struct assignment *assignment;
|
||||
extern int yyparse(void);
|
||||
%}
|
||||
|
||||
%union {
|
||||
|
@ -47,12 +47,14 @@ _texinfo= texinfo
|
||||
_rcs= rcs
|
||||
.endif
|
||||
|
||||
.if ${MK_TOOLCHAIN} != "no"
|
||||
.if ${MK_BINUTILS} != "no"
|
||||
_binutils= binutils
|
||||
.endif
|
||||
.if ${MK_GCC} != "no"
|
||||
_cc= cc
|
||||
.endif
|
||||
.if ${MK_GDB} != "no"
|
||||
_gdb= gdb
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.include <bsd.subdir.mk>
|
||||
|
@ -25,11 +25,11 @@ PORTSDIR?= /usr/ports
|
||||
DOCDIR?= /usr/doc
|
||||
RELNOTES_LANG?= en_US.ISO8859-1
|
||||
|
||||
TARGET_ARCH?= ${MACHINE_ARCH}
|
||||
.if ${TARGET_ARCH} == ${MACHINE_ARCH}
|
||||
TARGET?= ${MACHINE}
|
||||
.if ${TARGET} == ${MACHINE}
|
||||
TARGET_ARCH?= ${MACHINE_ARCH}
|
||||
.else
|
||||
TARGET?= ${TARGET_ARCH}
|
||||
TARGET_ARCH?= ${TARGET}
|
||||
.endif
|
||||
IMAKE= ${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}
|
||||
DISTDIR= ${.OBJDIR}/dist
|
||||
@ -169,7 +169,9 @@ ftp: packagesystem
|
||||
mkdir ftp
|
||||
cp *.txz MANIFEST ftp
|
||||
|
||||
release: obj ${RELEASE_TARGETS}
|
||||
release:
|
||||
${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} obj
|
||||
${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} ${RELEASE_TARGETS}
|
||||
|
||||
clean:
|
||||
chflags -R noschg ${.OBJDIR}
|
||||
|
@ -63,7 +63,6 @@ if [ -d $2/usr/doc ]; then
|
||||
fi
|
||||
|
||||
chroot $2 make -C /usr/src $MAKE_FLAGS buildworld buildkernel
|
||||
chroot $2 make -C /usr/src/release obj
|
||||
chroot $2 make -C /usr/src/release release
|
||||
chroot $2 make -C /usr/src/release install DESTDIR=/R
|
||||
|
||||
|
@ -31,8 +31,10 @@
|
||||
#include <sys/cdefs.h>
|
||||
__FBSDID("$FreeBSD$");
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
|
||||
#include <assert.h>
|
||||
#include <errno.h>
|
||||
@ -103,22 +105,39 @@ pjdlog_printf_render_sockaddr(struct __printf_io *io,
|
||||
switch (ss->ss_family) {
|
||||
case AF_INET:
|
||||
{
|
||||
char addr[INET_ADDRSTRLEN];
|
||||
const struct sockaddr_in *sin;
|
||||
in_addr_t ip;
|
||||
unsigned int port;
|
||||
|
||||
sin = (const struct sockaddr_in *)ss;
|
||||
ip = ntohl(sin->sin_addr.s_addr);
|
||||
port = ntohs(sin->sin_port);
|
||||
if (inet_ntop(ss->ss_family, &sin->sin_addr, addr,
|
||||
sizeof(addr)) == NULL) {
|
||||
PJDLOG_ABORT("inet_ntop(AF_INET) failed: %s.",
|
||||
strerror(errno));
|
||||
}
|
||||
snprintf(buf, sizeof(buf), "%s:%u", addr, port);
|
||||
break;
|
||||
}
|
||||
case AF_INET6:
|
||||
{
|
||||
char addr[INET6_ADDRSTRLEN];
|
||||
const struct sockaddr_in6 *sin;
|
||||
unsigned int port;
|
||||
|
||||
snprintf(buf, sizeof(buf), "%u.%u.%u.%u:%u",
|
||||
((ip >> 24) & 0xff), ((ip >> 16) & 0xff),
|
||||
((ip >> 8) & 0xff), (ip & 0xff), port);
|
||||
sin = (const struct sockaddr_in6 *)ss;
|
||||
port = ntohs(sin->sin6_port);
|
||||
if (inet_ntop(ss->ss_family, &sin->sin6_addr, addr,
|
||||
sizeof(addr)) == NULL) {
|
||||
PJDLOG_ABORT("inet_ntop(AF_INET6) failed: %s.",
|
||||
strerror(errno));
|
||||
}
|
||||
snprintf(buf, sizeof(buf), "[%s]:%u", addr, port);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
snprintf(buf, sizeof(buf), "[unsupported family %u]",
|
||||
(unsigned int)ss->ss_family);
|
||||
snprintf(buf, sizeof(buf), "[unsupported family %hhu]",
|
||||
ss->ss_family);
|
||||
break;
|
||||
}
|
||||
ret = __printf_out(io, pi, buf, strlen(buf));
|
||||
|
@ -492,13 +492,13 @@ will return zero for success and \-1 and set errno on error.
|
||||
struct sbuf *sb;
|
||||
|
||||
sb = sbuf_new_auto();
|
||||
sbuf_cat("Customers found:\en");
|
||||
sbuf_cat(sb, "Customers found:\en");
|
||||
TAILQ_FOREACH(foo, &foolist, list) {
|
||||
sbuf_printf(" %4d %s\en", foo->index, foo->name);
|
||||
sbuf_printf(" Address: %s\en", foo->address);
|
||||
sbuf_printf(" Zip: %s\en", foo->zipcode);
|
||||
sbuf_printf(sb, " %4d %s\en", foo->index, foo->name);
|
||||
sbuf_printf(sb, " Address: %s\en", foo->address);
|
||||
sbuf_printf(sb, " Zip: %s\en", foo->zipcode);
|
||||
}
|
||||
if (sbuf_finish(sb))
|
||||
if (sbuf_finish(sb)) /* Check for any and all errors */
|
||||
err(1,"Could not generate message");
|
||||
transmit_msg(sbuf_data(sb), sbuf_len(sb));
|
||||
sbuf_delete(sb);
|
||||
|
@ -100,6 +100,7 @@ antoine [label="Antoine Brodin\nantoine@FreeBSD.org\n2008/02/03"]
|
||||
ariff [label="Ariff Abdullah\nariff@FreeBSD.org\n2005/11/14"]
|
||||
art [label="Artem Belevich\nart@FreeBSD.org\n2011/03/29"]
|
||||
avg [label="Andriy Gapon\navg@FreeBSD.org\n2009/02/18"]
|
||||
benl [label="Ben Laurie\nbenl@FreeBSD.org\n2011/05/18"]
|
||||
benno [label="Benno Rice\nbenno@FreeBSD.org\n2000/11/02"]
|
||||
bms [label="Bruce M Simpson\nbms@FreeBSD.org\n2003/08/06"]
|
||||
brian [label="Brian Somers\nbrian@FreeBSD.org\n1996/12/16"]
|
||||
@ -486,6 +487,7 @@ peter -> asmodai
|
||||
peter -> jayanth
|
||||
peter -> ps
|
||||
|
||||
philip -> benl
|
||||
philip -> ed
|
||||
philip -> jls
|
||||
philip -> matteo
|
||||
@ -546,6 +548,8 @@ sheldonh -> iedowse
|
||||
|
||||
shin -> ume
|
||||
|
||||
simon -> benl
|
||||
|
||||
sos -> marcel
|
||||
|
||||
thompsa -> weongyo
|
||||
|
@ -176,6 +176,7 @@ NA NAM 516 Namibia
|
||||
NR NRU 520 Nauru
|
||||
NP NPL 524 Nepal
|
||||
NL NLD 528 Netherlands
|
||||
AN ANT 530 Netherlands Antilles
|
||||
NC NCL 540 New Caledonia
|
||||
NZ NZL 554 New Zealand
|
||||
NI NIC 558 Nicaragua
|
||||
|
@ -297,6 +297,7 @@ __DEFAULT_YES_OPTIONS = \
|
||||
BIND_MTREE \
|
||||
BIND_NAMED \
|
||||
BIND_UTILS \
|
||||
BINUTILS \
|
||||
BLUETOOTH \
|
||||
BOOT \
|
||||
BSD_CPIO \
|
||||
@ -317,6 +318,7 @@ __DEFAULT_YES_OPTIONS = \
|
||||
FP_LIBC \
|
||||
FREEBSD_UPDATE \
|
||||
GAMES \
|
||||
GCC \
|
||||
GCOV \
|
||||
GDB \
|
||||
GNU \
|
||||
@ -529,7 +531,9 @@ MK_GROFF:= no
|
||||
.endif
|
||||
|
||||
.if ${MK_TOOLCHAIN} == "no"
|
||||
MK_BINUTILS:= no
|
||||
MK_CLANG:= no
|
||||
MK_GCC:= no
|
||||
MK_GDB:= no
|
||||
.endif
|
||||
|
||||
|
@ -366,7 +366,13 @@ t4_attach(device_t dev)
|
||||
sc->mbox = sc->pf;
|
||||
|
||||
pci_enable_busmaster(dev);
|
||||
if (pci_find_cap(dev, PCIY_EXPRESS, &i) == 0) {
|
||||
pci_set_max_read_req(dev, 4096);
|
||||
v = pci_read_config(dev, i + PCIR_EXPRESS_DEVICE_CTL, 2);
|
||||
v |= PCIM_EXP_CTL_RELAXED_ORD_ENABLE;
|
||||
pci_write_config(dev, i + PCIR_EXPRESS_DEVICE_CTL, v, 2);
|
||||
}
|
||||
|
||||
snprintf(sc->lockname, sizeof(sc->lockname), "%s",
|
||||
device_get_nameunit(dev));
|
||||
mtx_init(&sc->sc_lock, sc->lockname, 0, MTX_DEF);
|
||||
@ -3209,41 +3215,9 @@ filter_rpl(struct adapter *sc, const struct cpl_set_tcb_rpl *rpl)
|
||||
int
|
||||
t4_os_find_pci_capability(struct adapter *sc, int cap)
|
||||
{
|
||||
device_t dev;
|
||||
struct pci_devinfo *dinfo;
|
||||
pcicfgregs *cfg;
|
||||
uint32_t status;
|
||||
uint8_t ptr;
|
||||
int i;
|
||||
|
||||
dev = sc->dev;
|
||||
dinfo = device_get_ivars(dev);
|
||||
cfg = &dinfo->cfg;
|
||||
|
||||
status = pci_read_config(dev, PCIR_STATUS, 2);
|
||||
if (!(status & PCIM_STATUS_CAPPRESENT))
|
||||
return (0);
|
||||
|
||||
switch (cfg->hdrtype & PCIM_HDRTYPE) {
|
||||
case 0:
|
||||
case 1:
|
||||
ptr = PCIR_CAP_PTR;
|
||||
break;
|
||||
case 2:
|
||||
ptr = PCIR_CAP_PTR_2;
|
||||
break;
|
||||
default:
|
||||
return (0);
|
||||
break;
|
||||
}
|
||||
ptr = pci_read_config(dev, ptr, 1);
|
||||
|
||||
while (ptr != 0) {
|
||||
if (pci_read_config(dev, ptr + PCICAP_ID, 1) == cap)
|
||||
return (ptr);
|
||||
ptr = pci_read_config(dev, ptr + PCICAP_NEXTPTR, 1);
|
||||
}
|
||||
|
||||
return (0);
|
||||
return (pci_find_cap(sc->dev, cap, &i) == 0 ? i : 0);
|
||||
}
|
||||
|
||||
int
|
||||
|
@ -100,7 +100,7 @@ static int alloc_ring(struct adapter *, size_t, bus_dma_tag_t *, bus_dmamap_t *,
|
||||
static int free_ring(struct adapter *, bus_dma_tag_t, bus_dmamap_t, bus_addr_t,
|
||||
void *);
|
||||
static int alloc_iq_fl(struct port_info *, struct sge_iq *, struct sge_fl *,
|
||||
int);
|
||||
int, int);
|
||||
static int free_iq_fl(struct port_info *, struct sge_iq *, struct sge_fl *);
|
||||
static int alloc_iq(struct sge_iq *, int);
|
||||
static int free_iq(struct sge_iq *);
|
||||
@ -1104,7 +1104,7 @@ free_ring(struct adapter *sc, bus_dma_tag_t tag, bus_dmamap_t map,
|
||||
*/
|
||||
static int
|
||||
alloc_iq_fl(struct port_info *pi, struct sge_iq *iq, struct sge_fl *fl,
|
||||
int intr_idx)
|
||||
int intr_idx, int cong)
|
||||
{
|
||||
int rc, i, cntxt_id;
|
||||
size_t len;
|
||||
@ -1155,6 +1155,8 @@ alloc_iq_fl(struct port_info *pi, struct sge_iq *iq, struct sge_fl *fl,
|
||||
V_FW_IQ_CMD_IQESIZE(ilog2(iq->esize) - 4));
|
||||
c.iqsize = htobe16(iq->qsize);
|
||||
c.iqaddr = htobe64(iq->ba);
|
||||
if (cong >= 0)
|
||||
c.iqns_to_fl0congen = htobe32(F_FW_IQ_CMD_IQFLINTCONGEN);
|
||||
|
||||
if (fl) {
|
||||
mtx_init(&fl->fl_lock, fl->lockname, NULL, MTX_DEF);
|
||||
@ -1198,7 +1200,15 @@ alloc_iq_fl(struct port_info *pi, struct sge_iq *iq, struct sge_fl *fl,
|
||||
fl->needed = fl->cap;
|
||||
|
||||
c.iqns_to_fl0congen =
|
||||
htobe32(V_FW_IQ_CMD_FL0HOSTFCMODE(X_HOSTFCMODE_NONE));
|
||||
htobe32(V_FW_IQ_CMD_FL0HOSTFCMODE(X_HOSTFCMODE_NONE) |
|
||||
F_FW_IQ_CMD_FL0FETCHRO | F_FW_IQ_CMD_FL0DATARO |
|
||||
F_FW_IQ_CMD_FL0PADEN);
|
||||
if (cong >= 0) {
|
||||
c.iqns_to_fl0congen |=
|
||||
htobe32(V_FW_IQ_CMD_FL0CNGCHMAP(cong) |
|
||||
F_FW_IQ_CMD_FL0CONGCIF |
|
||||
F_FW_IQ_CMD_FL0CONGEN);
|
||||
}
|
||||
c.fl0dcaen_to_fl0cidxfthresh =
|
||||
htobe16(V_FW_IQ_CMD_FL0FBMIN(X_FETCHBURSTMIN_64B) |
|
||||
V_FW_IQ_CMD_FL0FBMAX(X_FETCHBURSTMAX_512B));
|
||||
@ -1325,7 +1335,7 @@ free_iq_fl(struct port_info *pi, struct sge_iq *iq, struct sge_fl *fl)
|
||||
static int
|
||||
alloc_iq(struct sge_iq *iq, int intr_idx)
|
||||
{
|
||||
return alloc_iq_fl(NULL, iq, NULL, intr_idx);
|
||||
return alloc_iq_fl(NULL, iq, NULL, intr_idx, -1);
|
||||
}
|
||||
|
||||
static int
|
||||
@ -1342,7 +1352,7 @@ alloc_rxq(struct port_info *pi, struct sge_rxq *rxq, int intr_idx, int idx)
|
||||
struct sysctl_oid_list *children;
|
||||
char name[16];
|
||||
|
||||
rc = alloc_iq_fl(pi, &rxq->iq, &rxq->fl, intr_idx);
|
||||
rc = alloc_iq_fl(pi, &rxq->iq, &rxq->fl, intr_idx, 1 << pi->tx_chan);
|
||||
if (rc != 0)
|
||||
return (rc);
|
||||
|
||||
@ -1436,7 +1446,7 @@ alloc_ctrlq(struct adapter *sc, struct sge_ctrlq *ctrlq, int idx)
|
||||
c.physeqid_pkd = htobe32(0);
|
||||
c.fetchszm_to_iqid =
|
||||
htobe32(V_FW_EQ_CTRL_CMD_HOSTFCMODE(X_HOSTFCMODE_STATUS_PAGE) |
|
||||
V_FW_EQ_CTRL_CMD_PCIECHN(idx) |
|
||||
V_FW_EQ_CTRL_CMD_PCIECHN(idx) | F_FW_EQ_CTRL_CMD_FETCHRO |
|
||||
V_FW_EQ_CTRL_CMD_IQID(eq->iqid));
|
||||
c.dcaen_to_eqsize =
|
||||
htobe32(V_FW_EQ_CTRL_CMD_FBMIN(X_FETCHBURSTMIN_64B) |
|
||||
@ -1561,7 +1571,7 @@ alloc_txq(struct port_info *pi, struct sge_txq *txq, int idx)
|
||||
c.viid_pkd = htobe32(V_FW_EQ_ETH_CMD_VIID(pi->viid));
|
||||
c.fetchszm_to_iqid =
|
||||
htobe32(V_FW_EQ_ETH_CMD_HOSTFCMODE(X_HOSTFCMODE_STATUS_PAGE) |
|
||||
V_FW_EQ_ETH_CMD_PCIECHN(pi->tx_chan) |
|
||||
V_FW_EQ_ETH_CMD_PCIECHN(pi->tx_chan) | F_FW_EQ_ETH_CMD_FETCHRO |
|
||||
V_FW_EQ_ETH_CMD_IQID(eq->iqid));
|
||||
c.dcaen_to_eqsize = htobe32(V_FW_EQ_ETH_CMD_FBMIN(X_FETCHBURSTMIN_64B) |
|
||||
V_FW_EQ_ETH_CMD_FBMAX(X_FETCHBURSTMAX_512B) |
|
||||
|
@ -656,6 +656,12 @@ const struct puc_cfg puc_pci_devices[] = {
|
||||
PUC_PORT_4S, 0x10, 0, 8,
|
||||
},
|
||||
|
||||
{ 0x1415, 0x950a, 0x131f, 0x2030,
|
||||
"SIIG Cyber 2S PCIe",
|
||||
DEFAULT_RCLK * 10,
|
||||
PUC_PORT_2S, 0x10, 0, 8,
|
||||
},
|
||||
|
||||
{ 0x1415, 0x950a, 0xffff, 0,
|
||||
"Oxford Semiconductor OX16PCI954 UARTs",
|
||||
DEFAULT_RCLK,
|
||||
|
@ -1079,7 +1079,8 @@ nfs_mount(struct mount *mp)
|
||||
dirpath[0] = '\0';
|
||||
dirlen = strlen(dirpath);
|
||||
|
||||
if (has_nfs_args_opt == 0 && vfs_getopt(mp->mnt_optnew, "addr",
|
||||
if (has_nfs_args_opt == 0) {
|
||||
if (vfs_getopt(mp->mnt_optnew, "addr",
|
||||
(void **)&args.addr, &args.addrlen) == 0) {
|
||||
if (args.addrlen > SOCK_MAXADDRLEN) {
|
||||
error = ENAMETOOLONG;
|
||||
@ -1088,6 +1089,11 @@ nfs_mount(struct mount *mp)
|
||||
nam = malloc(args.addrlen, M_SONAME, M_WAITOK);
|
||||
bcopy(args.addr, nam, args.addrlen);
|
||||
nam->sa_len = args.addrlen;
|
||||
} else {
|
||||
vfs_mount_error(mp, "No server address");
|
||||
error = EINVAL;
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
|
||||
args.fh = nfh;
|
||||
|
@ -981,6 +981,8 @@ destroy_devl(struct cdev *dev)
|
||||
/* Remove name marking */
|
||||
dev->si_flags &= ~SI_NAMED;
|
||||
|
||||
dev->si_refcount++; /* Avoid race with dev_rel() */
|
||||
|
||||
/* If we are a child, remove us from the parents list */
|
||||
if (dev->si_flags & SI_CHILD) {
|
||||
LIST_REMOVE(dev, si_siblings);
|
||||
@ -997,7 +999,6 @@ destroy_devl(struct cdev *dev)
|
||||
dev->si_flags &= ~SI_CLONELIST;
|
||||
}
|
||||
|
||||
dev->si_refcount++; /* Avoid race with dev_rel() */
|
||||
csw = dev->si_devsw;
|
||||
dev->si_devsw = NULL; /* already NULL for SI_ALIAS */
|
||||
while (csw != NULL && csw->d_purge != NULL && dev->si_threadcount) {
|
||||
|
@ -3129,8 +3129,8 @@ sctp_choose_boundall(struct sctp_inpcb *inp,
|
||||
}
|
||||
#endif
|
||||
out:
|
||||
if (sifa) {
|
||||
#ifdef INET
|
||||
if (sifa) {
|
||||
if (retried == 1) {
|
||||
LIST_FOREACH(sctp_ifn, &vrf->ifnlist, next_ifn) {
|
||||
if (dest_is_loop == 0 && SCTP_IFN_IS_IFT_LOOP(sctp_ifn)) {
|
||||
|
@ -1149,6 +1149,10 @@ nfs_mount(struct mount *mp)
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
} else if (has_addr_opt == 0) {
|
||||
vfs_mount_error(mp, "No server address");
|
||||
error = EINVAL;
|
||||
goto out;
|
||||
}
|
||||
error = mountnfs(&args, mp, nam, args.hostname, &vp,
|
||||
curthread->td_ucred, negnametimeo);
|
||||
|
@ -157,21 +157,21 @@ struct pargs {
|
||||
* either lock is sufficient for read access, but both locks must be held
|
||||
* for write access.
|
||||
*/
|
||||
struct racct;
|
||||
struct kaudit_record;
|
||||
struct td_sched;
|
||||
struct nlminfo;
|
||||
struct cpuset;
|
||||
struct kaioinfo;
|
||||
struct kaudit_record;
|
||||
struct kdtrace_proc;
|
||||
struct kdtrace_thread;
|
||||
struct mqueue_notifier;
|
||||
struct nlminfo;
|
||||
struct p_sched;
|
||||
struct proc;
|
||||
struct racct;
|
||||
struct sleepqueue;
|
||||
struct td_sched;
|
||||
struct thread;
|
||||
struct trapframe;
|
||||
struct turnstile;
|
||||
struct mqueue_notifier;
|
||||
struct kdtrace_proc;
|
||||
struct kdtrace_thread;
|
||||
struct cpuset;
|
||||
|
||||
/*
|
||||
* XXX: Does this belong in resource.h or resourcevar.h instead?
|
||||
@ -185,13 +185,13 @@ struct cpuset;
|
||||
* Locking for td_rux: (t) for all fields.
|
||||
*/
|
||||
struct rusage_ext {
|
||||
u_int64_t rux_runtime; /* (cj) Real time. */
|
||||
u_int64_t rux_uticks; /* (cj) Statclock hits in user mode. */
|
||||
u_int64_t rux_sticks; /* (cj) Statclock hits in sys mode. */
|
||||
u_int64_t rux_iticks; /* (cj) Statclock hits in intr mode. */
|
||||
u_int64_t rux_uu; /* (c) Previous user time in usec. */
|
||||
u_int64_t rux_su; /* (c) Previous sys time in usec. */
|
||||
u_int64_t rux_tu; /* (c) Previous total time in usec. */
|
||||
uint64_t rux_runtime; /* (cj) Real time. */
|
||||
uint64_t rux_uticks; /* (cj) Statclock hits in user mode. */
|
||||
uint64_t rux_sticks; /* (cj) Statclock hits in sys mode. */
|
||||
uint64_t rux_iticks; /* (cj) Statclock hits in intr mode. */
|
||||
uint64_t rux_uu; /* (c) Previous user time in usec. */
|
||||
uint64_t rux_su; /* (c) Previous sys time in usec. */
|
||||
uint64_t rux_tu; /* (c) Previous total time in usec. */
|
||||
};
|
||||
|
||||
/*
|
||||
|
7
tools/build/options/WITHOUT_BINUTILS
Normal file
7
tools/build/options/WITHOUT_BINUTILS
Normal file
@ -0,0 +1,7 @@
|
||||
.\" $FreeBSD$
|
||||
Set to not install binutils (as, c++-filt, gconv, gnu-ar, gnu-randlib,
|
||||
ld, nm, objcopy, objdump, readelf, size and strip)
|
||||
.Bf -symbolic
|
||||
The option does not generally work for build targets, unless some alternative
|
||||
toolchain is enabled.
|
||||
.Ef
|
6
tools/build/options/WITHOUT_GCC
Normal file
6
tools/build/options/WITHOUT_GCC
Normal file
@ -0,0 +1,6 @@
|
||||
.\" $FreeBSD$
|
||||
Set to not install gcc and g++.
|
||||
.Bf -symbolic
|
||||
The option does not generally work for build targets, unless some alternative
|
||||
toolchain is enabled.
|
||||
.Ef
|
@ -500,7 +500,7 @@ pdeclaration(const char *name, declaration *dec, int tab, const char *separator)
|
||||
break;
|
||||
}
|
||||
}
|
||||
f_print(fout, separator);
|
||||
fputs(separator, fout);
|
||||
}
|
||||
|
||||
static int
|
||||
|
@ -349,7 +349,7 @@ write_real_program(definition *def)
|
||||
f_print(fout, "(");
|
||||
/* arg name */
|
||||
if (proc->arg_num > 1)
|
||||
f_print(fout, proc->args.argname);
|
||||
fputs(proc->args.argname, fout);
|
||||
else
|
||||
ptype(proc->args.decls->decl.prefix,
|
||||
proc->args.decls->decl.type, 0);
|
||||
|
@ -103,7 +103,7 @@ write_table(definition *def)
|
||||
expected = 0;
|
||||
} else {
|
||||
expected = 1;
|
||||
f_print(fout, null_entry);
|
||||
fputs(null_entry, fout);
|
||||
}
|
||||
for (proc = vp->procs; proc != NULL; proc = proc->next) {
|
||||
current = atoi(proc->proc_num);
|
||||
@ -141,7 +141,7 @@ write_table(definition *def)
|
||||
}
|
||||
|
||||
/* print the table trailer */
|
||||
f_print(fout, tbl_end);
|
||||
fputs(tbl_end, fout);
|
||||
f_print(fout, tbl_nproc, progvers, progvers, progvers);
|
||||
}
|
||||
}
|
||||
|
@ -128,7 +128,7 @@ amd64_syscall_entry(struct trussinfo *trussinfo, int nargs) {
|
||||
/*
|
||||
* FreeBSD has two special kinds of system call redirctions --
|
||||
* SYS_syscall, and SYS___syscall. The former is the old syscall()
|
||||
* routine, basicly; the latter is for quad-aligned arguments.
|
||||
* routine, basically; the latter is for quad-aligned arguments.
|
||||
*/
|
||||
reg = 0;
|
||||
syscall_num = regs.r_rax;
|
||||
|
@ -136,7 +136,7 @@ amd64_fbsd32_syscall_entry(struct trussinfo *trussinfo, int nargs) {
|
||||
/*
|
||||
* FreeBSD has two special kinds of system call redirctions --
|
||||
* SYS_syscall, and SYS___syscall. The former is the old syscall()
|
||||
* routine, basicly; the latter is for quad-aligned arguments.
|
||||
* routine, basically; the latter is for quad-aligned arguments.
|
||||
*/
|
||||
syscall_num = regs.r_rax;
|
||||
switch (syscall_num) {
|
||||
|
@ -131,7 +131,7 @@ i386_syscall_entry(struct trussinfo *trussinfo, int nargs) {
|
||||
/*
|
||||
* FreeBSD has two special kinds of system call redirctions --
|
||||
* SYS_syscall, and SYS___syscall. The former is the old syscall()
|
||||
* routine, basicly; the latter is for quad-aligned arguments.
|
||||
* routine, basically; the latter is for quad-aligned arguments.
|
||||
*/
|
||||
syscall_num = regs.r_eax;
|
||||
switch (syscall_num) {
|
||||
|
@ -128,7 +128,7 @@ ia64_syscall_entry(struct trussinfo *trussinfo, int nargs) {
|
||||
/*
|
||||
* FreeBSD has two special kinds of system call redirctions --
|
||||
* SYS_syscall, and SYS___syscall. The former is the old syscall()
|
||||
* routine, basicly; the latter is for quad-aligned arguments.
|
||||
* routine, basically; the latter is for quad-aligned arguments.
|
||||
*/
|
||||
syscall_num = regs.r_scratch.gr15; /* XXX double-check. */
|
||||
if (syscall_num == SYS_syscall || syscall_num == SYS___syscall)
|
||||
|
@ -33,7 +33,7 @@
|
||||
__FBSDID("$FreeBSD$");
|
||||
|
||||
/*
|
||||
* The main module for truss. Suprisingly simple, but, then, the other
|
||||
* The main module for truss. Surprisingly simple, but, then, the other
|
||||
* files handle the bulk of the work. And, of course, the kernel has to
|
||||
* do a lot of the work :).
|
||||
*/
|
||||
|
@ -137,7 +137,7 @@ powerpc_syscall_entry(struct trussinfo *trussinfo, int nargs) {
|
||||
/*
|
||||
* FreeBSD has two special kinds of system call redirctions --
|
||||
* SYS_syscall, and SYS___syscall. The former is the old syscall()
|
||||
* routine, basicly; the latter is for quad-aligned arguments.
|
||||
* routine, basically; the latter is for quad-aligned arguments.
|
||||
*/
|
||||
regargs = NARGREG;
|
||||
syscall_num = regs.fixreg[0];
|
||||
|
@ -129,7 +129,7 @@ powerpc64_syscall_entry(struct trussinfo *trussinfo, int nargs) {
|
||||
/*
|
||||
* FreeBSD has two special kinds of system call redirctions --
|
||||
* SYS_syscall, and SYS___syscall. The former is the old syscall()
|
||||
* routine, basicly; the latter is for quad-aligned arguments.
|
||||
* routine, basically; the latter is for quad-aligned arguments.
|
||||
*/
|
||||
regargs = NARGREG;
|
||||
syscall_num = regs.fixreg[0];
|
||||
|
@ -135,7 +135,7 @@ sparc64_syscall_entry(struct trussinfo *trussinfo, int nargs) {
|
||||
/*
|
||||
* FreeBSD has two special kinds of system call redirctions --
|
||||
* SYS_syscall, and SYS___syscall. The former is the old syscall()
|
||||
* routine, basicly; the latter is for quad-aligned arguments.
|
||||
* routine, basically; the latter is for quad-aligned arguments.
|
||||
*/
|
||||
syscall_num = regs.r_global[1];
|
||||
if (syscall_num == SYS_syscall || syscall_num == SYS___syscall) {
|
||||
|
@ -582,17 +582,9 @@ stop_gjournal()
|
||||
# Function to wipe the potential backup gpt table from a disk
|
||||
clear_backup_gpt_table()
|
||||
{
|
||||
# Get the disk block size
|
||||
local dSize="`gpart show $1 | grep $1 | tr -s ' ' | cut -d ' ' -f 3`"
|
||||
|
||||
# Make sure this is a valid number
|
||||
is_num "${dSize}" >/dev/null 2>/dev/null
|
||||
[ $? -ne 0 ] && return
|
||||
|
||||
# Die backup label, DIE
|
||||
echo_log "Clearing gpt backup table location on disk"
|
||||
rc_nohalt "dd if=/dev/zero of=${1} bs=512 seek=${dSize}"
|
||||
|
||||
rc_nohalt "dd if=/dev/zero of=${1} bs=1m count=1"
|
||||
rc_nohalt "dd if=/dev/zero of=${1} bs=1m oseek=`diskinfo ${1} | awk '{print int($3 / (1024*1024)) - 4;}'`"
|
||||
} ;
|
||||
|
||||
|
||||
|
@ -120,9 +120,11 @@ COMPTMPDIR=\"${COMPTMPDIR}\"
|
||||
export COMPTMPDIR
|
||||
CFILE=\"${CFILE}\"
|
||||
export CFILE
|
||||
mount -t devfs devfs /dev
|
||||
|
||||
sh ${COMPTMPDIR}/install.sh
|
||||
|
||||
umount /dev
|
||||
" >${FSMNT}/.componentwrapper.sh
|
||||
chmod 755 ${FSMNT}/.componentwrapper.sh
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user