From owner-p4-projects@FreeBSD.ORG Sun May 4 15:45:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 02ABB37B405; Sun, 4 May 2003 15:45:29 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 910EF37B401 for ; Sun, 4 May 2003 15:45:29 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B128E43FA3 for ; Sun, 4 May 2003 15:45:28 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h44MjS0U096773 for ; Sun, 4 May 2003 15:45:28 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h44MjSST096770 for perforce@freebsd.org; Sun, 4 May 2003 15:45:28 -0700 (PDT) Date: Sun, 4 May 2003 15:45:28 -0700 (PDT) Message-Id: <200305042245.h44MjSST096770@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30557 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 May 2003 22:45:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=30557 Change 30557 by marcel@marcel_nfs on 2003/05/04 15:44:31 Next round of fixes: o Port alpha. gdb_singlestep has not been ported yet. I noticed on i386 that step is implemented by setting a breakpoint (Z packet), which we don't handle. If gdb on alpha does the same, it won't work anyway... o Slight tweaking of prototypes and macros now that we have alpha ported as well. o Fix decoding of packets. o Implement the link map functionality. Note that booting with -dg still produces a warning. I'd like to fix that to even though it's not a regression. More to come... Affected files ... .. //depot/projects/sio/sys/alpha/alpha/db_interface.c#2 edit .. //depot/projects/sio/sys/alpha/alpha/machdep.c#3 edit .. //depot/projects/sio/sys/alpha/alpha/sio_machdep.c#2 edit .. //depot/projects/sio/sys/alpha/include/db_machdep.h#2 edit .. //depot/projects/sio/sys/ddb/db_gdb.c#4 edit .. //depot/projects/sio/sys/ddb/db_main.c#2 edit .. //depot/projects/sio/sys/ddb/ddb.h#4 edit .. //depot/projects/sio/sys/i386/i386/db_interface.c#4 edit .. //depot/projects/sio/sys/i386/include/db_machdep.h#5 edit .. //depot/projects/sio/sys/ia64/ia64/db_interface.c#4 edit .. //depot/projects/sio/sys/ia64/include/db_machdep.h#3 edit .. //depot/projects/sio/sys/kern/link_elf.c#3 edit Differences ... ==== //depot/projects/sio/sys/alpha/alpha/db_interface.c#2 (text+ko) ==== @@ -68,6 +68,7 @@ #include #include #include +#include #include @@ -81,13 +82,6 @@ static jmp_buf *db_nofault = 0; extern jmp_buf db_jmpbuf; -extern void gdb_handle_exception(db_regs_t *, int, int); - -#if 0 -extern char *trap_type[]; -extern int trap_types; -#endif - int db_active; void ddbprinttrap(unsigned long, unsigned long, unsigned long, @@ -578,3 +572,139 @@ db_printf("ipis = 0x%lx\n", pc->pc_pending_ipis); db_printf("next ASN = %d\n", pc->pc_next_asn); } + +/* + * Remote GDB support. + */ + +/* + * Map trapframe indices into gdb (integer) register indices. + * Entries not in integer register set are set to -1. + */ +static int tf2gdb[FRAME_SIZE] = { +/*0*/ R_V0, R_T0, R_T1, R_T2, R_T3, R_T4, R_T5, R_T6, +/*8*/ R_T7, R_S0, R_S1, R_S2, R_S3, R_S4, R_S5, R_S6, +/*16*/ R_A3, R_A4, R_A5, R_T8, R_T9, R_T10, R_T11, R_RA, +/*24*/ R_T12, R_AT, R_SP, -1, -1, -1, -1, -1, +/*32*/ -1, R_GP, R_A0, R_A1, R_A2, +}; + +/* + * Map gdb register indices back to trapframe. + * Entries not in trapframe are set to -1. + */ +static int gdb2tf[GDB_REGS] = { + /* integer registers */ + FRAME_V0, FRAME_T0, FRAME_T1, FRAME_T2, + FRAME_T3, FRAME_T4, FRAME_T5, FRAME_T6, + FRAME_T7, FRAME_S0, FRAME_S1, FRAME_S2, + FRAME_S3, FRAME_S4, FRAME_S5, FRAME_S6, + FRAME_A0, FRAME_A1, FRAME_A2, FRAME_A3, + FRAME_A4, FRAME_A5, FRAME_T8, FRAME_T9, + FRAME_T10, FRAME_T11, FRAME_RA, FRAME_T12, + FRAME_AT, FRAME_GP, FRAME_SP, -1, + /* float registers */ + -1, -1, -1, -1, + -1, -1, -1, -1, + -1, -1, -1, -1, + -1, -1, -1, -1, + -1, -1, -1, -1, + -1, -1, -1, -1, + -1, -1, -1, -1, + -1, -1, -1, -1, + /* misc registers */ + FRAME_PC, -1, +}; + +int +gdb_signal(int type, int code) +{ + + switch (type) { + case ALPHA_KENTRY_INT: + case ALPHA_KENTRY_ARITH: + return (SIGILL); /* ? can this happen? */ + case ALPHA_KENTRY_MM: + switch (code) { + case ALPHA_MMCSR_INVALTRANS: + return (SIGSEGV); + case ALPHA_MMCSR_ACCESS: + case ALPHA_MMCSR_FOR: + case ALPHA_MMCSR_FOE: + case ALPHA_MMCSR_FOW: + return (SIGBUS); + } + break; + case ALPHA_KENTRY_IF: + switch (code) { + case ALPHA_IF_CODE_BUGCHK: + case ALPHA_IF_CODE_BPT: + return (SIGTRAP); + case ALPHA_IF_CODE_GENTRAP: + case ALPHA_IF_CODE_FEN: + case ALPHA_IF_CODE_OPDEC: + return (SIGILL); + } + break; + case ALPHA_KENTRY_UNA: + return (SIGSEGV); + case ALPHA_KENTRY_SYS: + return (SIGILL); + } + return (SIGILL); +} + +gdb_reg +gdb_getreg(struct gdb_registers *regs, int regnum) +{ + gdb_reg *regp; + + regp = (void*)regs; + if ((void*)(regp + regnum) < (void*)(regs + 1)) + return (regp[regnum]); + /* XXX complain. */ + return (~0); +} + +void +gdb_setreg(struct gdb_registers *regs, int regnum, gdb_reg val) +{ + gdb_reg *regp; + + regp = (void*)regs; + if ((void*)(regp + regnum) < (void*)(regs + 1)) + regp[regnum] = val; +} + +void +gdb_getregs(struct gdb_registers *regs, db_regs_t *raw_regs) +{ + int i; + + bzero(regs, sizeof(*regs)); + + /* Map trapframe to registers. Ignore float regs for now. */ + for (i = 0; i < FRAME_SIZE; i++) { + if (tf2gdb[i] >= 0) + regs->r[tf2gdb[i]] = raw_regs->tf_regs[i]; + } + regs->r[GDB_REGNUM_PC] = raw_regs->tf_regs[FRAME_PC]; +} + +void +gdb_setregs(struct gdb_registers *regs, db_regs_t *raw_regs) +{ + int i; + + /* Map gdb registers back to trapframe (ignoring fp regs). */ + for (i = 0; i < GDB_REGS; i++) { + if (gdb2tf[i] >= 0) + raw_regs->tf_regs[gdb2tf[i]] = regs->r[i]; + } + raw_regs->tf_regs[FRAME_PC] = regs->r[GDB_REGNUM_PC]; +} + +void +gdb_singlestep(struct gdb_registers *regs, int set) +{ +} ==== //depot/projects/sio/sys/alpha/alpha/machdep.c#3 (text+ko) ==== @@ -1001,7 +1001,7 @@ * Initialize debuggers, and break into them if appropriate. */ #ifdef DDB - kdb_init(); + db_init(); if (boothowto & RB_KDB) { printf("Boot flags requested debugger\n"); breakpoint(); ==== //depot/projects/sio/sys/alpha/alpha/sio_machdep.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002 Marcel Moolenaar + * Copyright (c) 2002, 2003 Marcel Moolenaar * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -42,22 +42,63 @@ #include int -sio_get_console(struct sio_consdata *cd) +sio_get_console(struct sio_devdata *dd) { struct ctb *ctb; - bzero(cd, sizeof(*cd)); + bzero(dd, sizeof(*dd)); ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off); if (ctb->ctb_term_type != CTB_PRINTERPORT) return (ENXIO); boothowto |= RB_SERIAL; - cd->bsh = 0x3f8; - cd->bst = busspace_isa_io; - cd->baud = 9600; - cd->databits = 8; - cd->stopbits = 1; - cd->parity = 0; + dd->bsh = 0x3f8; + dd->bst = busspace_isa_io; + dd->baud = 9600; + dd->databits = 8; + dd->stopbits = 1; + dd->parity = 0; return (0); } + +int +sio_get_dbgport(struct sio_devdata *dd) +{ + unsigned int i, ivar; + + bzero(dd, sizeof(*dd)); + + /* + * Scan the hints. We only try units 0 to 3 (inclusive). This + * covers the ISA legacy where 4 UARTs had their resources + * predefined. + */ + for (i = 0; i < 4; i++) { + if (resource_int_value("sio", i, "flags", &ivar)) + continue; + if (!COM_DEBUGGER(ivar)) + continue; + /* We have a possible debug port. Make sure it's enabled. */ + if (resource_int_value("sio", i, "disabled", &ivar) == 0 && + ivar != 0) + continue; + /* It's alive. Get the port. */ + if (resource_int_value("sio", i, "port", &ivar) != 0 || + ivar == 0) + continue; + dd->bsh = ivar; + dd->bst = busspace_isa_io; + if (resource_int_value("sio", i, "baud", &ivar) != 0) + ivar = 0; + dd->baud = ivar; + dd->databits = 8; + dd->stopbits = 1; + dd->parity = 0; + + printf("GDB: sio%d: debug port\n", i); + return (0); + } + + return (ENXIO); +} ==== //depot/projects/sio/sys/alpha/include/db_machdep.h#2 (text+ko) ==== @@ -113,4 +113,19 @@ */ #define DB_ELFSIZE 64 +/* + * Remote GDB support. + */ +#define GDB_REGNUM_FP 15 +#define GDB_REGNUM_SP 30 +#define GDB_REGNUM_PC 64 +#define GDB_REGS 66 + +typedef uint64_t gdb_reg; +typedef uint64_t gdb_int; + +struct gdb_registers { + gdb_reg r[GDB_REGS]; +}; + #endif /* _ALPHA_DB_MACHDEP_H_ */ ==== //depot/projects/sio/sys/ddb/db_gdb.c#4 (text+ko) ==== @@ -69,8 +69,15 @@ #define gdb_getc dbgport->dbg_getc #define gdb_putc dbgport->dbg_putc -static int -gdb_hex(char ch) +static __inline int +ishex(int c) +{ + return ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F') || + (c >= 'a' && c <= 'f')) ? 1 : 0; +} + +static __inline int +tohex(char ch) { if (ch >= 'a' && ch <= 'f') @@ -85,7 +92,7 @@ static int gdb_getpacket(char *buffer) { - int count, i; + int count; unsigned char ch, checksum, xmitcsum; if (dbgport == NULL) @@ -93,7 +100,7 @@ do { /* Wait for '$'. Ignore all other characters. */ - while ((ch = gdb_getc()) != '$') + while (gdb_getc() != '$') ; checksum = 0; @@ -112,25 +119,13 @@ return (ENOMEM); buffer[count] = 0; - xmitcsum = gdb_hex(gdb_getc()) << 4; - xmitcsum += gdb_hex(gdb_getc()); + xmitcsum = tohex(gdb_getc()) << 4; + xmitcsum += tohex(gdb_getc()); - if (checksum == xmitcsum) { - /* successful transfer */ + if (checksum == xmitcsum) gdb_putc('+'); - - /* If there's a sequence char, echo the sequence ID. */ - if (buffer[2] == ':') { - gdb_putc(buffer[0]); - gdb_putc(buffer[1]); - - /* remove sequence chars from buffer */ - for (i = 3; i <= count; i++) - buffer[i - 3] = buffer[i]; - count -= 3; - } - } else - gdb_putc('-'); /* failed checksum */ + else + gdb_putc('-'); } while (checksum != xmitcsum); return (0); @@ -145,7 +140,7 @@ if (dbgport == NULL) return (ENXIO); - /* $#. */ + /* $# */ do { #ifdef GDB_REMOTE_CHAT /* @@ -174,7 +169,7 @@ gdb_putc('#'); gdb_putc(hexchars[checksum >> 4]); gdb_putc(hexchars[checksum & 0xf]); - } while ((gdb_getc() & 0x7f) != '+'); + } while (gdb_getc() != '+'); return (0); } @@ -185,7 +180,7 @@ { if (dbgport == NULL) { - db_printf("No gdb port enabled.\n"); + db_printf("GDB: No debug port configured.\n"); return; } @@ -201,12 +196,10 @@ struct dbgdev *dd, **set; int error; - printf("gdb_init called\n"); SET_FOREACH(set, dbgdev_set) { dd = *set; if (dd->dbg_probe == NULL) continue; - printf("Probing device: %s\n", dd->dbg_devname); error = dd->dbg_probe(); if (error) continue; @@ -243,63 +236,38 @@ } static __inline int -gdb_dec_int8(void) +gdb_dec_skip(int c) { - int h, l; - h = gdb_hex(gdb_dec_char()); - l = gdb_hex(gdb_dec_char()); - if (h != -1 && l != -1) - return ((h << 4) | (l & 0xf)); - else - return (-1); + if (encdecsz > 0 && *encdecp == c) { + encdecsz--; + encdecp++; + return (0); + } + return (EINVAL); } static __inline int -gdb_dec_int16(void) +gdb_dec_hex(gdb_reg *resp) { - int h, l; - h = gdb_dec_int8(); - l = gdb_dec_int8(); - if (h != -1 && l != -1) - return ((h << 8) | (l & 0xff)); - else - return (-1); -} - -static __inline int32_t -gdb_dec_int32(void) -{ - int32_t h, l; - h = gdb_dec_int16(); - l = gdb_dec_int16(); - if (h != -1 && l != -1) - return ((h << 16) | (l & 0xffff)); - else - return (-1); -} - -static __inline uint64_t -gdb_dec_int64(void) -{ - int64_t h, l; - h = gdb_dec_int32(); - l = gdb_dec_int32(); - if (h != -1 && l != -1) - return ((h << 32) | (l & 0xffffffff)); - else - return (-1); + gdb_reg res = 0; + if (encdecsz == 0 || !ishex(*encdecp)) + return (ENOENT); + do { + res <<= 4; + res |= tohex(gdb_dec_char()); + } while (encdecsz > 0 && ishex(*encdecp)); + *resp = res; + return (0); } static __inline int -gdb_dec_block(gdb_addr addr, int len) +gdb_dec_block(gdb_int addr, int len) { uint8_t *p = (void*)(intptr_t)addr; - int c; - while (len > 0) { - c = gdb_dec_int8(); - if (c == -1) - return (-1); - *p++ = c; + uint8_t v; + while (len > 0 && encdecsz > 1) { + v = (tohex(gdb_dec_char()) << 4) | tohex(gdb_dec_char()); + *p++ = v; len--; } return 0; @@ -348,45 +316,36 @@ } static __inline void -gdb_enc_int16(uint16_t i) +gdb_enc_block(void *addr, int len) { - gdb_enc_int8(i >> 8); - gdb_enc_int8(i & 0xff); + uint8_t *p = addr; + while (len > 0) + gdb_enc_int8(*p++), len--; } static __inline void -gdb_enc_int32(uint32_t i) +gdb_enc_reg(gdb_reg reg) { - gdb_enc_int16(i >> 16); - gdb_enc_int16(i & 0xffff); -} - -static __inline void -gdb_enc_int64(uint64_t i) -{ - gdb_enc_int32(i >> 32); - gdb_enc_int32(i & 0xffffffff); -} - -static __inline void -gdb_enc_block(gdb_addr addr, int len) -{ - uint8_t *p = (void*)(intptr_t)addr; - while (len > 0) - gdb_enc_int8(*p++), len--; + gdb_enc_block(®, sizeof(reg)); } static __inline void gdb_enc_registers(struct gdb_registers *regs) { - gdb_enc_block((intptr_t)regs, sizeof(*regs)); + gdb_enc_block(regs, sizeof(*regs)); } /* * gdb_handle_exception * - * This function does all command processing for interfacing to gdb. The - * following gdb commands are supported: + * This function does all command processing for interfacing to gdb. All + * commands and responses (except for acknowledgements) are sent as + * packets. A packet is started with '$', followed by the actual data and + * terminated with '#' followed by a 2 (two) digit checksum: + * + * $# + * + * The following gdb commands are supported: * * command function Return value * @@ -408,15 +367,6 @@ * * D detach OK * - * All commands and responses are sent with a packet which includes a - * checksum. A packet consists of - * - * $#. - * - * where - * = characters representing the command or response - * = two hex digits computed as modulo 256 sum of - * * When a packet is received, it is first acknowledged with either '+' or '-'. * '+' indicates a successful transfer. '-' indicates a failed transfer. * @@ -427,12 +377,11 @@ */ int -gdb_handle_exception(db_regs_t *raw_regs, int type) +gdb_handle_exception(db_regs_t *raw_regs, int type, int code) { struct gdb_registers regs; - gdb_addr addr; - gdb_reg reg; - int c, error, len, regno; + gdb_int addr, len, reg, regno; + int error; if (dbgport == NULL) { db_printf("GDB: No debug port configured.\n"); @@ -441,10 +390,9 @@ gdb_getregs(®s, raw_regs); - /* "TxxPC:xxxxxxxx;FP:xxxxxxxx;SP:xxxxxxxx;" */ gdb_enc_begin(gdb_buffer, sizeof(gdb_buffer)); gdb_enc_char('T'); - gdb_enc_int8(gdb_signal(type)); + gdb_enc_int8(gdb_signal(type, code)); gdb_enc_int8(GDB_REGNUM_PC); gdb_enc_char(':'); gdb_enc_reg(gdb_getreg(®s, GDB_REGNUM_PC)); @@ -471,14 +419,21 @@ case '?': gdb_enc_begin(gdb_buffer, sizeof(gdb_buffer)); gdb_enc_char('S'); - gdb_enc_int8(gdb_signal(type)); + gdb_enc_int8(gdb_signal(type, code)); gdb_enc_end(); gdb_putpacket(gdb_buffer); break; + case 'c' : + /* cAA..AA Continue at address AA..AA (opt) */ + gdb_singlestep(®s, 0); + error = gdb_dec_hex(&addr); + if (!error) + gdb_setreg(®s, GDB_REGNUM_PC, addr); + gdb_setregs(®s, raw_regs); + return (0); + case 'D': - /* Detach; say OK and turn off gdb */ - gdb_putpacket("OK"); boothowto &= ~RB_GDB; return (0); @@ -496,27 +451,19 @@ gdb_putpacket("OK"); break; - case 'P': - /* Set the value of one register */ - regno = gdb_dec_int32(); - c = gdb_dec_char(); - reg = gdb_dec_reg(); - if (regno > 0 && c == '=') { - gdb_setreg(®s, regno, reg); - gdb_putpacket("OK"); - } else - gdb_putpacket("P01"); - break; + case 'k': + boothowto &= ~RB_GDB; + return (0); case 'm': /* mAA..AA,LLLL Read LLLL bytes at address AA..AA */ /* Try to read %x,%x. */ - addr = gdb_dec_addr(); - c = gdb_dec_char(); - len = gdb_dec_int32(); - if (c == ',' && len > 0) { + error = gdb_dec_hex(&addr); + error = (!error) ? gdb_dec_skip(',') : error; + error = (!error) ? gdb_dec_hex(&len) : error; + if (!error) { gdb_enc_begin(gdb_buffer, sizeof(gdb_buffer)); - gdb_enc_block(addr, len); + gdb_enc_block((void*)(intptr_t)addr, len); gdb_enc_end(); gdb_putpacket(gdb_buffer); /* XXX return "E03" when encoding fails. */ @@ -528,10 +475,11 @@ /* MAA..AA,LLLL: Write LLLL bytes at address AA.AA */ /* return OK */ /* Try to read '%x,%x:'. */ - addr = gdb_dec_addr(); - c = gdb_dec_char(); - len = gdb_dec_int32(); - if (c == ',' && len > 0 && gdb_dec_char() == ':') { + error = gdb_dec_hex(&addr); + error = (!error) ? gdb_dec_skip(',') : error; + error = (!error) ? gdb_dec_hex(&len) : error; + error = (!error) ? gdb_dec_skip(':') : error; + if (!error) { gdb_dec_block(addr, len); gdb_putpacket("OK"); /* XXX return "E03" when decoding fails. */ @@ -539,23 +487,34 @@ gdb_putpacket("E02"); break; - case 'c' : - /* cAA..AA Continue at address AA..AA (opt) */ - gdb_singlestep(®s, 0); - addr = gdb_dec_addr(); - if (addr != ~0U) - gdb_setreg(®s, GDB_REGNUM_PC, addr); - gdb_setregs(®s, raw_regs); - return (0); + case 'P': + /* Set the value of one register */ + error = gdb_dec_hex(®no); + error = (!error) ? gdb_dec_skip('=') : error; + error = (!error) ? gdb_dec_hex(®) : error; + if (!error) { + gdb_setreg(®s, regno, reg); + gdb_putpacket("OK"); + } else + gdb_putpacket("E01"); + break; case 's' : /* sAA..AA Step one instruction from AA..AA (opt) */ gdb_singlestep(®s, 1); - addr = gdb_dec_addr(); - if (addr != ~0U) + error = gdb_dec_hex(&addr); + if (!error) gdb_setreg(®s, GDB_REGNUM_PC, addr); gdb_setregs(®s, raw_regs); return (0); + + default: + /* + * Empty response. Tells GDB that we don't understand + * the command. + */ + gdb_putpacket(""); + break; } /* switch */ } ==== //depot/projects/sio/sys/ddb/db_main.c#2 (text+ko) ==== @@ -30,10 +30,70 @@ #include #include #include +#include +#include +#include #include #include +#define GDB_STATE(s) r_debug.r_state = s; r_debug_state(NULL, NULL); + +static struct r_debug r_debug; + +struct db_module { + STAILQ_ENTRY(db_module) link; + linker_file_t file; + struct link_map map; +}; + +STAILQ_HEAD(db_module_list, db_module); + +static struct db_module_list db_modules = STAILQ_HEAD_INITIALIZER(db_modules); + +/* + * Function for the debugger to set a breakpoint on to gain control. + */ +static void +r_debug_state(struct r_debug *a1 __unused, struct link_map *a2 __unused) +{ +} + +static void +gdb_add_link_map(struct link_map *l) +{ + struct link_map *prev; + + l->l_next = NULL; + + if (r_debug.r_map == NULL) { + /* Add first. */ + l->l_prev = NULL; + r_debug.r_map = l; + } else { + /* Append to list. */ + for (prev = r_debug.r_map; prev->l_next != NULL; + prev = prev->l_next) + ; + l->l_prev = prev; + prev->l_next = l; + } +} + +static void +gdb_delete_link_map(struct link_map *l) +{ + if (l->l_prev == NULL) { + /* Remove first. */ + if ((r_debug.r_map = l->l_next) != NULL) + l->l_next->l_prev = NULL; + } else { + /* Remove any but first. */ + if ((l->l_prev->l_next = l->l_next) != NULL) + l->l_next->l_prev = l->l_prev; + } +} + boolean_t X_db_line_at_pc(db_symtab_t *symtab, c_db_sym_t sym, char **filename, int *linenum, db_expr_t off) @@ -71,18 +131,43 @@ * Called by the linker to notify that a module has been loaded. This * function is called after any MD specific load actions. */ -void db_load_file(linker_file_t lf) +void +db_load_file(linker_file_t lf, void * base, void *dyn) { - printf("db_load_file called (module=%s)\n", lf->filename); + struct db_module *m; + + GDB_STATE(RT_ADD); + m = malloc(sizeof(*m), M_TEMP, M_WAITOK|M_ZERO); + m->file = lf; + m->map.l_addr = base; + m->map.l_name = lf->filename; + m->map.l_ld = dyn; + STAILQ_INSERT_TAIL(&db_modules, m, link); + gdb_add_link_map(&m->map); + GDB_STATE(RT_CONSISTENT); } /* * Called by the linker to notify that a module is about to be unloaded. * This function is called prior to any MD specific unload actions. */ -void db_unload_file(linker_file_t lf) +void +db_unload_file(linker_file_t lf) { - printf("db_unload_file called (module=%s)\n", lf->filename); + struct db_module *m; + + STAILQ_FOREACH(m, &db_modules, link) { + if (m->file == lf) + break; + } + if (m == NULL) + return; + + GDB_STATE(RT_DELETE); + gdb_delete_link_map(&m->map); + STAILQ_REMOVE(&db_modules, m, db_module, link); + free(m, M_TEMP); + GDB_STATE(RT_CONSISTENT); } /* @@ -93,18 +178,22 @@ * pointer that needs to be updated, we know about the data that needs * to be maintained. */ -vm_offset_t db_debug_base(void) +vm_offset_t +db_debug_base(void) { - printf("db_debug_base called\n"); - return (0); + return ((intptr_t)&r_debug); } /* * Called by MD initialization code (preferrably after initializing the * low-level console) to initialize the debugger. */ -void db_init(void) +void +db_init(void) { + r_debug.r_map = NULL; + r_debug.r_brk = r_debug_state; + r_debug.r_state = RT_CONSISTENT; gdb_init(); } ==== //depot/projects/sio/sys/ddb/ddb.h#4 (text+ko) ==== @@ -163,12 +163,12 @@ gdb_reg gdb_getreg(struct gdb_registers *, int); void gdb_getregs(struct gdb_registers *, db_regs_t *); -int gdb_handle_exception(db_regs_t *, int); +int gdb_handle_exception(db_regs_t *, int, int); void gdb_init(void); void gdb_setreg(struct gdb_registers *, int, gdb_reg); void gdb_setregs(struct gdb_registers *, db_regs_t *); void gdb_singlestep(struct gdb_registers *, int); -int gdb_signal(int); +int gdb_signal(int, int); /* Scare the user with backtrace of curthread to console. */ void db_print_backtrace(void); @@ -176,7 +176,7 @@ /* Linker hooks. */ struct linker_file; vm_offset_t db_debug_base(void); -void db_load_file(struct linker_file *); +void db_load_file(struct linker_file *, void*, void*); void db_unload_file(struct linker_file *); /* * Command table. ==== //depot/projects/sio/sys/i386/i386/db_interface.c#4 (text+ko) ==== @@ -171,7 +171,7 @@ cndbctl(FALSE); } else { db_active = 1; - gdb_handle_exception(&ddb_regs, type); + gdb_handle_exception(&ddb_regs, type, code); } db_active = 0; @@ -304,7 +304,7 @@ } int -gdb_signal(int vector) +gdb_signal(int vector, int code __unused) { switch (vector & ~T_USER) { case 0: return (SIGFPE); /* divide by zero */ @@ -366,6 +366,8 @@ regs->ss = raw_regs->tf_ss; regs->ds = raw_regs->tf_ds; regs->es = raw_regs->tf_es; + regs->fs = raw_regs->tf_fs; + regs->gs = 0; } void @@ -386,6 +388,7 @@ raw_regs->tf_ss = regs->ss; raw_regs->tf_ds = regs->ds; raw_regs->tf_es = regs->es; + raw_regs->tf_fs = regs->fs; } void ==== //depot/projects/sio/sys/i386/include/db_machdep.h#5 (text+ko) ==== @@ -98,11 +98,7 @@ #define GDB_REGNUM_PC 8 typedef uint32_t gdb_reg; -typedef uint32_t gdb_addr; - -#define gdb_dec_addr gdb_dec_int32 -#define gdb_dec_reg gdb_dec_int32 -#define gdb_enc_reg gdb_enc_int32 +typedef uint32_t gdb_int; struct gdb_registers { gdb_reg eax; @@ -119,6 +115,8 @@ gdb_reg ss; gdb_reg ds; gdb_reg es; + gdb_reg fs; + gdb_reg gs; }; #endif /* !_MACHINE_DB_MACHDEP_H_ */ ==== //depot/projects/sio/sys/ia64/ia64/db_interface.c#4 (text+ko) ==== @@ -359,11 +359,11 @@ db_active++; if (ddb_mode) { - cndbctl(TRUE); /* DDB active, unblank video */ - db_trap(vector, 0); /* Where the work happens */ - cndbctl(FALSE); /* DDB inactive */ + cndbctl(TRUE); /* DDB active, unblank video */ + db_trap(vector, 0); /* Where the work happens */ + cndbctl(FALSE); /* DDB inactive */ } else - gdb_handle_exception(&ddb_regs, vector); + gdb_handle_exception(&ddb_regs, vector, 0); db_active--; @@ -394,7 +394,6 @@ intr_restore(s); - >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun May 4 17:04:08 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B164E37B404; Sun, 4 May 2003 17:04:07 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4F22F37B401 for ; Sun, 4 May 2003 17:04:07 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B749043FEA for ; Sun, 4 May 2003 17:04:06 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h450460U007038 for ; Sun, 4 May 2003 17:04:06 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h45046dt007035 for perforce@freebsd.org; Sun, 4 May 2003 17:04:06 -0700 (PDT) Date: Sun, 4 May 2003 17:04:06 -0700 (PDT) Message-Id: <200305050004.h45046dt007035@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30562 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2003 00:04:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=30562 Change 30562 by marcel@marcel_nfs on 2003/05/04 17:03:54 Cleanup context.s: remove most of the _get_* and _set_* functions as they were unused. Rename _{g|s}et_callee_saved and _{g|s{et)_callee_saved_fp to {save|restore}_callee_saved and {save|restore}_sallee_saved_fp (resp) and expose them in _regset.h. They come in handy for proper signal handling. Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia64/context.s#15 edit .. //depot/projects/ia64_epc/sys/ia64/include/_regset.h#10 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia64/context.s#15 (text+ko) ==== @@ -305,283 +305,67 @@ END(swapctx) /* - * _getcontext(ucontext_t *ucp) + * save_callee_saved(struct _callee_saved *) */ -ENTRY(_getcontext, 1) +ENTRY(save_callee_saved, 1) { .mii -1: nop 0 - mov r17=ip - add r16=UC_MCONTEXT+MC_SPECIAL,r32 - ;; -} -{ .mfb - add r17=2f-1b,r17 nop 0 - br.sptk _get_special_sync - ;; -} -{ .mmi -2: alloc loc0=ar.pfs,1,2,1,0 - ;; - add in0=UC_MCONTEXT,in0 - mov loc1=rp - ;; -} -{ .mmb - st8 [in0]=r0 - add out0=MC_PRESERVED,in0 - br.call.sptk rp=_get_callee_saved - ;; -} -{ .mib - add out0=MC_PRESERVED_FP,in0 - add in0=8,in0 - br.call.sptk rp=_get_callee_saved_fp - ;; -} -{ .mii - st8 [in0]=r0 - mov ar.pfs=loc0 - mov rp=loc1 - ;; -} -{ .mfb - nop 0 - nop 0 - br.ret.sptk rp + add r14=8,r32 + add r15=16,r32 ;; } -END(_getcontext) - -/* - * _setcontext(ucontext_t *ucp) - */ -ENTRY(_setcontext, 1) { .mmi - alloc loc0=ar.pfs,1,2,1,0 - ;; - nop 0 - mov loc1=rp - ;; -} -{ .mib - nop 0 - add out0=UC_MCONTEXT+MC_PRESERVED_FP,in0 - br.call.sptk rp=_set_callee_saved_fp - ;; -} -{ .mib - nop 0 - add out0=UC_MCONTEXT+MC_PRESERVED,in0 - br.call.sptk rp=_set_callee_saved - ;; -} -{ .mib - nop 0 - add r16=UC_MCONTEXT+MC_SPECIAL,in0 - br.sptk _set_special_sync - ;; -} -END(_setcontext) - -/* - * _{get|set}_special_sync - * Does not follow runtime convention! - * - * inputs: r16 struct _special - * r17 return address - */ -ENTRY(_get_special_sync, 0) -{ .mii - flushrs - mov b6=r17 - add r17=8,r16 - ;; -} -{ .mmi - st8 [r16]=r1,16 // gp - st8 [r17]=r12,16 // sp - mov r18=b0 - ;; -} -{ .mmi - st8 [r16]=r13,16 // tp - mov r19=ar.rsc - mov r20=pr - ;; -} -{ .mmi - st8 [r17]=r18,16 // rp - mov ar.rsc=0 - mov r21=ar.pfs - ;; -} -{ .mmb - st8 [r16]=r20,16 // pr - st8 [r17]=r19,16 // ar.rsc - nop 0 - ;; -} -{ .mmi - st8 [r16]=r21,16 // ar.pfs - mov r22=ar.bsp - nop 1 - ;; -} -{ .mmb - st8 [r17]=r22,16 // ar.bspstore - mov r23=ar.rnat - nop 2 - ;; -} -{ .mmi - st8 [r16]=r23 // ar.rnat - mov r24=ar.fpsr - nop 3 - ;; -} -{ .mmb - st8 [r17]=r24 // ar.fpsr - mov ar.rsc=r19 - br.sptk b6 - ;; -} -END(_get_special_sync) - -/* - * inputs: r16 struct _special - */ -ENTRY(_set_special_sync, 0) -{ .mmi - invala - mov ar.rsc=0 - add r17=8,r16 - ;; -} -{ .mmb - ld8 r1=[r16],16 // gp - ld8 r12=[r17],16 // sp - nop 0 - ;; -} -{ .mmb - ld8 r13=[r16],16 // tp - ld8 r18=[r17],16 // rp - nop 1 - ;; -} -{ .mmi - ld8 r19=[r16],16 // pr - ld8 r20=[r17],16 // ar.rsc - mov b0=r18 - ;; -} -{ .mmi - loadrs - ld8 r21=[r16],16 // ar.pfs - mov pr=r19,0x1fffe - ;; -} -{ .mmi - ld8 r22=[r17],16 // ar.bspstore - ld8 r23=[r16] // ar.rnat - mov ar.pfs=r21 - ;; -} -{ .mmb - ld8 r24=[r17] // ar.fpsr - mov ar.bspstore=r22 - nop 2 - ;; -} -{ .mmb - mov ar.rnat=r23 - mov ar.rsc=r20 - nop 3 - ;; -} -{ .mib - mov ar.fpsr=r24 - nop 4 - br.ret.sptk rp - ;; -} -END(_set_special_sync) - -/* - * General register sets: - * _get_callee_saved - Save preserved registers. - * _set_callee_saved - Restore preserved registers. - * _get_caller_saved - Save scratch registers. - * _set_caller_saved - Restore scratch registers. - */ - -/* - * _get_callee_saved - * - * clobbers: r2,r3,r26-r31 - */ -ENTRY(_get_callee_saved, 1) -{ .mii - mov r31=ar.unat - add r2=8,r32 - add r3=16,r32 - ;; -} -{ .mmi .mem.offset 8,0 - st8.spill [r2]=r4,16 // r4 + st8.spill [r14]=r4,16 // r4 .mem.offset 16,0 - st8.spill [r3]=r5,16 // r5 - mov r29=b1 + st8.spill [r15]=r5,16 // r5 + mov r16=b1 ;; } { .mmi .mem.offset 24,0 - st8.spill [r2]=r6,16 // r6 + st8.spill [r14]=r6,16 // r6 .mem.offset 32,0 - st8.spill [r3]=r7,16 // r7 - mov r28=b2 + st8.spill [r15]=r7,16 // r7 + mov r17=b2 ;; } { .mmi - st8 [r2]=r31,16 // unat (before) - mov r30=ar.unat - mov r27=b3 + st8 [r14]=r16,16 // b1 + mov r18=ar.unat + mov r19=b3 ;; } { .mmi - st8 [r32]=r30 // nat (after) - st8 [r3]=r29,16 // b1 - mov r26=b4 + st8 [r32]=r18 // nat (after) + st8 [r15]=r17,16 // b2 + mov r16=b4 ;; } { .mmi - st8 [r2]=r28,16 // b2 - st8 [r3]=r27,16 // b3 - mov r29=b5 + st8 [r14]=r19,16 // b3 + st8 [r15]=r16,16 // b4 + mov r17=b5 ;; } -{ .mmi - st8 [r2]=r26,16 // b4 - st8 [r3]=r29 // b5 - mov r31=ar.lc +{ .mfi + st8 [r14]=r17,16 // b5 + nop 0 + mov r16=ar.lc ;; } -{ .mfb - st8 [r2]=r31 // ar.lc - nop 0 +{ .mmb + st8 [r15]=r16 // ar.lc + st8 [r14]=r0 // __spare br.ret.sptk rp ;; } -END(_get_callee_saved) +END(save_callee_saved) /* - * _set_callee_saved - * - * clobbers: r27-r32 + * restore_callee_saved(struct _callee_saved *) */ -ENTRY(_set_callee_saved, 1) +ENTRY(restore_callee_saved, 1) { .mmi ld8 r30=[r32],16 // nat (after) ;; @@ -598,343 +382,45 @@ { .mmb ld8.fill r6=[r31],16 // r6 ld8.fill r7=[r32],16 // r7 - nop 1 + nop 0 ;; } { .mmi - ld8 r29=[r32],16 // b1 + ld8 r30=[r31],16 // b1 + ld8 r29=[r32],16 // b2 + nop 0 ;; - ld8 r30=[r31],16 // unat (before) - mov b1=r29 - ;; } { .mmi - ld8 r29=[r31],16 // b2 + ld8 r28=[r31],16 // b3 + ld8 r27=[r32],16 // b4 + mov b1=r30 ;; - ld8 r28=[r32],16 // b3 +} +{ .mii + ld8 r26=[r31] // b5 mov b2=r29 - ;; -} -{ .mmi - ld8 r29=[r31],16 // b4 - ld8 r27=[r32] // b5 mov b3=r28 ;; } { .mii - ld8 r28=[r31] // ar.lc - mov b4=r29 - mov b5=r27 + ld8 r25=[r32] // lc + mov b4=r27 + mov b5=r26 ;; } { .mib - mov ar.unat=r30 - mov ar.lc=r28 - br.ret.sptk rp - ;; -} -END(_set_callee_saved) - -/* - * _get_caller_saved - * - * Does not follow runtime specification: - * inputs: r16 = pointer to struct _caller_saved - * r17 = return address (no call/ret semantics) - * precondition: Must be called with register bank 0 selected, - * - * postcondition: Will return with register bank 1 selected. - */ -ENTRY(_get_caller_saved, 0) - mov r18=ar.unat - mov r19=r2 - add r2=8,r16 - mov r20=r3 - add r3=16,r16 - mov r21=r8 - ;; -{ .mmi - .mem.offset 8,0 - st8.spill [r2]=r19,16 // r2 - .mem.offset 16,0 - st8.spill [r3]=r20,16 // r3 - mov r8=r16 - ;; -} -{ .mmi - .mem.offset 24,0 - st8.spill [r2]=r21,16 // r8 - .mem.offset 32,0 - st8.spill [r3]=r9,16 // r9 - mov r9=r17 - ;; -} -{ .mmi - .mem.offset 40,0 - st8.spill [r2]=r10,16 // r10 - .mem.offset 48,0 - st8.spill [r3]=r11,16 // r11 - mov r10=r18 - ;; -} -{ .mmb - .mem.offset 56,0 - st8.spill [r2]=r14,16 // r14 - .mem.offset 64,0 - st8.spill [r3]=r15,16 // r15 - bsw.1 - ;; -} - /* We're using register bank 1 now. */ -{ .mmi - .mem.offset 72,0 - st8.spill [r2]=r16,16 // r16 - .mem.offset 80,0 - st8.spill [r3]=r17,16 // r17 - mov r14=b6 - ;; -} -{ .mmi - .mem.offset 88,0 - st8.spill [r2]=r18,16 // r18 - .mem.offset 96,0 - st8.spill [r3]=r19,16 // r19 - mov r15=b7 - ;; -} -{ .mmi - .mem.offset 104,0 - st8.spill [r2]=r20,16 // r20 - .mem.offset 112,0 - st8.spill [r3]=r21,16 // r21 - mov b6=r9 - ;; -} -{ .mmb - .mem.offset 120,0 - st8.spill [r2]=r22,16 // r22 - .mem.offset 128,0 - st8.spill [r3]=r23,16 // r23 nop 0 - ;; -} -{ .mmi - .mem.offset 136,0 - st8.spill [r2]=r24,16 // r24 - .mem.offset 144,0 - st8.spill [r3]=r25,16 // r25 - nop 1 - ;; -} -{ .mmb - .mem.offset 152,0 - st8.spill [r2]=r26,16 // r26 - .mem.offset 160,0 - st8.spill [r3]=r27,16 // r27 - nop 2 - ;; -} -{ .mmi - .mem.offset 168,0 - st8.spill [r2]=r28,16 // r28 - .mem.offset 176,0 - st8.spill [r3]=r29,16 // r29 - nop 3 - ;; -} -{ .mmb - .mem.offset 184,0 - st8.spill [r2]=r30,16 // r30 - .mem.offset 192,0 - st8.spill [r3]=r31,16 // r31 - nop 4 - ;; -} -{ .mmi - st8 [r2]=r10,16 // unat (before) - mov r9=ar.unat - nop 5 - ;; -} -{ .mmb - st8 [r3]=r14,16 // b6 - st8 [r2]=r15,16 // b7 - nop 6 - ;; -} -{ .mmi - st8 [r8]=r9,16 // nat (after) - mov r10=ar.ccv - nop 7 - ;; -} -{ .mmb - st8 [r3]=r10,16 // ccv - mov r9=ar.csd - nop 8 - ;; -} -{ .mmi - st8 [r2]=r9,16 // csd - mov r10=ar.ssd - nop 9 - ;; -} -{ .mmb - st8 [r3]=r10 // ssd - st8 [r2]=r0 // __spare - br.sptk b6 - ;; -} -END(_get_caller_saved) - -/* - * _set_caller_saved - * - * Does not follow runtime specification: - * inputs: r16 = pointer to struct _caller_saved - * r17 = return address (no call/ret semantics) - * precondition: Must be called with register bank 1 selected, - * - * postcondition: Will return with register bank 0 selected. - */ -ENTRY(_set_caller_saved, 0) -{ .mii - ld8 r8=[r16] // nat (after) - add r2=40,r16 - add r3=48,r16 - ;; -} -{ .mmi - mov ar.unat=r8 - mov r8=r16 - mov r9=r17 - ;; -} -{ .mmi - ld8.fill r10=[r2],16 // r10 - ld8.fill r11=[r3],16 // r11 - nop 0 - ;; -} -{ .mmb - ld8.fill r14=[r2],16 // r14 - ld8.fill r15=[r3],16 // r15 - nop 1 - ;; -} -{ .mmi - ld8.fill r16=[r2],16 // r16 - ld8.fill r17=[r3],16 // r17 - nop 2 - ;; -} -{ .mmb - ld8.fill r18=[r2],16 // r18 - ld8.fill r19=[r3],16 // r19 - nop 3 - ;; -} -{ .mmi - ld8.fill r20=[r2],16 // r20 - ld8.fill r21=[r3],16 // r21 - nop 4 - ;; -} -{ .mmb - ld8.fill r22=[r2],16 // r22 - ld8.fill r23=[r3],16 // r23 - nop 5 - ;; -} -{ .mmi - ld8.fill r24=[r2],16 // r24 - ld8.fill r25=[r3],16 // r25 - nop 6 - ;; -} -{ .mmb - ld8.fill r26=[r2],16 // r26 - ld8.fill r27=[r3],16 // r27 - nop 7 - ;; -} -{ .mmi - ld8.fill r28=[r2],16 // r28 - ld8.fill r29=[r3],16 // r29 - nop 8 - ;; -} -{ .mmb - ld8.fill r30=[r2],16 // r30 - ld8.fill r31=[r3],16 // r31 - bsw.0 - ;; -} - /* We're using register bank 0 now. */ -{ .mii - ld8 r18=[r2] // unat (before) - add r16=8,r8 - add r17=16,r8 -} -{ .mii - ld8 r19=[r3] // b6 - add r20=16,r2 - add r21=16,r3 - ;; -} -{ .mmi - ld8.fill r2=[r16],16 // r2 - ld8.fill r3=[r17],16 // r3 - mov rp=r9 - ;; -} -{ .mmi - ld8 r22=[r20],16 // b7 - ld8 r23=[r21],16 // ccv - mov b6=r19 - ;; -} -{ .mmi - ld8.fill r8=[r16] // r8 - ld8.fill r9=[r17] // r9 - mov b7=r16 - ;; -} -{ .mmb - ld8 r19=[r20] // csd - mov ar.unat=r18 - nop 9 - ;; -} -{ .mmi - ld8 r18=[r21] // ssd - mov ar.ccv=r17 - nop 10 - ;; -} -{ .mmb - mov ar.csd=r19 - mov ar.ssd=r18 + mov ar.lc=r25 br.ret.sptk rp ;; } -END(_get_called_saved) +END(restore_callee_saved) /* - * Floating point register sets: - * _get_callee_saved_fp - Save preserved FP registers. - * _set_callee_saved_fp - Restore preserved FP registers. - * _get_caller_saved_fp - Save scratch FP registers. - * _set_caller_saved_fp - Restore scratch FP registers. - * save_high_fp - Save high FP registers (scratch). - * restore_high_fp - Restore high FP registers (scratch). + * save_callee_saved_fp(struct _callee_saved_fp *) */ - -/* - * _get_callee_saved_fp - */ -ENTRY(_get_callee_saved_fp, 1) +ENTRY(save_callee_saved_fp, 1) add r31=16,r32 stf.spill [r32]=f2,32 ;; @@ -968,12 +454,12 @@ stf.spill [r31]=f31 br.ret.sptk rp ;; -END(_get_callee_saved_fp) +END(save_callee_saved_fp) /* - * _set_callee_saved_fp + * restore_callee_saved_fp(struct _callee_saved_fp *) */ -ENTRY(_set_callee_saved_fp, 1) +ENTRY(restore_callee_saved_fp, 1) add r31=16,r32 ldf.fill f2=[r32],32 ;; @@ -1007,59 +493,11 @@ ldf.fill f31=[r31] br.ret.sptk rp ;; -END(_set_callee_saved_fp) +END(restore_callee_saved_fp) /* - * _get_caller_saved_fp + * save_high_fp(struct _high_fp *) */ -ENTRY(_get_caller_saved_fp, 1) - add r31=16,r32 - stf.spill [r32]=f6,32 - ;; - stf.spill [r31]=f7,32 - stf.spill [r32]=f8,32 - ;; - stf.spill [r31]=f9,32 - stf.spill [r32]=f10,32 - ;; - stf.spill [r31]=f11,32 - stf.spill [r32]=f12,32 - ;; - stf.spill [r31]=f13,32 - stf.spill [r32]=f14 - ;; - stf.spill [r31]=f15 - br.ret.sptk rp - ;; -END(_get_caller_saved_fp) - -/* - * _set_caller_saved_fp - */ -ENTRY(_set_caller_saved_fp, 1) - add r31=16,r32 - ldf.fill f6=[r32],32 - ;; - ldf.fill f7=[r31],32 - ldf.fill f8=[r32],32 - ;; - ldf.fill f9=[r31],32 - ldf.fill f10=[r32],32 - ;; - ldf.fill f11=[r31],32 - ldf.fill f12=[r32],32 - ;; - ldf.fill f13=[r31],32 - ldf.fill f14=[r32] - ;; - ldf.fill f15=[r31] - br.ret.sptk rp - ;; -END(_set_caller_saved_fp) - -/* - * save_high_fp - */ ENTRY(save_high_fp, 1) add r31=16,r32 stf.spill [r32]=f32,32 @@ -1211,7 +649,7 @@ END(save_high_fp) /* - * restore_high_fp + * restore_high_fp(struct _high_fp *) */ ENTRY(restore_high_fp, 1) add r31=16,r32 ==== //depot/projects/ia64_epc/sys/ia64/include/_regset.h#10 (text+ko) ==== @@ -169,7 +169,11 @@ }; #ifdef _KERNEL +void restore_callee_saved(struct _callee_saved *); +void restore_callee_saved_fp(struct _callee_saved_fp *); void restore_high_fp(struct _high_fp *); +void save_callee_saved(struct _callee_saved *); +void save_callee_saved_fp(struct _callee_saved_fp *); void save_high_fp(struct _high_fp *); #endif From owner-p4-projects@FreeBSD.ORG Sun May 4 17:07:12 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B817F37B404; Sun, 4 May 2003 17:07:11 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7015C37B401 for ; Sun, 4 May 2003 17:07:11 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A1C243FA3 for ; Sun, 4 May 2003 17:07:11 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4507A0U007192 for ; Sun, 4 May 2003 17:07:10 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4507Av8007189 for perforce@freebsd.org; Sun, 4 May 2003 17:07:10 -0700 (PDT) Date: Sun, 4 May 2003 17:07:10 -0700 (PDT) Message-Id: <200305050007.h4507Av8007189@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30563 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2003 00:07:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=30563 Change 30563 by marcel@marcel_nfs on 2003/05/04 17:06:50 Add two debugging printfs to help diagnose if we have processes using the high FP. Since IA32 process will use the high FP by definition, this also comes in handy for debuggin IA32 support. Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia64/trap.c#18 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia64/trap.c#18 (text+ko) ==== @@ -534,6 +534,8 @@ pcb = td->td_pcb; pcpu = pcb->pcb_fpcpu; + printf("XXX: td %p: highfp on cpu %p\n", td, pcpu); + /* * The pcpu variable holds the address of the per-CPU * structure of the CPU currently holding this threads @@ -577,6 +579,8 @@ thr = PCPU_GET(fpcurthread); + printf("XXX: cpu %p: highfp belongs to td %p\n", pcpu, thr); + /* * The thr variable holds the thread that owns the high FP * registers currently on this CPU. Free this CPU so that From owner-p4-projects@FreeBSD.ORG Sun May 4 17:10:17 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5793837B40F; Sun, 4 May 2003 17:10:16 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CC6D037B401 for ; Sun, 4 May 2003 17:10:15 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7744943F3F for ; Sun, 4 May 2003 17:10:15 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h450AF0U007285 for ; Sun, 4 May 2003 17:10:15 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h450AEkF007282 for perforce@freebsd.org; Sun, 4 May 2003 17:10:14 -0700 (PDT) Date: Sun, 4 May 2003 17:10:14 -0700 (PDT) Message-Id: <200305050010.h450AEkF007282@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30564 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2003 00:10:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=30564 Change 30564 by marcel@marcel_nfs on 2003/05/04 17:09:56 Save and restore the preserved registers on signal delivery. Note that this mostly works due to the fact that the kernel does not modify these registers. This of course needs to use unwinding, but for now it's a quick stopgap for processes that call sigreturn() other than implicitly by returning from the handler. Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia64/machdep.c#22 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia64/machdep.c#22 (text+ko) ==== @@ -889,6 +889,8 @@ * and write them in the context. */ } + save_callee_saved(&mc->mc_preserved); + save_callee_saved_fp(&mc->mc_preserved_fp); /* Copy the frame out to userland. */ if (copyout(&sf, sfp, sizeof(sf)) != 0) { @@ -978,6 +980,8 @@ tf->tf_scratch_fp = mc->mc_scratch_fp; /* XXX high FP. */ } + restore_callee_saved(&mc->mc_preserved); + restore_callee_saved_fp(&mc->mc_preserved_fp); PROC_LOCK(p); #if defined(COMPAT_43) || defined(COMPAT_SUNOS) From owner-p4-projects@FreeBSD.ORG Sun May 4 17:27:38 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB89D37B404; Sun, 4 May 2003 17:27:37 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7B2D437B401 for ; Sun, 4 May 2003 17:27:37 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1283043FB1 for ; Sun, 4 May 2003 17:27:37 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h450Ra0U007963 for ; Sun, 4 May 2003 17:27:36 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h450Ra4T007960 for perforce@freebsd.org; Sun, 4 May 2003 17:27:36 -0700 (PDT) Date: Sun, 4 May 2003 17:27:36 -0700 (PDT) Message-Id: <200305050027.h450Ra4T007960@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30565 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2003 00:27:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=30565 Change 30565 by marcel@marcel_nfs on 2003/05/04 17:26:38 Remove debugging printf. Affected files ... .. //depot/projects/sio/sys/alpha/alpha/sio_machdep.c#3 edit Differences ... ==== //depot/projects/sio/sys/alpha/alpha/sio_machdep.c#3 (text+ko) ==== @@ -95,8 +95,6 @@ dd->databits = 8; dd->stopbits = 1; dd->parity = 0; - - printf("GDB: sio%d: debug port\n", i); return (0); } From owner-p4-projects@FreeBSD.ORG Sun May 4 18:18:40 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C982F37B404; Sun, 4 May 2003 18:18:39 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6CC6237B401 for ; Sun, 4 May 2003 18:18:39 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1830643F93 for ; Sun, 4 May 2003 18:18:39 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h451Ic0U010660 for ; Sun, 4 May 2003 18:18:38 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h451IceP010657 for perforce@freebsd.org; Sun, 4 May 2003 18:18:38 -0700 (PDT) Date: Sun, 4 May 2003 18:18:38 -0700 (PDT) Message-Id: <200305050118.h451IceP010657@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30566 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2003 01:18:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=30566 Change 30566 by marcel@marcel_nfs on 2003/05/04 18:18:00 Slightly change how print device info. Affected files ... .. //depot/projects/sio/sys/dev/sio/sio.c#6 edit Differences ... ==== //depot/projects/sio/sys/dev/sio/sio.c#6 (text+ko) ==== @@ -811,17 +811,12 @@ termioschars(&com->it_in); com->it_out = com->it_in; - if (com->consdev != NULL || com->dbgport) { - device_printf(dev, "is "); - if (com->consdev != NULL) { - printf("console"); - if (com->dbgport) - printf("and "); - } - if (com->dbgport) - printf("debug port"); - printf(".\n"); - } + if (com->consdev != NULL && com->dbgport) + device_printf(dev, "%s, %s\n", "console", "debug port"); + else if (com->consdev != NULL) + device_printf(dev, "%s\n", "console"); + else if (com->dbgport) + device_printf(dev, "%s\n", "debug port"); if (sio_fast_ih == NULL) { swi_add(&tty_ithd, "tty:sio", siopoll, NULL, SWI_TTY, 0, From owner-p4-projects@FreeBSD.ORG Sun May 4 21:57:12 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D7F5D37B404; Sun, 4 May 2003 21:57:11 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6DFB237B401 for ; Sun, 4 May 2003 21:57:11 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E729143FA3 for ; Sun, 4 May 2003 21:57:10 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h454vA0U027386 for ; Sun, 4 May 2003 21:57:10 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h454vAHe027383 for perforce@freebsd.org; Sun, 4 May 2003 21:57:10 -0700 (PDT) Date: Sun, 4 May 2003 21:57:10 -0700 (PDT) Message-Id: <200305050457.h454vAHe027383@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30572 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2003 04:57:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=30572 Change 30572 by marcel@marcel_nfs on 2003/05/04 21:56:31 Implement syscall restarts for EPC syscalls. This almost fell through the cracks. Since we store both the syscall number and syscall arguments in the trapframe for both the EPC sycalls and the break syscalls, we don't have to pass these seperately. This means that we don't have to save anything special for syscall restarts. We only need the frame pointer. We use the "raw" error code to determine if we need to restart. The raw error code is the register that signals to userland if the syscall resulted in an error and used to be 0 (=no error) or 1 (error in retval[0]). This has been replaced by the untranslated error code. The raw error code is returned by both syscall() and do_ast() as a favor to callers. Interrupted syscalls will never have ERESTART returned by do_ast() for two reasons: 1) we initialize the raw error code with EJUSTRETURN prior to executing the syscall, and 2) when delivering a signal, the raw error code is used to pass the signal handler address to the trampoline code. This can never cause false positives because the address is at least 8 byte aligned (it's the function descriptor, not the actual code address). While here, rename syscall_return with epc_syscall_return for clarity and consistency. Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia64/locore.s#17 edit .. //depot/projects/ia64_epc/sys/ia64/ia64/syscall.s#16 edit .. //depot/projects/ia64_epc/sys/ia64/ia64/trap.c#19 edit .. //depot/projects/ia64_epc/sys/ia64/include/cpu.h#8 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia64/locore.s#17 (text+ko) ==== @@ -174,7 +174,7 @@ { .mbb cmp.eq p6,p7=r0,r14 (p6) br.sptk exception_restore -(p7) br.sptk syscall_return +(p7) br.sptk epc_syscall_return ;; } END(fork_trampoline) ==== //depot/projects/ia64_epc/sys/ia64/ia64/syscall.s#16 (text+ko) ==== @@ -323,40 +323,40 @@ ;; } { .mmi - alloc r14=ar.pfs,8,0,3,0 + alloc r14=ar.pfs,0,0,8,0 st8 [r30]=r8,16 // syscall number (=r15) nop 0 ;; } { .mmi .mem.offset 0,0 - st8.spill [r31]=in0,16 // arg0 (=r16) + st8.spill [r31]=r32,16 // arg0 (=r16) .mem.offset 8,0 - st8.spill [r30]=in1,16 // arg1 (=r17) + st8.spill [r30]=r33,16 // arg1 (=r17) nop 0 ;; } { .mmi .mem.offset 16,0 - st8.spill [r31]=in2,16 // arg2 (=r18) + st8.spill [r31]=r34,16 // arg2 (=r18) .mem.offset 24,0 - st8.spill [r30]=in3,16 // arg3 (=r19) + st8.spill [r30]=r35,16 // arg3 (=r19) nop 0 ;; } { .mmi .mem.offset 32,0 - st8.spill [r31]=in4,16 // arg4 (=r20) + st8.spill [r31]=r36,16 // arg4 (=r20) .mem.offset 40,0 - st8.spill [r30]=in5,16 // arg5 (=r21) + st8.spill [r30]=r37,16 // arg5 (=r21) nop 0 ;; } { .mmi .mem.offset 48,0 - st8.spill [r31]=in6,16 // arg6 (=r22) + st8.spill [r31]=r38 // arg6 (=r22) .mem.offset 56,0 - st8.spill [r30]=in7,8 // arg7 (=r23) + st8.spill [r30]=r39 // arg7 (=r23) nop 0 ;; } @@ -365,28 +365,27 @@ movl gp=__gp ;; } -{ .mii - mov out0=r8 - add out1=-(8*8),r31 - add out2=16,sp +epc_syscall_restart: +{ .mib + srlz.d + add out0=16,sp + br.call.sptk rp=syscall ;; } { .mfb - srlz.d + add out0=16,sp nop 0 - br.call.sptk rp=syscall + br.call.sptk rp=do_ast ;; } { .mfb - add out0=16,sp + cmp4.eq p15,p0=ERESTART,r8 nop 0 - br.call.sptk rp=do_ast +(p15) br.spnt epc_syscall_restart ;; } - - .global syscall_return - .type syscall_return, @function -syscall_return: + .global epc_syscall_return +epc_syscall_return: { .mmi alloc r31=ar.pfs,0,0,0,0 add r14=32,sp ==== //depot/projects/ia64_epc/sys/ia64/ia64/trap.c#19 (text+ko) ==== @@ -312,7 +312,7 @@ /* * */ -void +int do_ast(struct trapframe *tf) { @@ -322,7 +322,12 @@ ast(tf); disable_intr(); } - /* Keep interrupts disabled. */ + /* + * Keep interrupts disabled. We return r10 as a favor to the EPC + * syscall code so that it can quicky determine if the syscall + * needs to be restarted or not. + */ + return (tf->tf_scratch.gr10); } /* @@ -886,7 +891,7 @@ if (((uintptr_t)bsp & 0x1ff) == 0x1f8) bsp++; } - error = syscall(tf->tf_scratch.gr15, &tf->tf_scratch.gr16, tf); + error = syscall(tf); if (error == ERESTART) { tf->tf_special.iip = iip; tf->tf_special.psr = psr; @@ -903,20 +908,24 @@ * the hairy details. */ int -syscall(int code, u_int64_t *args, struct trapframe *framep) +syscall(struct trapframe *tf) { struct sysent *callp; struct proc *p; struct thread *td; - int error; + u_int64_t *args; + int code, error; u_int sticks; + code = tf->tf_scratch.gr15; + args = &tf->tf_scratch.gr16; + atomic_add_int(&cnt.v_syscall, 1); td = curthread; p = td->td_proc; - td->td_frame = framep; + td->td_frame = tf; sticks = td->td_sticks; if (td->td_ucred != p->p_ucred) cred_update_thread(td); @@ -924,7 +933,7 @@ thread_user_enter(p, td); if (p->p_sysent->sv_prepsyscall) { - /* (*p->p_sysent->sv_prepsyscall)(framep, args, &code, ¶ms); */ + /* (*p->p_sysent->sv_prepsyscall)(tf, args, &code, ¶ms); */ panic("prepsyscall"); } else { /* @@ -960,31 +969,30 @@ td->td_retval[0] = 0; td->td_retval[1] = 0; + tf->tf_scratch.gr10 = EJUSTRETURN; STOPEVENT(p, S_SCE, (callp->sy_narg & SYF_ARGMASK)); error = (*callp->sy_call)(td, args); - switch (error) { - case 0: - framep->tf_scratch.gr8 = td->td_retval[0]; - framep->tf_scratch.gr9 = td->td_retval[1]; - framep->tf_scratch.gr10 = 0; - break; - case ERESTART: - break; - case EJUSTRETURN: - break; - default: - if (p->p_sysent->sv_errsize) { - if (error >= p->p_sysent->sv_errsize) - error = -1; /* XXX */ - else + if (error != EJUSTRETURN) { + /* + * Save the "raw" error code in r10. We use this to handle + * syscall restarts (see do_ast()). + */ + tf->tf_scratch.gr10 = error; + if (error == 0) { + tf->tf_scratch.gr8 = td->td_retval[0]; + tf->tf_scratch.gr9 = td->td_retval[1]; + } else if (error != ERESTART) { + if (error < p->p_sysent->sv_errsize) error = p->p_sysent->sv_errtbl[error]; + /* + * Translated error codes are returned in r8. User + * processes use the translated error code. + */ + tf->tf_scratch.gr8 = error; } - framep->tf_scratch.gr8 = error; - framep->tf_scratch.gr10 = 1; - break; } /* @@ -993,7 +1001,7 @@ if ((callp->sy_narg & SYF_MPSAFE) == 0) mtx_unlock(&Giant); - userret(td, framep, sticks); + userret(td, tf, sticks); #ifdef KTRACE if (KTRPOINT(td, KTR_SYSRET)) ==== //depot/projects/ia64_epc/sys/ia64/include/cpu.h#8 (text+ko) ==== @@ -107,7 +107,7 @@ int badaddr(void *, size_t); int badaddr_read(void *, size_t, void *); u_int64_t console_restart(u_int64_t, u_int64_t, u_int64_t); -void do_ast(struct trapframe *); +int do_ast(struct trapframe *); void dumpconf(void); void frametoreg(struct trapframe *, struct reg *); long fswintrberr(void); /* MAGIC */ @@ -126,7 +126,7 @@ void regtoframe(struct reg *, struct trapframe *); void set_iointr(void (*)(void *, unsigned long)); void fork_trampoline(void); /* MAGIC */ -int syscall(int, u_int64_t *, struct trapframe *); +int syscall(struct trapframe *); void trap(int vector, struct trapframe *framep); void ia64_probe_sapics(void); int ia64_count_cpus(void); From owner-p4-projects@FreeBSD.ORG Mon May 5 08:50:24 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2EE2F37B401; Mon, 5 May 2003 08:50:24 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A6B4E37B404 for ; Mon, 5 May 2003 08:50:23 -0700 (PDT) Received: from mail.speakeasy.net (mail15.speakeasy.net [216.254.0.215]) by mx1.FreeBSD.org (Postfix) with ESMTP id 973AA43FCB for ; Mon, 5 May 2003 08:50:22 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 20598 invoked from network); 5 May 2003 15:50:25 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender )encrypted SMTP for ; 5 May 2003 15:50:25 -0000 Received: from laptop.baldwin.cx ([216.133.140.1]) by server.baldwin.cx (8.12.8/8.12.8) with ESMTP id h45FoHdt014584; Mon, 5 May 2003 11:50:19 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.4 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <20030503233424.A8651@FreeBSD.org> Date: Mon, 05 May 2003 11:50:19 -0400 (EDT) From: John Baldwin To: Juli Mallett cc: perforce@freebsd.org cc: "M. Warner Losh" Subject: Re: PERFORCE change 30435 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2003 15:50:25 -0000 On 04-May-2003 Juli Mallett wrote: > * "M. Warner Losh" [ Date: 2003-05-03 ] > [ w.r.t. Re: PERFORCE change 30435 for review ] >> In message: <200305030240.h432elND072264@repoman.freebsd.org> >> Juli Mallett writes: >> : http://perforce.freebsd.org/chv.cgi?CH=30435 >> : >> : Change 30435 by jmallett@jmallett_dalek on 2003/05/02 19:40:13 >> : >> : Erk, remove redundant call to cp0_status_read. >> : >> : Affected files ... >> : >> : .. //depot/projects/mips/sys/mips/include/cpufunc.h#8 edit >> : >> : Differences ... >> : >> : ==== //depot/projects/mips/sys/mips/include/cpufunc.h#8 (text+ko) ==== >> : >> : @@ -38,7 +38,6 @@ >> : { >> : register_t s; >> : >> : - s = mips_cp0_status_read(); >> : mips_cp0_status_write((s = mips_cp0_status_read()) & ~MIPS_SR_IE); >> : return (s); >> : } >> >> Sure this is really redundant and not there for some weird mips box's >> pipeline delay requirements? > > I just forgot to dd the line after I decided to nest it. I personally find the unnested version easier to read. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ From owner-p4-projects@FreeBSD.ORG Mon May 5 09:34:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4377037B404; Mon, 5 May 2003 09:34:42 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D0FC637B401 for ; Mon, 5 May 2003 09:34:41 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A2EA43F85 for ; Mon, 5 May 2003 09:34:40 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h45GYe0U083129 for ; Mon, 5 May 2003 09:34:40 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h45GYbws083126 for perforce@freebsd.org; Mon, 5 May 2003 09:34:37 -0700 (PDT) Date: Mon, 5 May 2003 09:34:37 -0700 (PDT) Message-Id: <200305051634.h45GYbws083126@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 30604 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2003 16:34:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=30604 Change 30604 by rwatson@rwatson_tislabs on 2003/05/05 09:33:41 Further integrate the TrustedBSD base tree to pick up a variety of useful fixes from the last integ: OpenPAM update, groff fix, fix for a VM/VFS sign bug with disastrous consequences, and also improved support for AMD64. Assuming this boots and runs properly on my crash machines, I'll integ the MAC branch in the next day or two. Affected files ... .. //depot/projects/trustedbsd/base/Makefile.inc1#37 integrate .. //depot/projects/trustedbsd/base/UPDATING#30 integrate .. //depot/projects/trustedbsd/base/bin/csh/Makefile#6 integrate .. //depot/projects/trustedbsd/base/bin/df/df.c#14 integrate .. //depot/projects/trustedbsd/base/bin/ed/ed.1#5 integrate .. //depot/projects/trustedbsd/base/bin/ls/extern.h#7 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.c#19 integrate .. //depot/projects/trustedbsd/base/bin/ls/print.c#16 integrate .. //depot/projects/trustedbsd/base/bin/ls/util.c#8 integrate .. //depot/projects/trustedbsd/base/bin/pax/ar_io.c#6 integrate .. //depot/projects/trustedbsd/base/bin/pax/ar_subs.c#6 integrate .. //depot/projects/trustedbsd/base/bin/pax/cache.c#5 integrate .. //depot/projects/trustedbsd/base/bin/pax/cpio.c#7 integrate .. //depot/projects/trustedbsd/base/bin/pax/extern.h#3 integrate .. //depot/projects/trustedbsd/base/bin/pax/gen_subs.c#5 integrate .. //depot/projects/trustedbsd/base/bin/pax/getoldopt.c#4 integrate .. //depot/projects/trustedbsd/base/bin/pax/options.c#9 integrate .. //depot/projects/trustedbsd/base/bin/pax/pat_rep.c#7 integrate .. //depot/projects/trustedbsd/base/bin/pax/pax.c#7 integrate .. //depot/projects/trustedbsd/base/bin/pax/pax.h#5 integrate .. //depot/projects/trustedbsd/base/bin/ps/fmt.c#8 integrate .. //depot/projects/trustedbsd/base/bin/rcp/rcp.c#11 integrate .. //depot/projects/trustedbsd/base/bin/sh/Makefile#6 integrate .. //depot/projects/trustedbsd/base/bin/sleep/sleep.c#6 integrate .. //depot/projects/trustedbsd/base/bin/stty/gfmt.c#4 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-common#11 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-ditroff#5 integrate .. //depot/projects/trustedbsd/base/contrib/groff/tmac/doc-nroff#5 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/HISTORY#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/README#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/RELNOTES#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam.3#6 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_borrow_cred.3#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_free_data.3#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_get_option.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_log.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_nullconv.3#7 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_restore_cred.3#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_set_option.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/openpam_ttyconv.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam.3#14 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_acct_mgmt.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_authenticate.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_chauthtok.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_close_session.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_end.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_error.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_authtok.3#13 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_data.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_item.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_get_user.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenv.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_getenvlist.3#13 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_info.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_open_session.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_prompt.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_putenv.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_data.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_set_item.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setcred.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_setenv.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_authenticate.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_chauthtok.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_close_session.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_open_session.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_sm_setcred.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_start.3#13 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_strerror.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_verror.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vinfo.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/doc/man/pam_vprompt.3#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/openpam_version.h#6 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_appl.h#8 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/include/security/pam_constants.h#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_dispatch.c#9 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_impl.h#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/openpam_log.c#12 integrate .. //depot/projects/trustedbsd/base/contrib/openpam/lib/pam_getenv.c#11 integrate .. //depot/projects/trustedbsd/base/contrib/smbfs/smbutil/common.h#3 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/libtelnet/auth.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/libtelnet/enc_des.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnet/authenc.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnet/commands.c#7 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnet/main.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnet/network.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnet/ring.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnet/sys_bsd.c#6 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnet/telnet.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnet/terminal.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnet/utilities.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnetd/authenc.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnetd/global.c#2 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnetd/slc.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnetd/state.c#4 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnetd/sys_term.c#5 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnetd/telnetd.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnetd/termstat.c#3 integrate .. //depot/projects/trustedbsd/base/crypto/telnet/telnetd/utility.c#3 integrate .. //depot/projects/trustedbsd/base/etc/Makefile#29 integrate .. //depot/projects/trustedbsd/base/etc/defaults/rc.conf#25 integrate .. //depot/projects/trustedbsd/base/etc/devd.conf#3 integrate .. //depot/projects/trustedbsd/base/etc/etc.alpha/rc.alpha#3 delete .. //depot/projects/trustedbsd/base/etc/etc.amd64/rc.amd64#2 delete .. //depot/projects/trustedbsd/base/etc/etc.i386/rc.i386#3 delete .. //depot/projects/trustedbsd/base/etc/etc.ia64/rc.ia64#3 delete .. //depot/projects/trustedbsd/base/etc/etc.sparc64/rc.sparc64#2 delete .. //depot/projects/trustedbsd/base/etc/rc#23 integrate .. //depot/projects/trustedbsd/base/etc/rc.atm#5 delete .. //depot/projects/trustedbsd/base/etc/rc.d/apm#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/apmd#6 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/archdep#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/devfs#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/serial#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/virecover#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.devfs#5 delete .. //depot/projects/trustedbsd/base/etc/rc.diskless1#10 delete .. //depot/projects/trustedbsd/base/etc/rc.diskless2#10 delete .. //depot/projects/trustedbsd/base/etc/rc.isdn#3 delete .. //depot/projects/trustedbsd/base/etc/rc.network#19 delete .. //depot/projects/trustedbsd/base/etc/rc.network6#8 delete .. //depot/projects/trustedbsd/base/etc/rc.pccard#3 delete .. //depot/projects/trustedbsd/base/etc/rc.sendmail#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.serial#4 delete .. //depot/projects/trustedbsd/base/etc/rc.syscons#5 delete .. //depot/projects/trustedbsd/base/etc/rc.sysctl#4 delete .. //depot/projects/trustedbsd/base/etc/usbd.conf#5 integrate .. //depot/projects/trustedbsd/base/games/caesar/caesar.c#3 integrate .. //depot/projects/trustedbsd/base/games/fortune/fortune/fortune.c#4 integrate .. //depot/projects/trustedbsd/base/games/fortune/strfile/strfile.c#4 integrate .. //depot/projects/trustedbsd/base/games/fortune/unstr/unstr.c#4 integrate .. //depot/projects/trustedbsd/base/games/pom/pom.c#3 integrate .. //depot/projects/trustedbsd/base/games/random/random.c#4 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/Makefile#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/check1.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/check2.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/check3.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/dselect.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/fselect.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/ftree1.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/ftree2.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/gauge.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/input1.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/input2.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/menu1.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/menu2.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/menu3.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/msg.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/prgbox.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/radio1.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/radio2.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/radio3.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/text.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/tree.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/TESTS/yesno.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/checklist.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/kernel.c#3 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/menubox.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/msgbox.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/notify.c#3 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/prgbox.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/radiolist.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/raw_popen.c#3 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/textbox.c#3 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/tree.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/lib/libdialog/yesno.c#2 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/groff/src/include/config.h#3 integrate .. //depot/projects/trustedbsd/base/include/Makefile#28 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/bootparam_prot.x#2 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/crypt.x#2 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/key_prot.x#2 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/klm_prot.x#2 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/mount.x#2 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/nfs_prot.x#2 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/nis.x#3 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/nis_cache.x#2 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/nis_callback.x#2 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/nlm_prot.x#2 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/pmap_prot.x#3 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/rex.x#2 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/rnusers.x#2 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/rquota.x#2 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/rstat.x#3 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/sm_inter.x#3 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/spray.x#2 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/yp.x#2 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/yppasswd.x#3 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/ypupdate_prot.x#2 integrate .. //depot/projects/trustedbsd/base/include/rpcsvc/ypxfrd.x#2 integrate .. //depot/projects/trustedbsd/base/kerberos5/Makefile#7 integrate .. //depot/projects/trustedbsd/base/lib/Makefile#16 integrate .. //depot/projects/trustedbsd/base/lib/csu/common/crtbrand.c#3 integrate .. //depot/projects/trustedbsd/base/lib/csu/i386-elf/Makefile#6 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/getaddrinfo.c#12 integrate .. //depot/projects/trustedbsd/base/lib/libc/net/name6.c#10 integrate .. //depot/projects/trustedbsd/base/lib/libpam/modules/modules.inc#7 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/sys/lock.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/sys/lock.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_cond.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_create.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_kern.c#8 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_private.h#6 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_resume_np.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_sig.c#5 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_suspend_np.c#3 integrate .. //depot/projects/trustedbsd/base/lib/libutil/login.conf.5#8 integrate .. //depot/projects/trustedbsd/base/libexec/Makefile#9 integrate .. //depot/projects/trustedbsd/base/libexec/rlogind/rlogind.c#4 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/malloc.c#5 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/map_object.c#5 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/rtld.c#13 integrate .. //depot/projects/trustedbsd/base/libexec/ypxfr/yp_dbwrite.c#3 integrate .. //depot/projects/trustedbsd/base/libexec/ypxfr/ypxfr_getmap.c#4 integrate .. //depot/projects/trustedbsd/base/libexec/ypxfr/ypxfr_main.c#4 integrate .. //depot/projects/trustedbsd/base/libexec/ypxfr/ypxfr_misc.c#5 integrate .. //depot/projects/trustedbsd/base/libexec/ypxfr/ypxfrd_getmap.c#3 integrate .. //depot/projects/trustedbsd/base/release/Makefile#41 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#7 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#17 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#38 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#63 integrate .. //depot/projects/trustedbsd/base/release/i386/dokern.sh#18 integrate .. //depot/projects/trustedbsd/base/release/scripts/doFS.sh#11 integrate .. //depot/projects/trustedbsd/base/sbin/adjkerntz/adjkerntz.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/atacontrol/atacontrol.8#11 integrate .. //depot/projects/trustedbsd/base/sbin/atacontrol/atacontrol.c#10 integrate .. //depot/projects/trustedbsd/base/sbin/atm/ilmid/ilmid.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/badsect/badsect.c#9 integrate .. //depot/projects/trustedbsd/base/sbin/bsdlabel/Makefile#2 integrate .. //depot/projects/trustedbsd/base/sbin/bsdlabel/bsdlabel.8#2 integrate .. //depot/projects/trustedbsd/base/sbin/bsdlabel/bsdlabel.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/bsdlabel/runtest.sh#2 integrate .. //depot/projects/trustedbsd/base/sbin/camcontrol/Makefile#6 integrate .. //depot/projects/trustedbsd/base/sbin/camcontrol/camcontrol.c#11 integrate .. //depot/projects/trustedbsd/base/sbin/camcontrol/modeedit.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/camcontrol/util.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/ccdconfig/ccdconfig.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/clri/clri.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/comcontrol/comcontrol.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/cxconfig/cxconfig.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/devd/devd.cc#5 integrate .. //depot/projects/trustedbsd/base/sbin/disklabel/disklabel.c#21 integrate .. //depot/projects/trustedbsd/base/sbin/dmesg/dmesg.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/dumpon/dumpon.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/fdisk/fdisk.c#16 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/dir.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/ea.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/fsutil.c#13 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/inode.c#9 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/main.c#11 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/pass1.c#11 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/pass1b.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/pass2.c#9 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/pass3.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/pass4.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/pass5.c#13 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/setup.c#17 integrate .. //depot/projects/trustedbsd/base/sbin/fsck_ffs/utilities.c#5 integrate .. //depot/projects/trustedbsd/base/sbin/kldconfig/kldconfig.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/kldload/kldload.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/kldstat/kldstat.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/kldunload/kldunload.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/md5/md5.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/mdmfs/mdmfs.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/mount/getmntopts.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/mount/vfslist.c#2 integrate .. //depot/projects/trustedbsd/base/sbin/mount_nfs/mount_nfs.c#10 integrate .. //depot/projects/trustedbsd/base/sbin/newfs/mkfs.c#15 integrate .. //depot/projects/trustedbsd/base/sbin/newfs/newfs.c#14 integrate .. //depot/projects/trustedbsd/base/sbin/nfsiod/nfsiod.c#7 integrate .. //depot/projects/trustedbsd/base/sbin/ping/ping.c#17 integrate .. //depot/projects/trustedbsd/base/sbin/quotacheck/preen.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/quotacheck/quotacheck.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/reboot/reboot.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/routed/rtquery/rtquery.8#3 integrate .. //depot/projects/trustedbsd/base/sbin/shutdown/shutdown.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/spppcontrol/spppcontrol.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/sunlabel/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/swapon/swapon.c#6 integrate .. //depot/projects/trustedbsd/base/sbin/tunefs/tunefs.c#12 integrate .. //depot/projects/trustedbsd/base/sbin/vinum/commands.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/vinum/list.c#7 integrate .. //depot/projects/trustedbsd/base/secure/lib/Makefile#4 integrate .. //depot/projects/trustedbsd/base/secure/lib/libssh/Makefile#11 integrate .. //depot/projects/trustedbsd/base/secure/libexec/Makefile#4 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/Makefile#5 integrate .. //depot/projects/trustedbsd/base/secure/usr.bin/ssh/Makefile#8 integrate .. //depot/projects/trustedbsd/base/secure/usr.sbin/sshd/Makefile#10 integrate .. //depot/projects/trustedbsd/base/share/dict/web2#3 integrate .. //depot/projects/trustedbsd/base/share/examples/etc/make.conf#21 integrate .. //depot/projects/trustedbsd/base/share/man/man4/Makefile#30 integrate .. //depot/projects/trustedbsd/base/share/man/man4/rue.4#1 branch .. //depot/projects/trustedbsd/base/share/man/man5/make.conf.5#22 integrate .. //depot/projects/trustedbsd/base/share/man/man5/rc.conf.5#26 integrate .. //depot/projects/trustedbsd/base/share/man/man7/release.7#12 integrate .. //depot/projects/trustedbsd/base/share/misc/bsd-family-tree#11 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.README#5 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.libnames.mk#14 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.prog.mk#14 integrate .. //depot/projects/trustedbsd/base/share/syscons/keymaps/INDEX.keymaps#4 integrate .. //depot/projects/trustedbsd/base/share/syscons/keymaps/Makefile#7 integrate .. //depot/projects/trustedbsd/base/share/syscons/keymaps/norwegian.dvorak.kbd#1 branch .. //depot/projects/trustedbsd/base/sys/alpha/include/_limits.h#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/trustedbsd/base/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/trustedbsd/base/sys/amd64/amd64/exception.s#2 delete .. //depot/projects/trustedbsd/base/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/trustedbsd/base/sys/amd64/amd64/locore.s#2 delete .. //depot/projects/trustedbsd/base/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/trustedbsd/base/sys/amd64/amd64/sigtramp.s#2 delete .. //depot/projects/trustedbsd/base/sys/amd64/amd64/support.S#1 branch .. //depot/projects/trustedbsd/base/sys/amd64/amd64/support.s#2 delete .. //depot/projects/trustedbsd/base/sys/amd64/amd64/swtch.s#2 delete .. //depot/projects/trustedbsd/base/sys/amd64/include/_limits.h#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/isa/icu_ipl.S#1 branch .. //depot/projects/trustedbsd/base/sys/amd64/isa/icu_ipl.s#2 delete .. //depot/projects/trustedbsd/base/sys/amd64/isa/icu_vector.S#1 branch .. //depot/projects/trustedbsd/base/sys/amd64/isa/icu_vector.s#2 delete .. //depot/projects/trustedbsd/base/sys/amd64/isa/vector.S#1 branch .. //depot/projects/trustedbsd/base/sys/amd64/isa/vector.s#2 delete .. //depot/projects/trustedbsd/base/sys/arm/include/_limits.h#2 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/help.common#9 integrate .. //depot/projects/trustedbsd/base/sys/boot/common/loader.8#18 integrate .. //depot/projects/trustedbsd/base/sys/boot/pc98/boot0.5/start.s#2 integrate .. //depot/projects/trustedbsd/base/sys/cam/scsi/scsi_da.c#30 integrate .. //depot/projects/trustedbsd/base/sys/compat/linux/linux_ipc.c#7 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#33 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#58 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.amd64#2 integrate .. //depot/projects/trustedbsd/base/sys/conf/kern.mk#5 integrate .. //depot/projects/trustedbsd/base/sys/contrib/dev/acpica/hwregs.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/ahc_eisa.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/ahc_pci.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/ahd_pci.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7770.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx.reg#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx.seq#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx_inline.h#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx_osm.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic79xx_pci.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx.h#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx.reg#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_inline.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_osm.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/aic7xxx/aic7xxx_pci.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.c#28 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-all.h#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-disk.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-disk.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-pci.c#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-raid.c#17 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-raid.h#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/atapi-tape.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bgereg.h#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/ct/ct_isa.c#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#19 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.h#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em_hw.c#8 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em_hw.h#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em_osdep.h#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/firewire.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/sbp.c#13 integrate .. //depot/projects/trustedbsd/base/sys/dev/md/md.c#25 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/brgphy.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/miidevs#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/mii/ruephy.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/mii/ruephyreg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbb.c#24 integrate .. //depot/projects/trustedbsd/base/sys/dev/pccbb/pccbbdevid.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/sio/sio.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/snc/dp83932subr.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/if_rue.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/usb/if_ruereg.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs.h#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/usbdevs_data.h#23 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinum.c#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumconfig.c#10 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumext.h#7 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumio.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumio.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumioctl.c#12 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumkw.h#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumlock.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumobj.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumparser.c#4 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_dbregs.c#8 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_fpregs.c#8 integrate .. //depot/projects/trustedbsd/base/sys/fs/procfs/procfs_regs.c#8 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf.h#3 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vfsops.c#9 integrate .. //depot/projects/trustedbsd/base/sys/fs/udf/udf_vnops.c#14 integrate .. //depot/projects/trustedbsd/base/sys/geom/bde/g_bde.c#10 integrate .. //depot/projects/trustedbsd/base/sys/geom/bde/g_bde_crypt.c#9 integrate .. //depot/projects/trustedbsd/base/sys/geom/bde/g_bde_work.c#9 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom.h#25 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_aes.c#10 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_apple.c#5 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_bsd.c#21 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_bsd_enc.c#2 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_ctl.c#8 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_dev.c#26 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_disk.c#26 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_event.c#11 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_gpt.c#11 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_io.c#14 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_mbr.c#18 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_mirror.c#5 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_pc98.c#16 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_slice.c#19 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_slice.h#9 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_subr.c#19 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_sunlabel.c#12 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_vol_ffs.c#4 integrate .. //depot/projects/trustedbsd/base/sys/i386/include/_limits.h#2 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/locore.s#11 integrate .. //depot/projects/trustedbsd/base/sys/ia64/ia64/machdep.c#31 integrate .. //depot/projects/trustedbsd/base/sys/ia64/include/_limits.h#2 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_malloc.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/md5c.c#4 integrate .. //depot/projects/trustedbsd/base/sys/kern/sched_ule.c#4 integrate .. //depot/projects/trustedbsd/base/sys/kern/subr_mbuf.c#23 integrate .. //depot/projects/trustedbsd/base/sys/kern/sysv_shm.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_default.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_subr.c#40 integrate .. //depot/projects/trustedbsd/base/sys/modules/Makefile#43 integrate .. //depot/projects/trustedbsd/base/sys/modules/mii/Makefile#5 integrate .. //depot/projects/trustedbsd/base/sys/modules/rue/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/net/if_ethersubr.c#29 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/include/_limits.h#2 integrate .. //depot/projects/trustedbsd/base/sys/powerpc/powerpc/ofwmagic.S#2 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/include/_limits.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sparc64/sparc64/trap.c#22 integrate .. //depot/projects/trustedbsd/base/sys/sys/ata.h#6 integrate .. //depot/projects/trustedbsd/base/sys/sys/disklabel.h#17 integrate .. //depot/projects/trustedbsd/base/sys/sys/limits.h#2 integrate .. //depot/projects/trustedbsd/base/sys/sys/mbuf.h#22 integrate .. //depot/projects/trustedbsd/base/sys/sys/param.h#24 integrate .. //depot/projects/trustedbsd/base/sys/sys/soundcard.h#5 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscallsubr.h#5 integrate .. //depot/projects/trustedbsd/base/sys/ufs/ffs/ffs_vnops.c#19 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#31 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pageout.c#22 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pageout.h#8 integrate .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tbmaster.pl#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/Makefile#25 integrate .. //depot/projects/trustedbsd/base/usr.bin/chpass/chpass.c#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/chpass/table.c#4 integrate .. //depot/projects/trustedbsd/base/usr.bin/cut/cut.1#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/nohup/nohup.c#5 integrate .. //depot/projects/trustedbsd/base/usr.bin/unifdef/unifdef.c#9 integrate .. //depot/projects/trustedbsd/base/usr.bin/uudecode/uudecode.c#15 integrate .. //depot/projects/trustedbsd/base/usr.bin/uuencode/uuencode.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/xargs/xargs.c#17 integrate .. //depot/projects/trustedbsd/base/usr.bin/xlint/arch/amd64/targparam.h#1 branch .. //depot/projects/trustedbsd/base/usr.bin/xlint/xlint/xlint.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/accton/accton.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ancontrol/ancontrol.c#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/arp/arp.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/boot0cfg/boot0cfg.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/boot98cfg/boot98cfg.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/burncd/burncd.8#12 integrate .. //depot/projects/trustedbsd/base/usr.sbin/burncd/burncd.c#14 integrate .. //depot/projects/trustedbsd/base/usr.sbin/cdcontrol/cdcontrol.c#10 integrate .. //depot/projects/trustedbsd/base/usr.sbin/chkgrp/chkgrp.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/chown/chown.c#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/chroot/chroot.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/dev_mkdb/dev_mkdb.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/edquota/edquota.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/fdcontrol/fdcontrol.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/kbdcontrol/kbdcontrol.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/kernbb/kernbb.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/lptcontrol/lptcontrol.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mergemaster/mergemaster.8#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mergemaster/mergemaster.sh#11 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mixer/mixer.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mtree/compare.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mtree/create.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mtree/excludes.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mtree/misc.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mtree/mtree.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mtree/spec.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/mtree/verify.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/newsyslog/newsyslog.c#14 integrate .. //depot/projects/trustedbsd/base/usr.sbin/procctl/procctl.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pstat/pstat.c#9 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pwd_mkdb/pwd_mkdb.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/quot/quot.c#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/quotaon/quotaon.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rarpd/rarpd.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/repquota/repquota.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rmt/rmt.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.umntall/mounttab.c#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.yppasswdd/yppasswd_private.x#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.yppasswdd/yppasswdd_main.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.yppasswdd/yppasswdd_server.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.ypupdated/yp_dbdelete.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.ypupdated/yp_dbupdate.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.ypupdated/ypupdated_main.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.ypupdated/ypupdated_server.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.ypxfrd/ypxfrd_main.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/rpc.ypxfrd/ypxfrd_server.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sa/main.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sa/pdb.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sa/usrdb.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/slstat/slstat.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/menus.c#24 integrate .. //depot/projects/trustedbsd/base/usr.sbin/syslogd/syslogd.c#17 integrate .. //depot/projects/trustedbsd/base/usr.sbin/trpt/trpt.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/usbd/usbd.8#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/vipw/vipw.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/watch/watch.c#8 integrate .. //depot/projects/trustedbsd/base/usr.sbin/wicontrol/wicontrol.c#11 integrate .. //depot/projects/trustedbsd/base/usr.sbin/yp_mkdb/yp_mkdb.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypbind/yp_ping.c#6 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypbind/ypbind.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/yppoll/yppoll.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/yppush/yppush_main.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypserv/yp_access.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypserv/yp_dblookup.c#5 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypserv/yp_dnslookup.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypserv/yp_error.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypserv/yp_main.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypserv/yp_server.c#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypserv/yp_svc_udp.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ypset/ypset.c#4 integrate Differences ... ==== //depot/projects/trustedbsd/base/Makefile.inc1#37 (text+ko) ==== @@ -1,8 +1,8 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.353 2003/05/01 20:41:03 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.356 2003/05/05 12:54:26 bde Exp $ # # Make command line options: -# -DMAKE_KERBEROS5 to build Kerberos5 +# -DNO_KERBEROS Do not build Heimdal (Kerberos 5) # -DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir # -DNOCLEAN do not clean at all # -DNOCRYPT will prevent building of crypt versions @@ -61,7 +61,7 @@ SUBDIR+= gnu .endif .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ - !defined(NOCRYPT) && !defined(NO_OPENSSL) && defined(MAKE_KERBEROS5) + !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_KERBEROS) SUBDIR+= kerberos5 .endif .if exists(${.CURDIR}/libexec) @@ -119,7 +119,9 @@ .endif MAKEOBJDIRPREFIX?= /usr/obj +.if !defined(OSRELDATE) OSRELDATE!= sysctl -n kern.osreldate +.endif TARGET_ARCH?= ${MACHINE_ARCH} .if ${TARGET_ARCH} == ${MACHINE_ARCH} TARGET?= ${MACHINE} @@ -277,14 +279,10 @@ mkdir -p ${WORLDTMP}/legacy/${_dir} .endfor .for _dir in \ - usr/bin usr/lib/compat/aout usr/libdata/ldscripts usr/libexec usr/share/misc + usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \ + usr/libexec usr/share/misc mkdir -p ${WORLDTMP}/${_dir} .endfor -.for _dir in \ - arpa dev fs g++/backward g++/bits g++/ext isc isofs libmilter \ - objc openssl protocols readline rpc rpcsvc security ufs - mkdir -p ${WORLDTMP}/usr/include/${_dir} -.endfor ln -sf ${.CURDIR}/sys ${WORLDTMP} _legacy: @echo @@ -695,7 +693,7 @@ .endif .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ - !defined(NOCRYPT) && defined(MAKE_KERBEROS5) + !defined(NOCRYPT) && !defined(NO_KERBEROS) _libkrb5= kerberos5/lib/libroken kerberos5/lib/libvers \ kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl .endif @@ -782,7 +780,7 @@ _generic_libs= gnu/lib -.if !defined(NOCRYPT) && defined(MAKE_KERBEROS5) +.if !defined(NOCRYPT) && !defined(NO_KERBEROS) _prebuild_libs+= kerberos5/lib/libasn1 _prebuild_libs+= kerberos5/lib/libgssapi _prebuild_libs+= kerberos5/lib/libkrb5 ==== //depot/projects/trustedbsd/base/UPDATING#30 (text+ko) ==== @@ -17,11 +17,19 @@ developers choose to disable these features on build machines to maximize performance. -20030427: - The old rc system will soon be going away. If you have specified - rc_ng="NO" in your /etc/rc.conf[.local] you should remove it and - test with the new rc system. Please report any problems to - freebsd-rc@yahoogroups.com, and/or freebsd-current@freebsd.org. +20030502: + groff has been updated. If you try to do a buildworld and + get an infinite loop in troff, update to May 4th or newer. If you + have a newer kernel than userland, you may need to set the OSRELDATE + to 500110 in your environment before starting a buildworld. + +20030501: + The old rc system has been removed. Please report any problems + to freebsd-rc@yahoogroups.com, and/or freebsd-current@freebsd.org. + Your personal versions of these files will not be removed, so you can + continue to use them. However, you should take great care when updating, + especially when using mergemaster, since the compatibility code that + utilizes these old scripts has also been removed. 20030423: A bug has been fixed in /dev/devctl which would cause devd @@ -1265,4 +1273,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.248 2003/04/27 21:28:37 dougb Exp $ +$FreeBSD: src/UPDATING,v 1.250 2003/05/04 06:26:30 imp Exp $ ==== //depot/projects/trustedbsd/base/bin/csh/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/bin/csh/Makefile,v 1.29 2002/07/24 22:26:44 mp Exp $ +# $FreeBSD: src/bin/csh/Makefile,v 1.30 2003/05/02 06:39:13 obrien Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 # # C Shell with process control; VM/UNIX VAX Makefile @@ -12,6 +12,7 @@ PROG= csh DFLAGS= -D_PATH_TCSHELL='"/bin/${PROG}"' CFLAGS+= -I. -I${.CURDIR} -I${TCSHDIR} ${DFLAGS} +WARNS= 1 SRCS= sh.c sh.dir.c sh.dol.c sh.err.c sh.exec.c sh.char.c \ sh.exp.c sh.file.c sh.func.c sh.glob.c sh.hist.c sh.init.c \ sh.lex.c sh.misc.c sh.parse.c sh.print.c sh.proc.c sh.sem.c \ ==== //depot/projects/trustedbsd/base/bin/df/df.c#14 (text+ko) ==== @@ -48,7 +48,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.46 2003/05/01 16:58:55 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.48 2003/05/03 16:02:52 markm Exp $"); #include #include @@ -57,6 +57,7 @@ #include #include #include +#include #include #include #include @@ -88,37 +89,51 @@ /* Maximum widths of various fields. */ struct maxwidths { - int mntfrom; - int total; - int used; - int avail; - int iused; - int ifree; + size_t mntfrom; + size_t total; + size_t used; + size_t avail; + size_t iused; + size_t ifree; }; -unsigned long long vals_si [] = {1, KILO_SI_SZ, MEGA_SI_SZ, GIGA_SI_SZ, TERA_SI_SZ, PETA_SI_SZ}; -unsigned long long vals_base2[] = {1, KILO_2_SZ, MEGA_2_SZ, GIGA_2_SZ, TERA_2_SZ, PETA_2_SZ}; -unsigned long long *valp; +static uintmax_t vals_si [] = { + 1, + KILO_SI_SZ, + MEGA_SI_SZ, + GIGA_SI_SZ, + TERA_SI_SZ, + PETA_SI_SZ +}; +static uintmax_t vals_base2[] = { + 1, + KILO_2_SZ, + MEGA_2_SZ, + GIGA_2_SZ, + TERA_2_SZ, + PETA_2_SZ +}; +static uintmax_t *valp; typedef enum { NONE, KILO, MEGA, GIGA, TERA, PETA, UNIT_MAX } unit_t; -unit_t unitp [] = { NONE, KILO, MEGA, GIGA, TERA, PETA }; +static unit_t unitp [] = { NONE, KILO, MEGA, GIGA, TERA, PETA }; -static char *getmntpt(char *); -static int longwidth(long); +static char *getmntpt(const char *); +static size_t longwidth(long); static char *makenetvfslist(void); -static void prthuman(struct statfs *, long); +static void prthuman(const struct statfs *, long); static void prthumanval(double); static void prtstat(struct statfs *, struct maxwidths *); static long regetmntinfo(struct statfs **, long, const char **); static unit_t unit_adjust(double *); -static void update_maxwidths(struct maxwidths *, struct statfs *); +static void update_maxwidths(struct maxwidths *, const struct statfs *); static void usage(void); -static __inline int -imax(int a, int b) +static __inline u_int +max(u_int a, u_int b) { - return (MAX(a, b)); + return (a > b ? a : b); } static int aflag = 0, hflag, iflag, nflag; @@ -275,7 +290,7 @@ } static char * -getmntpt(char *name) +getmntpt(const char *name) { long mntsize, i; struct statfs *mntbuf; @@ -326,13 +341,13 @@ { double abval; unit_t unit; - unsigned int unit_sz; + int unit_sz; abval = fabs(*val); unit_sz = abval ? ilogb(abval) / 10 : 0; - if (unit_sz >= UNIT_MAX) { + if (unit_sz >= (int)UNIT_MAX) { unit = NONE; } else { unit = unitp[unit_sz]; @@ -343,7 +358,7 @@ } static void -prthuman(struct statfs *sfsp, long used) +prthuman(const struct statfs *sfsp, long used) { prthumanval((double)sfsp->f_blocks * (double)sfsp->f_bsize); @@ -381,43 +396,46 @@ prtstat(struct statfs *sfsp, struct maxwidths *mwp) { static long blocksize; - static int headerlen, timesthrough; + static int headerlen, timesthrough = 0; static const char *header; long used, availblks, inodes; if (++timesthrough == 1) { - mwp->mntfrom = imax(mwp->mntfrom, strlen("Filesystem")); + mwp->mntfrom = max(mwp->mntfrom, strlen("Filesystem")); if (hflag) { header = " Size"; mwp->total = mwp->used = mwp->avail = strlen(header); } else { header = getbsize(&headerlen, &blocksize); - mwp->total = imax(mwp->total, headerlen); + mwp->total = max(mwp->total, (u_int)headerlen); } - mwp->used = imax(mwp->used, strlen("Used")); - mwp->avail = imax(mwp->avail, strlen("Avail")); + mwp->used = max(mwp->used, strlen("Used")); + mwp->avail = max(mwp->avail, strlen("Avail")); - (void)printf("%-*s %-*s %*s %*s Capacity", mwp->mntfrom, - "Filesystem", mwp->total, header, mwp->used, "Used", - mwp->avail, "Avail"); + (void)printf("%-*s %-*s %*s %*s Capacity", + (u_int)mwp->mntfrom, "Filesystem", + (u_int)mwp->total, header, + (u_int)mwp->used, "Used", + (u_int)mwp->avail, "Avail"); if (iflag) { - mwp->iused = imax(mwp->iused, strlen(" iused")); - mwp->ifree = imax(mwp->ifree, strlen("ifree")); - (void)printf(" %*s %*s %%iused", mwp->iused - 2, - "iused", mwp->ifree, "ifree"); + mwp->iused = max(mwp->iused, strlen(" iused")); + mwp->ifree = max(mwp->ifree, strlen("ifree")); + (void)printf(" %*s %*s %%iused", + (u_int)mwp->iused - 2, "iused", + (u_int)mwp->ifree, "ifree"); } (void)printf(" Mounted on\n"); } - (void)printf("%-*s", mwp->mntfrom, sfsp->f_mntfromname); + (void)printf("%-*s", (u_int)mwp->mntfrom, sfsp->f_mntfromname); used = sfsp->f_blocks - sfsp->f_bfree; availblks = sfsp->f_bavail + used; if (hflag) { prthuman(sfsp, used); } else { - (void)printf(" %*ld %*ld %*ld", mwp->total, - fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize), - mwp->used, fsbtoblk(used, sfsp->f_bsize, blocksize), - mwp->avail, fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, + (void)printf(" %*ld %*ld %*ld", + (u_int)mwp->total, fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize), + (u_int)mwp->used, fsbtoblk(used, sfsp->f_bsize, blocksize), + (u_int)mwp->avail, fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, blocksize)); } (void)printf(" %5.0f%%", @@ -425,9 +443,10 @@ if (iflag) { inodes = sfsp->f_files; used = inodes - sfsp->f_ffree; - (void)printf(" %*ld %*ld %4.0f%% ", mwp->iused, used, - mwp->ifree, sfsp->f_ffree, inodes == 0 ? 100.0 : - (double)used / (double)inodes * 100.0); + (void)printf(" %*ld %*ld %4.0f%% ", + (u_int)mwp->iused, used, + (u_int)mwp->ifree, sfsp->f_ffree, + inodes == 0 ? 100.0 : (double)used / (double)inodes * 100.0); } else (void)printf(" "); (void)printf(" %s\n", sfsp->f_mntonname); @@ -438,31 +457,31 @@ * the file system specified by `sfsp'. */ static void -update_maxwidths(struct maxwidths *mwp, struct statfs *sfsp) +update_maxwidths(struct maxwidths *mwp, const struct statfs *sfsp) { - static long blocksize; + static long blocksize = 0; int dummy; if (blocksize == 0) getbsize(&dummy, &blocksize); - mwp->mntfrom = imax(mwp->mntfrom, strlen(sfsp->f_mntfromname)); - mwp->total = imax(mwp->total, longwidth(fsbtoblk(sfsp->f_blocks, + mwp->mntfrom = max(mwp->mntfrom, strlen(sfsp->f_mntfromname)); + mwp->total = max(mwp->total, longwidth(fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize))); - mwp->used = imax(mwp->used, longwidth(fsbtoblk(sfsp->f_blocks - + mwp->used = max(mwp->used, longwidth(fsbtoblk(sfsp->f_blocks - sfsp->f_bfree, sfsp->f_bsize, blocksize))); - mwp->avail = imax(mwp->avail, longwidth(fsbtoblk(sfsp->f_bavail, + mwp->avail = max(mwp->avail, longwidth(fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, blocksize))); - mwp->iused = imax(mwp->iused, longwidth(sfsp->f_files - + mwp->iused = max(mwp->iused, longwidth(sfsp->f_files - sfsp->f_ffree)); - mwp->ifree = imax(mwp->ifree, longwidth(sfsp->f_ffree)); + mwp->ifree = max(mwp->ifree, longwidth(sfsp->f_ffree)); } /* Return the width in characters of the specified long. */ -static int +static size_t longwidth(long val) { - int len; + size_t len; len = 0; /* Negative or zero values require one extra digit. */ @@ -491,7 +510,7 @@ makenetvfslist(void) { char *str, *strptr, **listptr; - struct xvfsconf *xvfsp; + struct xvfsconf *xvfsp, *keep_xvfsp; size_t buflen; int cnt, i, maxvfsconf; @@ -504,14 +523,17 @@ warnx("malloc failed"); return (NULL); } + keep_xvfsp = xvfsp; if (sysctlbyname("vfs.conflist", xvfsp, &buflen, NULL, 0) < 0) { warn("sysctl(vfs.conflist)"); + free(keep_xvfsp); return (NULL); } maxvfsconf = buflen / sizeof(struct xvfsconf); if ((listptr = malloc(sizeof(char*) * maxvfsconf)) == NULL) { warnx("malloc failed"); + free(keep_xvfsp); return (NULL); } @@ -520,6 +542,8 @@ listptr[cnt++] = strdup(xvfsp->vfc_name); if (listptr[cnt-1] == NULL) { warnx("malloc failed"); + free(listptr); + free(keep_xvfsp); return (NULL); } } @@ -531,6 +555,7 @@ if (cnt > 0) warnx("malloc failed"); free(listptr); + free(keep_xvfsp); return (NULL); } @@ -543,6 +568,7 @@ } *(--strptr) = NULL; + free(keep_xvfsp); free(listptr); return (str); } ==== //depot/projects/trustedbsd/base/bin/ed/ed.1#5 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/bin/ed/ed.1,v 1.32 2002/07/04 13:22:22 ru Exp $ +.\" $FreeBSD: src/bin/ed/ed.1,v 1.33 2003/05/03 20:26:11 keramida Exp $ .Dd May 21, 1993 .Dt ED 1 .Os @@ -394,11 +394,12 @@ .Ar col-elm is a .Em collating element -are interpreted according to -.Xr locale 5 +are interpreted according to the current locale settings (not currently supported). See .Xr regex 3 +and +.Xr re_format 7 for an explanation of these constructs. .It Op ^char-class Match any single character, other than newline, not in ==== //depot/projects/trustedbsd/base/bin/ls/extern.h#7 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)extern.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/ls/extern.h,v 1.20 2002/10/18 10:59:45 tjr Exp $ + * $FreeBSD: src/bin/ls/extern.h,v 1.21 2003/05/03 16:39:33 markm Exp $ */ int acccmp(const FTSENT *, const FTSENT *); @@ -43,11 +43,11 @@ int statcmp(const FTSENT *, const FTSENT *); int revstatcmp(const FTSENT *, const FTSENT *); -void printcol(DISPLAY *); -void printlong(DISPLAY *); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 5 10:58:29 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 988D837B405; Mon, 5 May 2003 10:58:28 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 414F737B404 for ; Mon, 5 May 2003 10:58:28 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 81F7743F3F for ; Mon, 5 May 2003 10:58:26 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h45HwQ0U092225 for ; Mon, 5 May 2003 10:58:26 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h45HwNvR092222 for perforce@freebsd.org; Mon, 5 May 2003 10:58:23 -0700 (PDT) Date: Mon, 5 May 2003 10:58:23 -0700 (PDT) Message-Id: <200305051758.h45HwNvR092222@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30608 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2003 17:58:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=30608 Change 30608 by peter@peter_daintree on 2003/05/05 10:57:23 IFC @30607 Affected files ... .. //depot/projects/hammer/Makefile.inc1#14 integrate .. //depot/projects/hammer/UPDATING#10 integrate .. //depot/projects/hammer/bin/df/df.c#6 integrate .. //depot/projects/hammer/bin/ed/ed.1#2 integrate .. //depot/projects/hammer/bin/ls/extern.h#4 integrate .. //depot/projects/hammer/bin/ls/ls.c#8 integrate .. //depot/projects/hammer/bin/ls/print.c#6 integrate .. //depot/projects/hammer/bin/ls/util.c#3 integrate .. //depot/projects/hammer/bin/pax/ar_io.c#4 integrate .. //depot/projects/hammer/bin/pax/ar_subs.c#3 integrate .. //depot/projects/hammer/bin/pax/cache.c#3 integrate .. //depot/projects/hammer/bin/pax/cpio.c#5 integrate .. //depot/projects/hammer/bin/pax/extern.h#2 integrate .. //depot/projects/hammer/bin/pax/gen_subs.c#3 integrate .. //depot/projects/hammer/bin/pax/getoldopt.c#2 integrate .. //depot/projects/hammer/bin/pax/options.c#5 integrate .. //depot/projects/hammer/bin/pax/pat_rep.c#4 integrate .. //depot/projects/hammer/bin/pax/pax.c#4 integrate .. //depot/projects/hammer/bin/pax/pax.h#4 integrate .. //depot/projects/hammer/bin/ps/fmt.c#3 integrate .. //depot/projects/hammer/bin/rcp/rcp.c#5 integrate .. //depot/projects/hammer/bin/sleep/sleep.c#4 integrate .. //depot/projects/hammer/bin/stty/gfmt.c#2 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc-common#6 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc-ditroff#5 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc-nroff#5 integrate .. //depot/projects/hammer/contrib/smbfs/smbutil/common.h#2 integrate .. //depot/projects/hammer/crypto/telnet/libtelnet/auth.c#2 integrate .. //depot/projects/hammer/crypto/telnet/libtelnet/enc_des.c#3 integrate .. //depot/projects/hammer/crypto/telnet/telnet/authenc.c#2 integrate .. //depot/projects/hammer/crypto/telnet/telnet/commands.c#5 integrate .. //depot/projects/hammer/crypto/telnet/telnet/main.c#3 integrate .. //depot/projects/hammer/crypto/telnet/telnet/network.c#2 integrate .. //depot/projects/hammer/crypto/telnet/telnet/ring.c#2 integrate .. //depot/projects/hammer/crypto/telnet/telnet/sys_bsd.c#3 integrate .. //depot/projects/hammer/crypto/telnet/telnet/telnet.c#3 integrate .. //depot/projects/hammer/crypto/telnet/telnet/terminal.c#2 integrate .. //depot/projects/hammer/crypto/telnet/telnet/utilities.c#2 integrate .. //depot/projects/hammer/crypto/telnet/telnetd/authenc.c#2 integrate .. //depot/projects/hammer/crypto/telnet/telnetd/global.c#2 integrate .. //depot/projects/hammer/crypto/telnet/telnetd/slc.c#2 integrate .. //depot/projects/hammer/crypto/telnet/telnetd/state.c#3 integrate .. //depot/projects/hammer/crypto/telnet/telnetd/sys_term.c#2 integrate .. //depot/projects/hammer/crypto/telnet/telnetd/telnetd.c#2 integrate .. //depot/projects/hammer/crypto/telnet/telnetd/termstat.c#2 integrate .. //depot/projects/hammer/crypto/telnet/telnetd/utility.c#2 integrate .. //depot/projects/hammer/etc/devd.conf#2 integrate .. //depot/projects/hammer/etc/rc.d/abi#2 integrate .. //depot/projects/hammer/etc/rc.d/cron#2 integrate .. //depot/projects/hammer/etc/rc.d/devfs#4 integrate .. //depot/projects/hammer/etc/rc.d/jail#2 integrate .. //depot/projects/hammer/etc/rc.d/localdaemons#2 integrate .. //depot/projects/hammer/etc/rc.d/network3#3 integrate .. //depot/projects/hammer/etc/rc.d/securelevel#4 integrate .. //depot/projects/hammer/etc/rc.d/serial#3 integrate .. //depot/projects/hammer/etc/rc.d/virecover#4 integrate .. //depot/projects/hammer/etc/usbd.conf#2 integrate .. //depot/projects/hammer/games/caesar/caesar.c#2 integrate .. //depot/projects/hammer/games/fortune/fortune/fortune.c#2 integrate .. //depot/projects/hammer/games/fortune/strfile/strfile.c#2 integrate .. //depot/projects/hammer/games/fortune/unstr/unstr.c#2 integrate .. //depot/projects/hammer/games/pom/pom.c#2 integrate .. //depot/projects/hammer/games/random/random.c#3 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/Makefile#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/check1.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/check2.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/check3.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/dselect.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/fselect.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/ftree1.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/ftree2.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/gauge.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/input1.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/input2.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/menu1.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/menu2.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/menu3.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/msg.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/prgbox.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/radio1.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/radio2.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/radio3.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/text.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/tree.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/TESTS/yesno.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/checklist.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/kernel.c#3 integrate .. //depot/projects/hammer/gnu/lib/libdialog/menubox.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/msgbox.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/notify.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/prgbox.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/radiolist.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/raw_popen.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/textbox.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/tree.c#2 integrate .. //depot/projects/hammer/gnu/lib/libdialog/yesno.c#2 integrate .. //depot/projects/hammer/gnu/usr.bin/cvs/cvs/Makefile#4 integrate .. //depot/projects/hammer/include/Makefile#10 integrate .. //depot/projects/hammer/include/rpcsvc/bootparam_prot.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/crypt.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/key_prot.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/klm_prot.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/mount.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/nfs_prot.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/nis.x#3 integrate .. //depot/projects/hammer/include/rpcsvc/nis_cache.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/nis_callback.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/nlm_prot.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/pmap_prot.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/rex.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/rnusers.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/rquota.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/rstat.x#3 integrate .. //depot/projects/hammer/include/rpcsvc/sm_inter.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/spray.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/yp.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/yppasswd.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/ypupdate_prot.x#2 integrate .. //depot/projects/hammer/include/rpcsvc/ypxfrd.x#2 integrate .. //depot/projects/hammer/kerberos5/Makefile#4 integrate .. //depot/projects/hammer/lib/Makefile#12 integrate .. //depot/projects/hammer/lib/csu/common/crtbrand.c#2 integrate .. //depot/projects/hammer/lib/csu/i386-elf/Makefile#2 integrate .. //depot/projects/hammer/lib/libc/net/getaddrinfo.c#10 integrate .. //depot/projects/hammer/lib/libc/net/name6.c#7 integrate .. //depot/projects/hammer/lib/libpam/modules/modules.inc#4 integrate .. //depot/projects/hammer/lib/libpthread/sys/lock.c#2 integrate .. //depot/projects/hammer/lib/libpthread/sys/lock.h#2 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_create.c#5 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#8 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#7 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_resume_np.c#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#6 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_suspend_np.c#3 integrate .. //depot/projects/hammer/lib/libutil/login.conf.5#4 integrate .. //depot/projects/hammer/libexec/Makefile#10 integrate .. //depot/projects/hammer/libexec/rlogind/rlogind.c#2 integrate .. //depot/projects/hammer/libexec/rtld-elf/malloc.c#4 integrate .. //depot/projects/hammer/libexec/rtld-elf/map_object.c#5 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.c#6 integrate .. //depot/projects/hammer/libexec/ypxfr/yp_dbwrite.c#2 integrate .. //depot/projects/hammer/libexec/ypxfr/ypxfr_getmap.c#2 integrate .. //depot/projects/hammer/libexec/ypxfr/ypxfr_main.c#2 integrate .. //depot/projects/hammer/libexec/ypxfr/ypxfr_misc.c#2 integrate .. //depot/projects/hammer/libexec/ypxfr/ypxfrd_getmap.c#2 integrate .. //depot/projects/hammer/release/Makefile#16 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/early-adopter/article.sgml#5 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#6 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#15 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#20 integrate .. //depot/projects/hammer/release/i386/dokern.sh#11 integrate .. //depot/projects/hammer/release/scripts/doFS.sh#7 integrate .. //depot/projects/hammer/sbin/adjkerntz/adjkerntz.c#2 integrate .. //depot/projects/hammer/sbin/atacontrol/atacontrol.c#6 integrate .. //depot/projects/hammer/sbin/badsect/badsect.c#4 integrate .. //depot/projects/hammer/sbin/bsdlabel/Makefile#3 integrate .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.8#2 integrate .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#4 integrate .. //depot/projects/hammer/sbin/ccdconfig/ccdconfig.c#3 integrate .. //depot/projects/hammer/sbin/clri/clri.c#4 integrate .. //depot/projects/hammer/sbin/comcontrol/comcontrol.c#2 integrate .. //depot/projects/hammer/sbin/cxconfig/cxconfig.c#2 integrate .. //depot/projects/hammer/sbin/disklabel/disklabel.c#9 integrate .. //depot/projects/hammer/sbin/dumpon/dumpon.c#2 integrate .. //depot/projects/hammer/sbin/fdisk/fdisk.c#9 integrate .. //depot/projects/hammer/sbin/fsck_ffs/dir.c#3 integrate .. //depot/projects/hammer/sbin/fsck_ffs/ea.c#2 integrate .. //depot/projects/hammer/sbin/fsck_ffs/fsutil.c#5 integrate .. //depot/projects/hammer/sbin/fsck_ffs/inode.c#2 integrate .. //depot/projects/hammer/sbin/fsck_ffs/main.c#3 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass1.c#5 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass1b.c#2 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass2.c#3 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass3.c#2 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass4.c#2 integrate .. //depot/projects/hammer/sbin/fsck_ffs/pass5.c#5 integrate .. //depot/projects/hammer/sbin/fsck_ffs/setup.c#6 integrate .. //depot/projects/hammer/sbin/fsck_ffs/utilities.c#2 integrate .. //depot/projects/hammer/sbin/kldconfig/kldconfig.c#3 integrate .. //depot/projects/hammer/sbin/kldload/kldload.c#3 integrate .. //depot/projects/hammer/sbin/kldstat/kldstat.c#3 integrate .. //depot/projects/hammer/sbin/kldunload/kldunload.c#3 integrate .. //depot/projects/hammer/sbin/md5/md5.c#3 integrate .. //depot/projects/hammer/sbin/mdmfs/mdmfs.c#5 integrate .. //depot/projects/hammer/sbin/mount/getmntopts.c#2 integrate .. //depot/projects/hammer/sbin/mount/vfslist.c#2 integrate .. //depot/projects/hammer/sbin/mount_nfs/mount_nfs.c#5 integrate .. //depot/projects/hammer/sbin/newfs/mkfs.c#7 integrate .. //depot/projects/hammer/sbin/newfs/newfs.c#7 integrate .. //depot/projects/hammer/sbin/nfsiod/nfsiod.c#3 integrate .. //depot/projects/hammer/sbin/ping/ping.c#10 integrate .. //depot/projects/hammer/sbin/quotacheck/preen.c#3 integrate .. //depot/projects/hammer/sbin/quotacheck/quotacheck.c#5 integrate .. //depot/projects/hammer/sbin/reboot/reboot.c#4 integrate .. //depot/projects/hammer/sbin/routed/rtquery/rtquery.8#2 integrate .. //depot/projects/hammer/sbin/shutdown/shutdown.c#2 integrate .. //depot/projects/hammer/sbin/spppcontrol/spppcontrol.c#2 integrate .. //depot/projects/hammer/sbin/sunlabel/Makefile#5 integrate .. //depot/projects/hammer/sbin/swapon/swapon.c#3 integrate .. //depot/projects/hammer/sbin/tunefs/tunefs.c#5 integrate .. //depot/projects/hammer/sbin/vinum/commands.c#5 integrate .. //depot/projects/hammer/sbin/vinum/list.c#5 integrate .. //depot/projects/hammer/sbin/vinum/vinum.8#4 integrate .. //depot/projects/hammer/secure/lib/Makefile#5 integrate .. //depot/projects/hammer/secure/lib/libssh/Makefile#5 integrate .. //depot/projects/hammer/secure/libexec/Makefile#4 integrate .. //depot/projects/hammer/secure/usr.bin/Makefile#4 integrate .. //depot/projects/hammer/secure/usr.bin/ssh/Makefile#5 integrate .. //depot/projects/hammer/secure/usr.sbin/sshd/Makefile#5 integrate .. //depot/projects/hammer/share/dict/web2#3 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#8 integrate .. //depot/projects/hammer/share/man/man4/Makefile#11 integrate .. //depot/projects/hammer/share/man/man4/geom.4#3 integrate .. //depot/projects/hammer/share/man/man4/rue.4#1 branch .. //depot/projects/hammer/share/man/man5/make.conf.5#7 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#9 integrate .. //depot/projects/hammer/share/man/man7/release.7#8 integrate .. //depot/projects/hammer/share/misc/bsd-family-tree#7 integrate .. //depot/projects/hammer/share/mk/bsd.README#3 integrate .. //depot/projects/hammer/share/mk/bsd.libnames.mk#6 integrate .. //depot/projects/hammer/share/mk/bsd.prog.mk#4 integrate .. //depot/projects/hammer/share/syscons/keymaps/INDEX.keymaps#2 integrate .. //depot/projects/hammer/share/syscons/keymaps/Makefile#3 integrate .. //depot/projects/hammer/share/syscons/keymaps/norwegian.dvorak.kbd#1 branch .. //depot/projects/hammer/sys/alpha/include/_limits.h#4 integrate .. //depot/projects/hammer/sys/amd64/include/_limits.h#3 integrate .. //depot/projects/hammer/sys/arm/include/_limits.h#3 integrate .. //depot/projects/hammer/sys/boot/common/help.common#4 integrate .. //depot/projects/hammer/sys/boot/common/loader.8#5 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ipc.c#5 integrate .. //depot/projects/hammer/sys/conf/NOTES#15 integrate .. //depot/projects/hammer/sys/conf/files#18 integrate .. //depot/projects/hammer/sys/conf/kern.mk#8 integrate .. //depot/projects/hammer/sys/contrib/dev/acpica/hwregs.c#4 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahc_eisa.c#6 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahc_pci.c#6 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/ahd_pci.c#5 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7770.c#5 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.c#6 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.h#5 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.reg#6 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.seq#5 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_inline.h#5 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_osm.c#5 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx_pci.c#5 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.c#6 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.h#4 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx.reg#4 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_inline.h#4 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_osm.c#8 integrate .. //depot/projects/hammer/sys/dev/aic7xxx/aic7xxx_pci.c#4 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#10 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.h#6 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#7 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.c#9 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.c#9 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.h#6 integrate .. //depot/projects/hammer/sys/dev/ata/atapi-tape.c#5 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#12 integrate .. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#8 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#10 integrate .. //depot/projects/hammer/sys/dev/em/if_em.h#9 integrate .. //depot/projects/hammer/sys/dev/en/midway.c#8 integrate .. //depot/projects/hammer/sys/dev/en/midwayvar.h#4 integrate .. //depot/projects/hammer/sys/dev/firewire/firewire.c#10 integrate .. //depot/projects/hammer/sys/dev/firewire/sbp.c#12 integrate .. //depot/projects/hammer/sys/dev/mii/brgphy.c#8 integrate .. //depot/projects/hammer/sys/dev/mii/ruephy.c#1 branch .. //depot/projects/hammer/sys/dev/mii/ruephyreg.h#1 branch .. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#12 integrate .. //depot/projects/hammer/sys/dev/pccbb/pccbbdevid.h#4 integrate .. //depot/projects/hammer/sys/dev/sio/sio.c#14 integrate .. //depot/projects/hammer/sys/dev/usb/if_rue.c#1 branch .. //depot/projects/hammer/sys/dev/usb/if_ruereg.h#1 branch .. //depot/projects/hammer/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs.h#8 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs_data.h#8 integrate .. //depot/projects/hammer/sys/dev/vinum/vinum.c#4 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumconfig.c#5 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumext.h#5 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumio.c#7 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumio.h#2 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumioctl.c#6 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumkw.h#3 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumlock.c#3 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumobj.h#2 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumparser.c#4 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumrequest.c#5 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumrevive.c#5 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_dbregs.c#2 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_fpregs.c#2 integrate .. //depot/projects/hammer/sys/fs/procfs/procfs_regs.c#2 integrate .. //depot/projects/hammer/sys/fs/udf/udf.h#3 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vfsops.c#5 integrate .. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#8 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde.c#6 integrate .. //depot/projects/hammer/sys/geom/bde/g_bde_work.c#7 integrate .. //depot/projects/hammer/sys/geom/geom.h#15 integrate .. //depot/projects/hammer/sys/geom/geom_aes.c#9 integrate .. //depot/projects/hammer/sys/geom/geom_bsd.c#15 integrate .. //depot/projects/hammer/sys/geom/geom_bsd_enc.c#4 integrate .. //depot/projects/hammer/sys/geom/geom_ctl.c#9 integrate .. //depot/projects/hammer/sys/i386/include/_limits.h#3 integrate .. //depot/projects/hammer/sys/ia64/ia64/locore.s#6 integrate .. //depot/projects/hammer/sys/ia64/include/_limits.h#3 integrate .. //depot/projects/hammer/sys/kern/kern_malloc.c#7 integrate .. //depot/projects/hammer/sys/kern/md5c.c#3 integrate .. //depot/projects/hammer/sys/kern/sysv_shm.c#5 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#14 integrate .. //depot/projects/hammer/sys/modules/Makefile#15 integrate .. //depot/projects/hammer/sys/modules/mii/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/rue/Makefile#1 branch .. //depot/projects/hammer/sys/net/if_atm.h#4 integrate .. //depot/projects/hammer/sys/net/if_atmsubr.c#7 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#14 integrate .. //depot/projects/hammer/sys/pci/if_en_pci.c#5 integrate .. //depot/projects/hammer/sys/powerpc/include/_limits.h#3 integrate .. //depot/projects/hammer/sys/powerpc/powerpc/ofwmagic.S#2 integrate .. //depot/projects/hammer/sys/sparc64/include/_limits.h#3 integrate .. //depot/projects/hammer/sys/sparc64/sparc64/trap.c#9 integrate .. //depot/projects/hammer/sys/sys/limits.h#4 integrate .. //depot/projects/hammer/sys/sys/soundcard.h#4 integrate .. //depot/projects/hammer/sys/sys/syscallsubr.h#5 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#11 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#17 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#15 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.pl#4 integrate .. //depot/projects/hammer/usr.bin/Makefile#11 integrate .. //depot/projects/hammer/usr.bin/chpass/chpass.c#4 integrate .. //depot/projects/hammer/usr.bin/chpass/table.c#2 integrate .. //depot/projects/hammer/usr.bin/cut/cut.1#3 integrate .. //depot/projects/hammer/usr.bin/nohup/nohup.c#2 integrate .. //depot/projects/hammer/usr.bin/unifdef/unifdef.c#5 integrate .. //depot/projects/hammer/usr.bin/uudecode/uudecode.c#7 integrate .. //depot/projects/hammer/usr.bin/uuencode/uuencode.c#3 integrate .. //depot/projects/hammer/usr.bin/xargs/xargs.c#7 integrate .. //depot/projects/hammer/usr.bin/xlint/xlint/xlint.c#3 integrate .. //depot/projects/hammer/usr.sbin/accton/accton.c#2 integrate .. //depot/projects/hammer/usr.sbin/ancontrol/ancontrol.c#3 integrate .. //depot/projects/hammer/usr.sbin/arp/arp.c#3 integrate .. //depot/projects/hammer/usr.sbin/boot0cfg/boot0cfg.c#4 integrate .. //depot/projects/hammer/usr.sbin/burncd/burncd.8#4 integrate .. //depot/projects/hammer/usr.sbin/burncd/burncd.c#4 integrate .. //depot/projects/hammer/usr.sbin/cdcontrol/cdcontrol.c#6 integrate .. //depot/projects/hammer/usr.sbin/chkgrp/chkgrp.c#2 integrate .. //depot/projects/hammer/usr.sbin/chown/chown.c#4 integrate .. //depot/projects/hammer/usr.sbin/chroot/chroot.c#2 integrate .. //depot/projects/hammer/usr.sbin/dev_mkdb/dev_mkdb.c#2 integrate .. //depot/projects/hammer/usr.sbin/edquota/edquota.c#3 integrate .. //depot/projects/hammer/usr.sbin/fdcontrol/fdcontrol.c#2 integrate .. //depot/projects/hammer/usr.sbin/kbdcontrol/kbdcontrol.c#2 integrate .. //depot/projects/hammer/usr.sbin/kernbb/kernbb.c#4 integrate .. //depot/projects/hammer/usr.sbin/lptcontrol/lptcontrol.c#2 integrate .. //depot/projects/hammer/usr.sbin/mixer/mixer.c#4 integrate .. //depot/projects/hammer/usr.sbin/mtree/compare.c#3 integrate .. //depot/projects/hammer/usr.sbin/mtree/create.c#4 integrate .. //depot/projects/hammer/usr.sbin/mtree/excludes.c#2 integrate .. //depot/projects/hammer/usr.sbin/mtree/misc.c#2 integrate .. //depot/projects/hammer/usr.sbin/mtree/mtree.c#3 integrate .. //depot/projects/hammer/usr.sbin/mtree/spec.c#2 integrate .. //depot/projects/hammer/usr.sbin/mtree/verify.c#3 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.c#6 integrate .. //depot/projects/hammer/usr.sbin/procctl/procctl.c#2 integrate .. //depot/projects/hammer/usr.sbin/pstat/pstat.c#4 integrate .. //depot/projects/hammer/usr.sbin/pwd_mkdb/pwd_mkdb.c#4 integrate .. //depot/projects/hammer/usr.sbin/quot/quot.c#5 integrate .. //depot/projects/hammer/usr.sbin/quotaon/quotaon.c#2 integrate .. //depot/projects/hammer/usr.sbin/rarpd/rarpd.c#3 integrate .. //depot/projects/hammer/usr.sbin/repquota/repquota.c#2 integrate .. //depot/projects/hammer/usr.sbin/rmt/rmt.c#2 integrate .. //depot/projects/hammer/usr.sbin/rpc.umntall/mounttab.c#2 integrate .. //depot/projects/hammer/usr.sbin/rpc.yppasswdd/yppasswd_private.x#2 integrate .. //depot/projects/hammer/usr.sbin/rpc.yppasswdd/yppasswdd_main.c#3 integrate .. //depot/projects/hammer/usr.sbin/rpc.yppasswdd/yppasswdd_server.c#2 integrate .. //depot/projects/hammer/usr.sbin/rpc.ypupdated/yp_dbdelete.c#2 integrate .. //depot/projects/hammer/usr.sbin/rpc.ypupdated/yp_dbupdate.c#2 integrate .. //depot/projects/hammer/usr.sbin/rpc.ypupdated/ypupdated_main.c#2 integrate .. //depot/projects/hammer/usr.sbin/rpc.ypupdated/ypupdated_server.c#2 integrate .. //depot/projects/hammer/usr.sbin/rpc.ypxfrd/ypxfrd_main.c#2 integrate .. //depot/projects/hammer/usr.sbin/rpc.ypxfrd/ypxfrd_server.c#2 integrate .. //depot/projects/hammer/usr.sbin/sa/main.c#2 integrate .. //depot/projects/hammer/usr.sbin/sa/pdb.c#2 integrate .. //depot/projects/hammer/usr.sbin/sa/usrdb.c#2 integrate .. //depot/projects/hammer/usr.sbin/slstat/slstat.c#2 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#7 integrate .. //depot/projects/hammer/usr.sbin/syslogd/syslogd.c#8 integrate .. //depot/projects/hammer/usr.sbin/trpt/trpt.c#2 integrate .. //depot/projects/hammer/usr.sbin/usbd/usbd.8#3 integrate .. //depot/projects/hammer/usr.sbin/vipw/vipw.c#3 integrate .. //depot/projects/hammer/usr.sbin/watch/watch.c#4 integrate .. //depot/projects/hammer/usr.sbin/wicontrol/wicontrol.c#5 integrate .. //depot/projects/hammer/usr.sbin/yp_mkdb/yp_mkdb.c#2 integrate .. //depot/projects/hammer/usr.sbin/ypbind/yp_ping.c#3 integrate .. //depot/projects/hammer/usr.sbin/ypbind/ypbind.c#2 integrate .. //depot/projects/hammer/usr.sbin/yppoll/yppoll.c#2 integrate .. //depot/projects/hammer/usr.sbin/yppush/yppush_main.c#2 integrate .. //depot/projects/hammer/usr.sbin/ypserv/yp_access.c#2 integrate .. //depot/projects/hammer/usr.sbin/ypserv/yp_dblookup.c#2 integrate .. //depot/projects/hammer/usr.sbin/ypserv/yp_dnslookup.c#3 integrate .. //depot/projects/hammer/usr.sbin/ypserv/yp_error.c#2 integrate .. //depot/projects/hammer/usr.sbin/ypserv/yp_main.c#2 integrate .. //depot/projects/hammer/usr.sbin/ypserv/yp_server.c#2 integrate .. //depot/projects/hammer/usr.sbin/ypserv/yp_svc_udp.c#2 integrate .. //depot/projects/hammer/usr.sbin/ypset/ypset.c#2 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#14 (text+ko) ==== @@ -1,8 +1,8 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.353 2003/05/01 20:41:03 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.356 2003/05/05 12:54:26 bde Exp $ # # Make command line options: -# -DMAKE_KERBEROS5 to build Kerberos5 +# -DNO_KERBEROS Do not build Heimdal (Kerberos 5) # -DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir # -DNOCLEAN do not clean at all # -DNOCRYPT will prevent building of crypt versions @@ -61,7 +61,7 @@ SUBDIR+= gnu .endif .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ - !defined(NOCRYPT) && !defined(NO_OPENSSL) && defined(MAKE_KERBEROS5) + !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_KERBEROS) SUBDIR+= kerberos5 .endif .if exists(${.CURDIR}/libexec) @@ -119,7 +119,9 @@ .endif MAKEOBJDIRPREFIX?= /usr/obj +.if !defined(OSRELDATE) OSRELDATE!= sysctl -n kern.osreldate +.endif TARGET_ARCH?= ${MACHINE_ARCH} .if ${TARGET_ARCH} == ${MACHINE_ARCH} TARGET?= ${MACHINE} @@ -277,14 +279,10 @@ mkdir -p ${WORLDTMP}/legacy/${_dir} .endfor .for _dir in \ - usr/bin usr/lib/compat/aout usr/libdata/ldscripts usr/libexec usr/share/misc + usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \ + usr/libexec usr/share/misc mkdir -p ${WORLDTMP}/${_dir} .endfor -.for _dir in \ - arpa dev fs g++/backward g++/bits g++/ext isc isofs libmilter \ - objc openssl protocols readline rpc rpcsvc security ufs - mkdir -p ${WORLDTMP}/usr/include/${_dir} -.endfor ln -sf ${.CURDIR}/sys ${WORLDTMP} _legacy: @echo @@ -695,7 +693,7 @@ .endif .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ - !defined(NOCRYPT) && defined(MAKE_KERBEROS5) + !defined(NOCRYPT) && !defined(NO_KERBEROS) _libkrb5= kerberos5/lib/libroken kerberos5/lib/libvers \ kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl .endif @@ -782,7 +780,7 @@ _generic_libs= gnu/lib -.if !defined(NOCRYPT) && defined(MAKE_KERBEROS5) +.if !defined(NOCRYPT) && !defined(NO_KERBEROS) _prebuild_libs+= kerberos5/lib/libasn1 _prebuild_libs+= kerberos5/lib/libgssapi _prebuild_libs+= kerberos5/lib/libkrb5 ==== //depot/projects/hammer/UPDATING#10 (text+ko) ==== @@ -17,6 +17,12 @@ developers choose to disable these features on build machines to maximize performance. +20030502: + groff has been updated. If you try to do a buildworld and + get an infinite loop in troff, update to May 4th or newer. If you + have a newer kernel than userland, you may need to set the OSRELDATE + to 500110 in your environment before starting a buildworld. + 20030501: The old rc system has been removed. Please report any problems to freebsd-rc@yahoogroups.com, and/or freebsd-current@freebsd.org. @@ -25,7 +31,6 @@ especially when using mergemaster, since the compatibility code that utilizes these old scripts has also been removed. - 20030423: A bug has been fixed in /dev/devctl which would cause devd to hang on boot, were it not for a workaround in devd. The @@ -1268,4 +1273,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.249 2003/05/02 05:27:33 dougb Exp $ +$FreeBSD: src/UPDATING,v 1.250 2003/05/04 06:26:30 imp Exp $ ==== //depot/projects/hammer/bin/df/df.c#6 (text+ko) ==== @@ -48,7 +48,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.46 2003/05/01 16:58:55 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.48 2003/05/03 16:02:52 markm Exp $"); #include #include @@ -57,6 +57,7 @@ #include #include #include +#include #include #include #include @@ -88,37 +89,51 @@ /* Maximum widths of various fields. */ struct maxwidths { - int mntfrom; - int total; - int used; - int avail; - int iused; - int ifree; + size_t mntfrom; + size_t total; + size_t used; + size_t avail; + size_t iused; + size_t ifree; }; -unsigned long long vals_si [] = {1, KILO_SI_SZ, MEGA_SI_SZ, GIGA_SI_SZ, TERA_SI_SZ, PETA_SI_SZ}; -unsigned long long vals_base2[] = {1, KILO_2_SZ, MEGA_2_SZ, GIGA_2_SZ, TERA_2_SZ, PETA_2_SZ}; -unsigned long long *valp; +static uintmax_t vals_si [] = { + 1, + KILO_SI_SZ, + MEGA_SI_SZ, + GIGA_SI_SZ, + TERA_SI_SZ, + PETA_SI_SZ +}; +static uintmax_t vals_base2[] = { + 1, + KILO_2_SZ, + MEGA_2_SZ, + GIGA_2_SZ, + TERA_2_SZ, + PETA_2_SZ +}; +static uintmax_t *valp; typedef enum { NONE, KILO, MEGA, GIGA, TERA, PETA, UNIT_MAX } unit_t; -unit_t unitp [] = { NONE, KILO, MEGA, GIGA, TERA, PETA }; +static unit_t unitp [] = { NONE, KILO, MEGA, GIGA, TERA, PETA }; -static char *getmntpt(char *); -static int longwidth(long); +static char *getmntpt(const char *); +static size_t longwidth(long); static char *makenetvfslist(void); -static void prthuman(struct statfs *, long); +static void prthuman(const struct statfs *, long); static void prthumanval(double); static void prtstat(struct statfs *, struct maxwidths *); static long regetmntinfo(struct statfs **, long, const char **); static unit_t unit_adjust(double *); -static void update_maxwidths(struct maxwidths *, struct statfs *); +static void update_maxwidths(struct maxwidths *, const struct statfs *); static void usage(void); -static __inline int -imax(int a, int b) +static __inline u_int +max(u_int a, u_int b) { - return (MAX(a, b)); + return (a > b ? a : b); } static int aflag = 0, hflag, iflag, nflag; @@ -275,7 +290,7 @@ } static char * -getmntpt(char *name) +getmntpt(const char *name) { long mntsize, i; struct statfs *mntbuf; @@ -326,13 +341,13 @@ { double abval; unit_t unit; - unsigned int unit_sz; + int unit_sz; abval = fabs(*val); unit_sz = abval ? ilogb(abval) / 10 : 0; - if (unit_sz >= UNIT_MAX) { + if (unit_sz >= (int)UNIT_MAX) { unit = NONE; } else { unit = unitp[unit_sz]; @@ -343,7 +358,7 @@ } static void -prthuman(struct statfs *sfsp, long used) +prthuman(const struct statfs *sfsp, long used) { prthumanval((double)sfsp->f_blocks * (double)sfsp->f_bsize); @@ -381,43 +396,46 @@ prtstat(struct statfs *sfsp, struct maxwidths *mwp) { static long blocksize; - static int headerlen, timesthrough; + static int headerlen, timesthrough = 0; static const char *header; long used, availblks, inodes; if (++timesthrough == 1) { - mwp->mntfrom = imax(mwp->mntfrom, strlen("Filesystem")); + mwp->mntfrom = max(mwp->mntfrom, strlen("Filesystem")); if (hflag) { header = " Size"; mwp->total = mwp->used = mwp->avail = strlen(header); } else { header = getbsize(&headerlen, &blocksize); - mwp->total = imax(mwp->total, headerlen); + mwp->total = max(mwp->total, (u_int)headerlen); } - mwp->used = imax(mwp->used, strlen("Used")); - mwp->avail = imax(mwp->avail, strlen("Avail")); + mwp->used = max(mwp->used, strlen("Used")); + mwp->avail = max(mwp->avail, strlen("Avail")); - (void)printf("%-*s %-*s %*s %*s Capacity", mwp->mntfrom, - "Filesystem", mwp->total, header, mwp->used, "Used", - mwp->avail, "Avail"); + (void)printf("%-*s %-*s %*s %*s Capacity", + (u_int)mwp->mntfrom, "Filesystem", + (u_int)mwp->total, header, + (u_int)mwp->used, "Used", + (u_int)mwp->avail, "Avail"); if (iflag) { - mwp->iused = imax(mwp->iused, strlen(" iused")); - mwp->ifree = imax(mwp->ifree, strlen("ifree")); - (void)printf(" %*s %*s %%iused", mwp->iused - 2, - "iused", mwp->ifree, "ifree"); + mwp->iused = max(mwp->iused, strlen(" iused")); + mwp->ifree = max(mwp->ifree, strlen("ifree")); + (void)printf(" %*s %*s %%iused", + (u_int)mwp->iused - 2, "iused", + (u_int)mwp->ifree, "ifree"); } (void)printf(" Mounted on\n"); } - (void)printf("%-*s", mwp->mntfrom, sfsp->f_mntfromname); + (void)printf("%-*s", (u_int)mwp->mntfrom, sfsp->f_mntfromname); used = sfsp->f_blocks - sfsp->f_bfree; availblks = sfsp->f_bavail + used; if (hflag) { prthuman(sfsp, used); } else { - (void)printf(" %*ld %*ld %*ld", mwp->total, - fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize), - mwp->used, fsbtoblk(used, sfsp->f_bsize, blocksize), - mwp->avail, fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, + (void)printf(" %*ld %*ld %*ld", + (u_int)mwp->total, fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize), + (u_int)mwp->used, fsbtoblk(used, sfsp->f_bsize, blocksize), + (u_int)mwp->avail, fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, blocksize)); } (void)printf(" %5.0f%%", @@ -425,9 +443,10 @@ if (iflag) { inodes = sfsp->f_files; used = inodes - sfsp->f_ffree; - (void)printf(" %*ld %*ld %4.0f%% ", mwp->iused, used, - mwp->ifree, sfsp->f_ffree, inodes == 0 ? 100.0 : - (double)used / (double)inodes * 100.0); + (void)printf(" %*ld %*ld %4.0f%% ", + (u_int)mwp->iused, used, + (u_int)mwp->ifree, sfsp->f_ffree, + inodes == 0 ? 100.0 : (double)used / (double)inodes * 100.0); } else (void)printf(" "); (void)printf(" %s\n", sfsp->f_mntonname); @@ -438,31 +457,31 @@ * the file system specified by `sfsp'. */ static void -update_maxwidths(struct maxwidths *mwp, struct statfs *sfsp) +update_maxwidths(struct maxwidths *mwp, const struct statfs *sfsp) { - static long blocksize; + static long blocksize = 0; int dummy; if (blocksize == 0) getbsize(&dummy, &blocksize); - mwp->mntfrom = imax(mwp->mntfrom, strlen(sfsp->f_mntfromname)); - mwp->total = imax(mwp->total, longwidth(fsbtoblk(sfsp->f_blocks, + mwp->mntfrom = max(mwp->mntfrom, strlen(sfsp->f_mntfromname)); + mwp->total = max(mwp->total, longwidth(fsbtoblk(sfsp->f_blocks, sfsp->f_bsize, blocksize))); - mwp->used = imax(mwp->used, longwidth(fsbtoblk(sfsp->f_blocks - + mwp->used = max(mwp->used, longwidth(fsbtoblk(sfsp->f_blocks - sfsp->f_bfree, sfsp->f_bsize, blocksize))); - mwp->avail = imax(mwp->avail, longwidth(fsbtoblk(sfsp->f_bavail, + mwp->avail = max(mwp->avail, longwidth(fsbtoblk(sfsp->f_bavail, sfsp->f_bsize, blocksize))); - mwp->iused = imax(mwp->iused, longwidth(sfsp->f_files - + mwp->iused = max(mwp->iused, longwidth(sfsp->f_files - sfsp->f_ffree)); - mwp->ifree = imax(mwp->ifree, longwidth(sfsp->f_ffree)); + mwp->ifree = max(mwp->ifree, longwidth(sfsp->f_ffree)); } /* Return the width in characters of the specified long. */ -static int +static size_t longwidth(long val) { - int len; + size_t len; len = 0; /* Negative or zero values require one extra digit. */ @@ -491,7 +510,7 @@ makenetvfslist(void) { char *str, *strptr, **listptr; - struct xvfsconf *xvfsp; + struct xvfsconf *xvfsp, *keep_xvfsp; size_t buflen; int cnt, i, maxvfsconf; @@ -504,14 +523,17 @@ warnx("malloc failed"); return (NULL); } + keep_xvfsp = xvfsp; if (sysctlbyname("vfs.conflist", xvfsp, &buflen, NULL, 0) < 0) { warn("sysctl(vfs.conflist)"); + free(keep_xvfsp); return (NULL); } maxvfsconf = buflen / sizeof(struct xvfsconf); if ((listptr = malloc(sizeof(char*) * maxvfsconf)) == NULL) { warnx("malloc failed"); + free(keep_xvfsp); return (NULL); } @@ -520,6 +542,8 @@ listptr[cnt++] = strdup(xvfsp->vfc_name); if (listptr[cnt-1] == NULL) { warnx("malloc failed"); + free(listptr); + free(keep_xvfsp); return (NULL); } } @@ -531,6 +555,7 @@ if (cnt > 0) warnx("malloc failed"); free(listptr); + free(keep_xvfsp); return (NULL); } @@ -543,6 +568,7 @@ } *(--strptr) = NULL; + free(keep_xvfsp); free(listptr); return (str); } ==== //depot/projects/hammer/bin/ed/ed.1#2 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/bin/ed/ed.1,v 1.32 2002/07/04 13:22:22 ru Exp $ +.\" $FreeBSD: src/bin/ed/ed.1,v 1.33 2003/05/03 20:26:11 keramida Exp $ .Dd May 21, 1993 .Dt ED 1 .Os @@ -394,11 +394,12 @@ .Ar col-elm is a .Em collating element -are interpreted according to -.Xr locale 5 +are interpreted according to the current locale settings (not currently supported). See .Xr regex 3 +and +.Xr re_format 7 for an explanation of these constructs. .It Op ^char-class Match any single character, other than newline, not in ==== //depot/projects/hammer/bin/ls/extern.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)extern.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD: src/bin/ls/extern.h,v 1.20 2002/10/18 10:59:45 tjr Exp $ + * $FreeBSD: src/bin/ls/extern.h,v 1.21 2003/05/03 16:39:33 markm Exp $ */ int acccmp(const FTSENT *, const FTSENT *); @@ -43,11 +43,11 @@ int statcmp(const FTSENT *, const FTSENT *); int revstatcmp(const FTSENT *, const FTSENT *); -void printcol(DISPLAY *); -void printlong(DISPLAY *); +void printcol(const DISPLAY *); +void printlong(const DISPLAY *); int printname(const char *); -void printscol(DISPLAY *); -void printstream(DISPLAY *); +void printscol(const DISPLAY *); +void printstream(const DISPLAY *); void usage(void); size_t len_octal(const char *, int); int prn_octal(const char *); @@ -62,3 +62,4 @@ extern char *attrs_off; extern char *enter_bold; #endif +extern int termwidth; ==== //depot/projects/hammer/bin/ls/ls.c#8 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.73 2003/04/26 02:31:26 rwatson Exp $"); +__FBSDID("$FreeBSD: src/bin/ls/ls.c,v 1.74 2003/05/03 16:39:33 markm Exp $"); #include #include @@ -58,6 +58,7 @@ #include #include #include +#include #include #include #include @@ -80,12 +81,26 @@ */ #define STRBUF_SIZEOF(t) (1 + CHAR_BIT * sizeof(t) / 3 + 1) -static void display(FTSENT *, FTSENT *, int); -static u_quad_t makenines(u_long); +/* + * MAKENINES(n) turns n into (10**n)-1. This is useful for converting a width + * into a number that wide in decimal. + * XXX: Overflows are not considered. + */ +#define MAKENINES(n) \ + do { \ + intmax_t i; \ + \ + /* Use a loop as all values of n are small. */ \ + for (i = 1; n > 0; i *= 10) \ + n--; \ + n = i - 1; \ + } while(0) + +static void display(const FTSENT *, FTSENT *, int); static int mastercmp(const FTSENT * const *, const FTSENT * const *); static void traverse(int, char **, int); -static void (*printfcn)(DISPLAY *); +static void (*printfcn)(const DISPLAY *); static int (*sortfcn)(const FTSENT *, const FTSENT *); long blocksize; /* block size units */ @@ -114,7 +129,7 @@ int f_slash; /* similar to f_type, but only for dirs */ int f_sortacross; /* sort across rows, not down columns */ int f_statustime; /* use time of last mode change */ - int f_stream; /* stream the output, separate with commas */ +static int f_stream; /* stream the output, separate with commas */ static int f_timesort; /* sort by time vice name */ int f_type; /* add type character for non-regular files */ static int f_whiteout; /* show whiteout entries */ @@ -473,10 +488,10 @@ */ if (output) { putchar('\n'); - printname(p->fts_path); + (void)printname(p->fts_path); puts(":"); } else if (argc > 1) { - printname(p->fts_path); + (void)printname(p->fts_path); puts(":"); output = 1; } @@ -499,14 +514,15 @@ * points to the parent directory of the display list. */ static void -display(FTSENT *p, FTSENT *list, int options) +display(const FTSENT *p, FTSENT *list, int options) { struct stat *sp; DISPLAY d; FTSENT *cur; NAMES *np; off_t maxsize; - u_long btotal, labelstrlen, maxblock, maxinode, maxlen, maxnlink; + long maxblock; + u_long btotal, labelstrlen, maxinode, maxlen, maxnlink; u_long maxlabelstr; int bcfile, maxflags; gid_t maxgroup; @@ -542,9 +558,10 @@ int ninitmax; /* Fill-in "::" as "0:0:0" for the sake of scanf. */ - jinitmax = initmax2 = malloc(strlen(initmax) * 2 + 2); + jinitmax = malloc(strlen(initmax) * 2 + 2); if (jinitmax == NULL) err(1, "malloc"); + initmax2 = jinitmax; if (*initmax == ':') strcpy(initmax2, "0:"), initmax2 += 2; else @@ -563,7 +580,7 @@ strcpy(initmax2, "0"); ninitmax = sscanf(jinitmax, - " %lu : %lu : %lu : %i : %i : %i : %llu : %lu : %lu ", + " %lu : %ld : %lu : %u : %u : %i : %jd : %lu : %lu ", &maxinode, &maxblock, &maxnlink, &maxuser, &maxgroup, &maxflags, &maxsize, &maxlen, &maxlabelstr); f_notabs = 1; @@ -603,10 +620,10 @@ default: break; } - maxinode = makenines(maxinode); - maxblock = makenines(maxblock); - maxnlink = makenines(maxnlink); - maxsize = makenines(maxsize); + MAKENINES(maxinode); + MAKENINES(maxblock); + MAKENINES(maxnlink); + MAKENINES(maxsize); } bcfile = 0; flags = NULL; @@ -787,7 +804,7 @@ d.s_inode = strlen(buf); (void)snprintf(buf, sizeof(buf), "%lu", maxnlink); d.s_nlink = strlen(buf); - (void)snprintf(buf, sizeof(buf), "%qu", maxsize); + (void)snprintf(buf, sizeof(buf), "%ju", maxsize); d.s_size = strlen(buf); d.s_user = maxuser; } @@ -829,22 +846,3 @@ } return (sortfcn(*a, *b)); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 5 12:17:07 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A67137B404; Mon, 5 May 2003 12:17:06 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B420837B401 for ; Mon, 5 May 2003 12:17:05 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7E41A43F85 for ; Mon, 5 May 2003 12:17:04 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h45JH40U096903 for ; Mon, 5 May 2003 12:17:04 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h45JH2kn096900 for perforce@freebsd.org; Mon, 5 May 2003 12:17:02 -0700 (PDT) Date: Mon, 5 May 2003 12:17:02 -0700 (PDT) Message-Id: <200305051917.h45JH2kn096900@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30611 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2003 19:17:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=30611 Change 30611 by marcel@marcel_pluto1 on 2003/05/05 12:16:38 IFC @30610 Affected files ... .. //depot/projects/ia64/Makefile.inc1#59 integrate .. //depot/projects/ia64/UPDATING#40 integrate .. //depot/projects/ia64/crypto/telnet/libtelnet/auth.c#4 integrate .. //depot/projects/ia64/crypto/telnet/libtelnet/enc_des.c#4 integrate .. //depot/projects/ia64/crypto/telnet/telnet/authenc.c#3 integrate .. //depot/projects/ia64/crypto/telnet/telnet/commands.c#8 integrate .. //depot/projects/ia64/crypto/telnet/telnet/main.c#4 integrate .. //depot/projects/ia64/crypto/telnet/telnet/network.c#4 integrate .. //depot/projects/ia64/crypto/telnet/telnet/ring.c#3 integrate .. //depot/projects/ia64/crypto/telnet/telnet/sys_bsd.c#6 integrate .. //depot/projects/ia64/crypto/telnet/telnet/telnet.c#4 integrate .. //depot/projects/ia64/crypto/telnet/telnet/terminal.c#4 integrate .. //depot/projects/ia64/crypto/telnet/telnet/utilities.c#4 integrate .. //depot/projects/ia64/crypto/telnet/telnetd/authenc.c#3 integrate .. //depot/projects/ia64/crypto/telnet/telnetd/global.c#2 integrate .. //depot/projects/ia64/crypto/telnet/telnetd/slc.c#3 integrate .. //depot/projects/ia64/crypto/telnet/telnetd/state.c#4 integrate .. //depot/projects/ia64/crypto/telnet/telnetd/sys_term.c#6 integrate .. //depot/projects/ia64/crypto/telnet/telnetd/telnetd.c#3 integrate .. //depot/projects/ia64/crypto/telnet/telnetd/termstat.c#3 integrate .. //depot/projects/ia64/crypto/telnet/telnetd/utility.c#3 integrate .. //depot/projects/ia64/etc/rc.d/abi#2 integrate .. //depot/projects/ia64/etc/rc.d/cron#3 integrate .. //depot/projects/ia64/etc/rc.d/devfs#4 integrate .. //depot/projects/ia64/etc/rc.d/jail#3 integrate .. //depot/projects/ia64/etc/rc.d/localdaemons#2 integrate .. //depot/projects/ia64/etc/rc.d/network3#4 integrate .. //depot/projects/ia64/etc/rc.d/securelevel#6 integrate .. //depot/projects/ia64/etc/rc.d/serial#5 integrate .. //depot/projects/ia64/etc/rc.d/virecover#5 integrate .. //depot/projects/ia64/games/caesar/caesar.c#3 integrate .. //depot/projects/ia64/games/fortune/fortune/fortune.c#4 integrate .. //depot/projects/ia64/games/fortune/strfile/strfile.c#4 integrate .. //depot/projects/ia64/games/fortune/unstr/unstr.c#4 integrate .. //depot/projects/ia64/games/pom/pom.c#3 integrate .. //depot/projects/ia64/games/random/random.c#5 integrate .. //depot/projects/ia64/gnu/usr.bin/cvs/cvs/Makefile#6 integrate .. //depot/projects/ia64/include/Makefile#26 integrate .. //depot/projects/ia64/include/rpcsvc/bootparam_prot.x#2 integrate .. //depot/projects/ia64/include/rpcsvc/crypt.x#2 integrate .. //depot/projects/ia64/include/rpcsvc/key_prot.x#2 integrate .. //depot/projects/ia64/include/rpcsvc/klm_prot.x#2 integrate .. //depot/projects/ia64/include/rpcsvc/mount.x#2 integrate .. //depot/projects/ia64/include/rpcsvc/nfs_prot.x#2 integrate .. //depot/projects/ia64/include/rpcsvc/nis.x#3 integrate .. //depot/projects/ia64/include/rpcsvc/nis_cache.x#2 integrate .. //depot/projects/ia64/include/rpcsvc/nis_callback.x#2 integrate .. //depot/projects/ia64/include/rpcsvc/nlm_prot.x#2 integrate .. //depot/projects/ia64/include/rpcsvc/pmap_prot.x#3 integrate .. //depot/projects/ia64/include/rpcsvc/rex.x#2 integrate .. //depot/projects/ia64/include/rpcsvc/rnusers.x#2 integrate .. //depot/projects/ia64/include/rpcsvc/rquota.x#2 integrate .. //depot/projects/ia64/include/rpcsvc/rstat.x#3 integrate .. //depot/projects/ia64/include/rpcsvc/sm_inter.x#3 integrate .. //depot/projects/ia64/include/rpcsvc/spray.x#2 integrate .. //depot/projects/ia64/include/rpcsvc/yp.x#2 integrate .. //depot/projects/ia64/include/rpcsvc/yppasswd.x#3 integrate .. //depot/projects/ia64/include/rpcsvc/ypupdate_prot.x#2 integrate .. //depot/projects/ia64/include/rpcsvc/ypxfrd.x#2 integrate .. //depot/projects/ia64/kerberos5/Makefile#6 integrate .. //depot/projects/ia64/lib/Makefile#24 integrate .. //depot/projects/ia64/lib/csu/common/crtbrand.c#3 integrate .. //depot/projects/ia64/lib/csu/i386-elf/Makefile#6 integrate .. //depot/projects/ia64/lib/libc/net/getaddrinfo.c#13 integrate .. //depot/projects/ia64/lib/libc/net/name6.c#9 integrate .. //depot/projects/ia64/lib/libpam/modules/modules.inc#15 integrate .. //depot/projects/ia64/lib/libpthread/sys/lock.c#2 integrate .. //depot/projects/ia64/lib/libpthread/sys/lock.h#2 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_create.c#8 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#14 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_private.h#11 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_resume_np.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sig.c#7 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_suspend_np.c#4 integrate .. //depot/projects/ia64/lib/libutil/login.conf.5#8 integrate .. //depot/projects/ia64/libexec/Makefile#13 integrate .. //depot/projects/ia64/libexec/rlogind/rlogind.c#4 integrate .. //depot/projects/ia64/libexec/rtld-elf/malloc.c#5 integrate .. //depot/projects/ia64/libexec/rtld-elf/map_object.c#5 integrate .. //depot/projects/ia64/libexec/rtld-elf/rtld.c#13 integrate .. //depot/projects/ia64/libexec/ypxfr/yp_dbwrite.c#3 integrate .. //depot/projects/ia64/libexec/ypxfr/ypxfr_getmap.c#4 integrate .. //depot/projects/ia64/libexec/ypxfr/ypxfr_main.c#4 integrate .. //depot/projects/ia64/libexec/ypxfr/ypxfr_misc.c#5 integrate .. //depot/projects/ia64/libexec/ypxfr/ypxfrd_getmap.c#3 integrate .. //depot/projects/ia64/release/Makefile#49 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#23 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#47 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#88 integrate .. //depot/projects/ia64/release/i386/dokern.sh#17 integrate .. //depot/projects/ia64/sbin/atacontrol/atacontrol.c#11 integrate .. //depot/projects/ia64/sbin/bsdlabel/bsdlabel.c#4 integrate .. //depot/projects/ia64/sbin/routed/rtquery/rtquery.8#3 integrate .. //depot/projects/ia64/sbin/vinum/commands.c#7 integrate .. //depot/projects/ia64/sbin/vinum/list.c#7 integrate .. //depot/projects/ia64/sbin/vinum/vinum.8#8 integrate .. //depot/projects/ia64/secure/lib/Makefile#6 integrate .. //depot/projects/ia64/secure/lib/libssh/Makefile#10 integrate .. //depot/projects/ia64/secure/libexec/Makefile#5 integrate .. //depot/projects/ia64/secure/usr.bin/Makefile#6 integrate .. //depot/projects/ia64/secure/usr.bin/ssh/Makefile#9 integrate .. //depot/projects/ia64/secure/usr.sbin/sshd/Makefile#14 integrate .. //depot/projects/ia64/share/dict/web2#3 integrate .. //depot/projects/ia64/share/examples/etc/make.conf#29 integrate .. //depot/projects/ia64/share/man/man4/geom.4#7 integrate .. //depot/projects/ia64/share/man/man5/make.conf.5#33 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#36 integrate .. //depot/projects/ia64/share/man/man7/release.7#20 integrate .. //depot/projects/ia64/share/mk/bsd.libnames.mk#15 integrate .. //depot/projects/ia64/share/syscons/keymaps/INDEX.keymaps#4 integrate .. //depot/projects/ia64/share/syscons/keymaps/Makefile#7 integrate .. //depot/projects/ia64/share/syscons/keymaps/norwegian.dvorak.kbd#1 branch .. //depot/projects/ia64/sys/alpha/include/_limits.h#4 integrate .. //depot/projects/ia64/sys/amd64/include/_limits.h#2 integrate .. //depot/projects/ia64/sys/arm/include/_limits.h#3 integrate .. //depot/projects/ia64/sys/boot/common/help.common#8 integrate .. //depot/projects/ia64/sys/boot/common/loader.8#16 integrate .. //depot/projects/ia64/sys/compat/linux/linux_ipc.c#8 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/ahc_eisa.c#8 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/ahc_pci.c#10 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/ahd_pci.c#7 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7770.c#6 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.c#10 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.h#8 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.reg#9 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.seq#8 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_inline.h#8 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_osm.c#9 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_pci.c#9 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.c#10 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.h#6 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.reg#6 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_inline.h#5 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_osm.c#9 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_pci.c#7 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.c#36 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.h#13 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.c#27 integrate .. //depot/projects/ia64/sys/dev/ata/ata-raid.c#21 integrate .. //depot/projects/ia64/sys/dev/ata/ata-raid.h#12 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-tape.c#14 integrate .. //depot/projects/ia64/sys/dev/bge/if_bge.c#29 integrate .. //depot/projects/ia64/sys/dev/en/midway.c#13 integrate .. //depot/projects/ia64/sys/dev/en/midwayvar.h#5 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.c#27 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#31 integrate .. //depot/projects/ia64/sys/dev/mii/brgphy.c#12 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbb.c#25 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbbdevid.h#7 integrate .. //depot/projects/ia64/sys/dev/sio/sio.c#43 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs#34 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs.h#33 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#33 integrate .. //depot/projects/ia64/sys/dev/vinum/vinum.c#10 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumconfig.c#10 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumext.h#8 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumio.c#14 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumio.h#2 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumioctl.c#12 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumkw.h#3 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumlock.c#3 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumobj.h#4 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumparser.c#4 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumrequest.c#11 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumrevive.c#8 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_dbregs.c#7 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_fpregs.c#7 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_regs.c#7 integrate .. //depot/projects/ia64/sys/fs/udf/udf.h#3 integrate .. //depot/projects/ia64/sys/fs/udf/udf_vfsops.c#10 integrate .. //depot/projects/ia64/sys/fs/udf/udf_vnops.c#18 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde.c#10 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_work.c#11 integrate .. //depot/projects/ia64/sys/geom/geom.h#30 integrate .. //depot/projects/ia64/sys/geom/geom_aes.c#13 integrate .. //depot/projects/ia64/sys/geom/geom_bsd.c#33 integrate .. //depot/projects/ia64/sys/geom/geom_bsd_enc.c#3 integrate .. //depot/projects/ia64/sys/geom/geom_ctl.c#9 integrate .. //depot/projects/ia64/sys/i386/include/_limits.h#3 integrate .. //depot/projects/ia64/sys/ia64/include/_limits.h#3 integrate .. //depot/projects/ia64/sys/kern/kern_malloc.c#21 integrate .. //depot/projects/ia64/sys/kern/md5c.c#4 integrate .. //depot/projects/ia64/sys/kern/sysv_shm.c#11 integrate .. //depot/projects/ia64/sys/net/if_atm.h#5 integrate .. //depot/projects/ia64/sys/net/if_atmsubr.c#10 integrate .. //depot/projects/ia64/sys/net/if_ethersubr.c#30 integrate .. //depot/projects/ia64/sys/pci/if_en_pci.c#6 integrate .. //depot/projects/ia64/sys/powerpc/include/_limits.h#3 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/ofwmagic.S#2 integrate .. //depot/projects/ia64/sys/sparc64/include/_limits.h#3 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/trap.c#26 integrate .. //depot/projects/ia64/sys/sys/limits.h#3 integrate .. //depot/projects/ia64/sys/sys/soundcard.h#5 integrate .. //depot/projects/ia64/sys/sys/syscallsubr.h#6 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#51 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.c#37 integrate .. //depot/projects/ia64/tools/tools/tinderbox/tbmaster.pl#6 integrate .. //depot/projects/ia64/usr.bin/Makefile#45 integrate .. //depot/projects/ia64/usr.bin/xlint/xlint/xlint.c#12 integrate .. //depot/projects/ia64/usr.sbin/burncd/burncd.8#12 integrate .. //depot/projects/ia64/usr.sbin/burncd/burncd.c#13 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/menus.c#28 integrate .. //depot/projects/ia64/usr.sbin/syslogd/syslogd.c#16 integrate .. //depot/projects/ia64/usr.sbin/usbd/usbd.8#4 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#59 (text+ko) ==== @@ -1,8 +1,8 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.353 2003/05/01 20:41:03 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.356 2003/05/05 12:54:26 bde Exp $ # # Make command line options: -# -DMAKE_KERBEROS5 to build Kerberos5 +# -DNO_KERBEROS Do not build Heimdal (Kerberos 5) # -DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir # -DNOCLEAN do not clean at all # -DNOCRYPT will prevent building of crypt versions @@ -61,7 +61,7 @@ SUBDIR+= gnu .endif .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ - !defined(NOCRYPT) && !defined(NO_OPENSSL) && defined(MAKE_KERBEROS5) + !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_KERBEROS) SUBDIR+= kerberos5 .endif .if exists(${.CURDIR}/libexec) @@ -119,7 +119,9 @@ .endif MAKEOBJDIRPREFIX?= /usr/obj +.if !defined(OSRELDATE) OSRELDATE!= sysctl -n kern.osreldate +.endif TARGET_ARCH?= ${MACHINE_ARCH} .if ${TARGET_ARCH} == ${MACHINE_ARCH} TARGET?= ${MACHINE} @@ -277,14 +279,10 @@ mkdir -p ${WORLDTMP}/legacy/${_dir} .endfor .for _dir in \ - usr/bin usr/lib/compat/aout usr/libdata/ldscripts usr/libexec usr/share/misc + usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \ + usr/libexec usr/share/misc mkdir -p ${WORLDTMP}/${_dir} .endfor -.for _dir in \ - arpa dev fs g++/backward g++/bits g++/ext isc isofs libmilter \ - objc openssl protocols readline rpc rpcsvc security ufs - mkdir -p ${WORLDTMP}/usr/include/${_dir} -.endfor ln -sf ${.CURDIR}/sys ${WORLDTMP} _legacy: @echo @@ -695,7 +693,7 @@ .endif .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ - !defined(NOCRYPT) && defined(MAKE_KERBEROS5) + !defined(NOCRYPT) && !defined(NO_KERBEROS) _libkrb5= kerberos5/lib/libroken kerberos5/lib/libvers \ kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl .endif @@ -782,7 +780,7 @@ _generic_libs= gnu/lib -.if !defined(NOCRYPT) && defined(MAKE_KERBEROS5) +.if !defined(NOCRYPT) && !defined(NO_KERBEROS) _prebuild_libs+= kerberos5/lib/libasn1 _prebuild_libs+= kerberos5/lib/libgssapi _prebuild_libs+= kerberos5/lib/libkrb5 ==== //depot/projects/ia64/UPDATING#40 (text+ko) ==== @@ -17,6 +17,12 @@ developers choose to disable these features on build machines to maximize performance. +20030502: + groff has been updated. If you try to do a buildworld and + get an infinite loop in troff, update to May 4th or newer. If you + have a newer kernel than userland, you may need to set the OSRELDATE + to 500110 in your environment before starting a buildworld. + 20030501: The old rc system has been removed. Please report any problems to freebsd-rc@yahoogroups.com, and/or freebsd-current@freebsd.org. @@ -25,7 +31,6 @@ especially when using mergemaster, since the compatibility code that utilizes these old scripts has also been removed. - 20030423: A bug has been fixed in /dev/devctl which would cause devd to hang on boot, were it not for a workaround in devd. The @@ -1268,4 +1273,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.249 2003/05/02 05:27:33 dougb Exp $ +$FreeBSD: src/UPDATING,v 1.250 2003/05/04 06:26:30 imp Exp $ ==== //depot/projects/ia64/crypto/telnet/libtelnet/auth.c#4 (text+ko) ==== @@ -30,16 +30,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/crypto/telnet/libtelnet/auth.c,v 1.9 2001/12/03 12:13:18 markm Exp $ */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/libtelnet/auth.c,v 1.9 2001/12/03 12:13:18 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)auth.c 8.3 (Berkeley) 5/30/95"; #endif /* not lint */ +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/libtelnet/auth.c,v 1.10 2003/05/04 02:54:48 obrien Exp $"); + /* * Copyright (C) 1990 by the Massachusetts Institute of Technology ==== //depot/projects/ia64/crypto/telnet/libtelnet/enc_des.c#4 (text+ko) ==== @@ -29,17 +29,15 @@ * 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: src/crypto/telnet/libtelnet/enc_des.c,v 1.9 2003/01/29 18:14:28 nectar Exp $ */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/libtelnet/enc_des.c,v 1.9 2003/01/29 18:14:28 nectar Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)enc_des.c 8.3 (Berkeley) 5/30/95"; #endif /* not lint */ +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/libtelnet/enc_des.c,v 1.10 2003/05/04 02:54:48 obrien Exp $"); #ifdef ENCRYPTION # ifdef AUTHENTICATION ==== //depot/projects/ia64/crypto/telnet/telnet/authenc.c#3 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/authenc.c,v 1.5 2001/11/30 21:06:35 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)authenc.c 8.1 (Berkeley) 6/6/93"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/authenc.c,v 1.6 2003/05/04 02:54:48 obrien Exp $"); #ifdef AUTHENTICATION #ifdef ENCRYPTION ==== //depot/projects/ia64/crypto/telnet/telnet/commands.c#8 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/commands.c,v 1.29 2002/11/27 06:34:24 eric Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)commands.c 8.4 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/commands.c,v 1.30 2003/05/04 02:54:48 obrien Exp $"); #include #include ==== //depot/projects/ia64/crypto/telnet/telnet/main.c#4 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/main.c,v 1.16 2002/09/25 07:26:24 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)main.c 8.3 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/main.c,v 1.17 2003/05/04 02:54:48 obrien Exp $"); #include #include ==== //depot/projects/ia64/crypto/telnet/telnet/network.c#4 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/network.c,v 1.6 2002/05/11 03:19:44 alfred Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)network.c 8.2 (Berkeley) 12/15/93"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/network.c,v 1.7 2003/05/04 02:54:48 obrien Exp $"); #include #include ==== //depot/projects/ia64/crypto/telnet/telnet/ring.c#3 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/ring.c,v 1.6 2001/11/30 21:06:36 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)ring.c 8.2 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/ring.c,v 1.7 2003/05/04 02:54:48 obrien Exp $"); /* * This defines a structure for a ring buffer. ==== //depot/projects/ia64/crypto/telnet/telnet/sys_bsd.c#6 (text+ko) ==== @@ -31,15 +31,13 @@ * SUCH DAMAGE. */ -#include -#include -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/sys_bsd.c,v 1.11 2002/09/25 07:24:01 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)sys_bsd.c 8.4 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/sys_bsd.c,v 1.12 2003/05/04 02:54:48 obrien Exp $"); /* * The following routines try to encapsulate what is system dependent @@ -49,9 +47,11 @@ #include #include #include +#include #include #include #include +#include #include #include ==== //depot/projects/ia64/crypto/telnet/telnet/telnet.c#4 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/telnet.c,v 1.12 2002/09/25 07:26:25 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)telnet.c 8.4 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/telnet.c,v 1.13 2003/05/04 02:54:48 obrien Exp $"); #include ==== //depot/projects/ia64/crypto/telnet/telnet/terminal.c#4 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/terminal.c,v 1.6 2002/05/11 03:19:44 alfred Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)terminal.c 8.2 (Berkeley) 2/16/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/terminal.c,v 1.7 2003/05/04 02:54:48 obrien Exp $"); #include #include ==== //depot/projects/ia64/crypto/telnet/telnet/utilities.c#4 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/utilities.c,v 1.7 2002/05/11 03:19:44 alfred Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)utilities.c 8.3 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/utilities.c,v 1.8 2003/05/04 02:54:48 obrien Exp $"); #define TELOPTS #define TELCMDS ==== //depot/projects/ia64/crypto/telnet/telnetd/authenc.c#3 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/authenc.c,v 1.7 2001/11/30 21:06:38 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)authenc.c 8.2 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/authenc.c,v 1.8 2003/05/04 02:54:49 obrien Exp $"); #ifdef AUTHENTICATION #ifdef ENCRYPTION ==== //depot/projects/ia64/crypto/telnet/telnetd/global.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint -#if 0 static const char sccsid[] = "@(#)global.c 8.1 (Berkeley) 6/4/93"; +#endif /* not lint */ #endif -static const char rcsid[] = - "$FreeBSD: src/crypto/telnet/telnetd/global.c,v 1.5 2000/07/16 05:52:45 peter Exp $"; -#endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/global.c,v 1.6 2003/05/04 02:54:49 obrien Exp $"); /* * Allocate global variables. We do this ==== //depot/projects/ia64/crypto/telnet/telnetd/slc.c#3 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/slc.c,v 1.8 2001/11/30 21:06:38 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)slc.c 8.2 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/slc.c,v 1.9 2003/05/04 02:54:49 obrien Exp $"); #include "telnetd.h" ==== //depot/projects/ia64/crypto/telnet/telnetd/state.c#4 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/state.c,v 1.13 2002/09/25 07:28:04 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)state.c 8.5 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/state.c,v 1.14 2003/05/04 02:54:49 obrien Exp $"); #include #include "telnetd.h" ==== //depot/projects/ia64/crypto/telnet/telnetd/sys_term.c#6 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/sys_term.c,v 1.17 2002/05/27 08:10:21 jmallett Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)sys_term.c 8.4+1 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/sys_term.c,v 1.18 2003/05/04 02:54:49 obrien Exp $"); #include #include ==== //depot/projects/ia64/crypto/telnet/telnetd/telnetd.c#3 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/telnetd.c,v 1.21 2001/11/30 22:28:07 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)telnetd.c 8.4 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/telnetd.c,v 1.22 2003/05/04 02:54:49 obrien Exp $"); #include "telnetd.h" #include "pathnames.h" ==== //depot/projects/ia64/crypto/telnet/telnetd/termstat.c#3 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/termstat.c,v 1.11 2001/11/30 21:06:38 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)termstat.c 8.2 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/termstat.c,v 1.12 2003/05/04 02:54:49 obrien Exp $"); #include "telnetd.h" ==== //depot/projects/ia64/crypto/telnet/telnetd/utility.c#3 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint -#if 0 static const char sccsid[] = "@(#)utility.c 8.4 (Berkeley) 5/30/95"; +#endif /* not lint */ #endif -static const char rcsid[] = - "$FreeBSD: src/crypto/telnet/telnetd/utility.c,v 1.12 2001/11/30 21:06:38 markm Exp $"; -#endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/utility.c,v 1.13 2003/05/04 02:54:49 obrien Exp $"); #ifdef __FreeBSD__ #include ==== //depot/projects/ia64/etc/rc.d/abi#2 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/abi,v 1.1 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/abi,v 1.2 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: abi # REQUIRE: LOGIN +# BEFORE: securelevel # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/ia64/etc/rc.d/cron#3 (text+ko) ==== @@ -1,11 +1,12 @@ #!/bin/sh # # $NetBSD: cron,v 1.5 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/cron,v 1.2 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/cron,v 1.3 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: cron # REQUIRE: LOGIN +# BEFORE: securelevel # KEYWORD: FreeBSD NetBSD shutdown . /etc/rc.subr ==== //depot/projects/ia64/etc/rc.d/devfs#4 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/devfs,v 1.3 2003/05/02 08:10:58 mtm Exp $ +# $FreeBSD: src/etc/rc.d/devfs,v 1.4 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: devfs # REQUIRE: LOGIN +# BEFORE: securelevel # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/ia64/etc/rc.d/jail#3 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.3 2003/04/19 07:50:32 mtm Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.4 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: jail # REQUIRE: LOGIN +# BEFORE: securelevel # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/ia64/etc/rc.d/localdaemons#2 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/localdaemons,v 1.1 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/localdaemons,v 1.2 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: localdaemons # REQUIRE: abi +# BEFORE: securelevel # KEYWORD: FreeBSD shutdown . /etc/rc.subr ==== //depot/projects/ia64/etc/rc.d/network3#4 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/network3,v 1.136 2002/10/12 10:31:31 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/network3,v 1.137 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: network3 # REQUIRE: localdaemons +# BEFORE: securelevel # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/ia64/etc/rc.d/securelevel#6 (text+ko) ==== @@ -1,12 +1,10 @@ #!/bin/sh # # $NetBSD: securelevel,v 1.4 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/securelevel,v 1.5 2003/04/24 08:27:29 mtm Exp $ +# $FreeBSD: src/etc/rc.d/securelevel,v 1.6 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: securelevel -# REQUIRE: aftermountlkm ipnat mountd -# BEFORE: DAEMON # KEYWORD: FreeBSD NetBSD . /etc/rc.subr ==== //depot/projects/ia64/etc/rc.d/serial#5 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/serial,v 1.18 2002/10/12 10:31:31 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/serial,v 1.20 2003/05/05 03:26:50 bde Exp $ # # PROVIDE: serial @@ -33,7 +33,7 @@ # Change some defaults for serial devices. # Standard defaults are: -# dtrwait 300 drainwait 0 +# dtrwait 300 drainwait `sysctl -n kern.drainwait` # initial cflag from = cread cs8 hupcl # initial iflag, lflag and oflag all 0 # speed 9600 @@ -47,10 +47,11 @@ ci=$1; shift # call in device identifier co=$1; shift # call out device identifier + drainwait=`sysctl -n kern.drainwait` for i in $* do - comcontrol /dev/tty${ci}${i} dtrwait 300 drainwait 300 + comcontrol /dev/tty${ci}${i} dtrwait 300 drainwait $drainwait stty < /dev/ttyi${ci}${i} -clocal crtscts hupcl 9600 reprint ^R stty < /dev/ttyl${ci}${i} -clocal -crtscts -hupcl 0 stty < /dev/cuai${co}${i} -clocal crtscts hupcl 9600 reprint ^R @@ -90,9 +91,9 @@ comcontrol /dev/tty${ci}${i} dtrwait 100 drainwait 180 # Lock crtscts on. # Speed reasonable for V42bis. - stty < /dev/ttyi${ci}${i} crtscts 57600 + stty < /dev/ttyi${ci}${i} crtscts 115200 stty < /dev/ttyl${ci}${i} crtscts - stty < /dev/cuai${co}${i} crtscts 57600 + stty < /dev/cuai${co}${i} crtscts 115200 stty < /dev/cual${co}${i} crtscts done } ==== //depot/projects/ia64/etc/rc.d/virecover#5 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: virecover,v 1.6 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/virecover,v 1.4 2003/02/21 09:37:20 dougb Exp $ +# $FreeBSD: src/etc/rc.d/virecover,v 1.5 2003/05/05 09:53:32 mtm Exp $ # # PROVIDE: virecover -# REQUIRE: mountcritremote +# REQUIRE: mountcritremote ldconfig # BEFORE: DAEMON # KEYWORD: FreeBSD NetBSD # ==== //depot/projects/ia64/games/caesar/caesar.c#3 (text+ko) ==== @@ -39,6 +39,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1989, 1993\n\ @@ -46,13 +47,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static const char sccsid[] = "@(#)caesar.c 8.1 (Berkeley) 5/31/93"; -#else -static const char rcsid[] = - "$FreeBSD: src/games/caesar/caesar.c,v 1.12 2002/02/18 05:15:15 imp Exp $"; +#endif /* not lint */ #endif -#endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/games/caesar/caesar.c,v 1.13 2003/05/05 09:52:25 obrien Exp $"); #include #include ==== //depot/projects/ia64/games/fortune/fortune/fortune.c#4 (text+ko) ==== @@ -34,6 +34,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1986, 1993\n\ @@ -41,12 +42,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static const char sccsid[] = "@(#)fortune.c 8.1 (Berkeley) 5/31/93"; +#endif /* not lint */ #endif -static const char rcsid[] = - "$FreeBSD: src/games/fortune/fortune/fortune.c,v 1.22 2002/03/24 01:09:35 imp Exp $"; -#endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/games/fortune/fortune/fortune.c,v 1.23 2003/05/05 09:52:25 obrien Exp $"); # include ==== //depot/projects/ia64/games/fortune/strfile/strfile.c#4 (text+ko) ==== @@ -34,6 +34,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1989, 1993\n\ @@ -41,13 +42,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static const char sccsid[] = "@(#)strfile.c 8.1 (Berkeley) 5/31/93"; -#else -static const char rcsid[] = - "$FreeBSD: src/games/fortune/strfile/strfile.c,v 1.21 2002/03/24 01:09:35 imp Exp $"; +#endif /* not lint */ #endif -#endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/games/fortune/strfile/strfile.c,v 1.22 2003/05/05 09:52:25 obrien Exp $"); # include # include ==== //depot/projects/ia64/games/fortune/unstr/unstr.c#4 (text+ko) ==== @@ -34,6 +34,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 5 12:19:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F49637B405; Mon, 5 May 2003 12:19:13 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ED6BB37B401 for ; Mon, 5 May 2003 12:19:12 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 58EA343F85 for ; Mon, 5 May 2003 12:19:11 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h45JJB0U097290 for ; Mon, 5 May 2003 12:19:11 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h45JJ7Al097265 for perforce@freebsd.org; Mon, 5 May 2003 12:19:07 -0700 (PDT) Date: Mon, 5 May 2003 12:19:07 -0700 (PDT) Message-Id: <200305051919.h45JJ7Al097265@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30612 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2003 19:19:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=30612 Change 30612 by marcel@marcel_pluto1 on 2003/05/05 12:18:54 IFia64 Affected files ... .. //depot/projects/ia64_epc/Makefile.inc1#13 integrate .. //depot/projects/ia64_epc/UPDATING#8 integrate .. //depot/projects/ia64_epc/crypto/telnet/libtelnet/auth.c#2 integrate .. //depot/projects/ia64_epc/crypto/telnet/libtelnet/enc_des.c#2 integrate .. //depot/projects/ia64_epc/crypto/telnet/telnet/authenc.c#2 integrate .. //depot/projects/ia64_epc/crypto/telnet/telnet/commands.c#2 integrate .. //depot/projects/ia64_epc/crypto/telnet/telnet/main.c#2 integrate .. //depot/projects/ia64_epc/crypto/telnet/telnet/network.c#2 integrate .. //depot/projects/ia64_epc/crypto/telnet/telnet/ring.c#2 integrate .. //depot/projects/ia64_epc/crypto/telnet/telnet/sys_bsd.c#2 integrate .. //depot/projects/ia64_epc/crypto/telnet/telnet/telnet.c#2 integrate .. //depot/projects/ia64_epc/crypto/telnet/telnet/terminal.c#2 integrate .. //depot/projects/ia64_epc/crypto/telnet/telnet/utilities.c#2 integrate .. //depot/projects/ia64_epc/crypto/telnet/telnetd/authenc.c#2 integrate .. //depot/projects/ia64_epc/crypto/telnet/telnetd/global.c#2 integrate .. //depot/projects/ia64_epc/crypto/telnet/telnetd/slc.c#2 integrate .. //depot/projects/ia64_epc/crypto/telnet/telnetd/state.c#2 integrate .. //depot/projects/ia64_epc/crypto/telnet/telnetd/sys_term.c#2 integrate .. //depot/projects/ia64_epc/crypto/telnet/telnetd/telnetd.c#2 integrate .. //depot/projects/ia64_epc/crypto/telnet/telnetd/termstat.c#2 integrate .. //depot/projects/ia64_epc/crypto/telnet/telnetd/utility.c#2 integrate .. //depot/projects/ia64_epc/etc/rc.d/abi#2 integrate .. //depot/projects/ia64_epc/etc/rc.d/cron#2 integrate .. //depot/projects/ia64_epc/etc/rc.d/devfs#3 integrate .. //depot/projects/ia64_epc/etc/rc.d/jail#3 integrate .. //depot/projects/ia64_epc/etc/rc.d/localdaemons#2 integrate .. //depot/projects/ia64_epc/etc/rc.d/network3#2 integrate .. //depot/projects/ia64_epc/etc/rc.d/securelevel#3 integrate .. //depot/projects/ia64_epc/etc/rc.d/serial#2 integrate .. //depot/projects/ia64_epc/etc/rc.d/virecover#3 integrate .. //depot/projects/ia64_epc/games/caesar/caesar.c#2 integrate .. //depot/projects/ia64_epc/games/fortune/fortune/fortune.c#2 integrate .. //depot/projects/ia64_epc/games/fortune/strfile/strfile.c#2 integrate .. //depot/projects/ia64_epc/games/fortune/unstr/unstr.c#2 integrate .. //depot/projects/ia64_epc/games/pom/pom.c#2 integrate .. //depot/projects/ia64_epc/games/random/random.c#3 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/cvs/cvs/Makefile#2 integrate .. //depot/projects/ia64_epc/include/Makefile#4 integrate .. //depot/projects/ia64_epc/include/rpcsvc/bootparam_prot.x#2 integrate .. //depot/projects/ia64_epc/include/rpcsvc/crypt.x#2 integrate .. //depot/projects/ia64_epc/include/rpcsvc/key_prot.x#2 integrate .. //depot/projects/ia64_epc/include/rpcsvc/klm_prot.x#2 integrate .. //depot/projects/ia64_epc/include/rpcsvc/mount.x#2 integrate .. //depot/projects/ia64_epc/include/rpcsvc/nfs_prot.x#2 integrate .. //depot/projects/ia64_epc/include/rpcsvc/nis.x#2 integrate .. //depot/projects/ia64_epc/include/rpcsvc/nis_cache.x#2 integrate .. //depot/projects/ia64_epc/include/rpcsvc/nis_callback.x#2 integrate .. //depot/projects/ia64_epc/include/rpcsvc/nlm_prot.x#2 integrate .. //depot/projects/ia64_epc/include/rpcsvc/pmap_prot.x#2 integrate .. //depot/projects/ia64_epc/include/rpcsvc/rex.x#2 integrate .. //depot/projects/ia64_epc/include/rpcsvc/rnusers.x#2 integrate .. //depot/projects/ia64_epc/include/rpcsvc/rquota.x#2 integrate .. //depot/projects/ia64_epc/include/rpcsvc/rstat.x#2 integrate .. //depot/projects/ia64_epc/include/rpcsvc/sm_inter.x#2 integrate .. //depot/projects/ia64_epc/include/rpcsvc/spray.x#2 integrate .. //depot/projects/ia64_epc/include/rpcsvc/yp.x#2 integrate .. //depot/projects/ia64_epc/include/rpcsvc/yppasswd.x#2 integrate .. //depot/projects/ia64_epc/include/rpcsvc/ypupdate_prot.x#2 integrate .. //depot/projects/ia64_epc/include/rpcsvc/ypxfrd.x#2 integrate .. //depot/projects/ia64_epc/kerberos5/Makefile#2 integrate .. //depot/projects/ia64_epc/lib/Makefile#7 integrate .. //depot/projects/ia64_epc/lib/csu/common/crtbrand.c#2 integrate .. //depot/projects/ia64_epc/lib/csu/i386-elf/Makefile#2 integrate .. //depot/projects/ia64_epc/lib/libc/net/getaddrinfo.c#6 integrate .. //depot/projects/ia64_epc/lib/libc/net/name6.c#4 integrate .. //depot/projects/ia64_epc/lib/libpam/modules/modules.inc#4 integrate .. //depot/projects/ia64_epc/lib/libpthread/sys/lock.c#2 integrate .. //depot/projects/ia64_epc/lib/libpthread/sys/lock.h#2 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_create.c#7 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_kern.c#9 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_private.h#9 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_resume_np.c#3 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_sig.c#6 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_suspend_np.c#4 integrate .. //depot/projects/ia64_epc/lib/libutil/login.conf.5#3 integrate .. //depot/projects/ia64_epc/libexec/Makefile#5 integrate .. //depot/projects/ia64_epc/libexec/rlogind/rlogind.c#2 integrate .. //depot/projects/ia64_epc/libexec/rtld-elf/malloc.c#3 integrate .. //depot/projects/ia64_epc/libexec/rtld-elf/map_object.c#3 integrate .. //depot/projects/ia64_epc/libexec/rtld-elf/rtld.c#5 integrate .. //depot/projects/ia64_epc/libexec/ypxfr/yp_dbwrite.c#2 integrate .. //depot/projects/ia64_epc/libexec/ypxfr/ypxfr_getmap.c#2 integrate .. //depot/projects/ia64_epc/libexec/ypxfr/ypxfr_main.c#2 integrate .. //depot/projects/ia64_epc/libexec/ypxfr/ypxfr_misc.c#2 integrate .. //depot/projects/ia64_epc/libexec/ypxfr/ypxfrd_getmap.c#2 integrate .. //depot/projects/ia64_epc/release/Makefile#11 integrate .. //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#4 integrate .. //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#11 integrate .. //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#19 integrate .. //depot/projects/ia64_epc/release/i386/dokern.sh#6 integrate .. //depot/projects/ia64_epc/sbin/atacontrol/atacontrol.c#5 integrate .. //depot/projects/ia64_epc/sbin/bsdlabel/bsdlabel.c#4 integrate .. //depot/projects/ia64_epc/sbin/routed/rtquery/rtquery.8#2 integrate .. //depot/projects/ia64_epc/sbin/vinum/commands.c#5 integrate .. //depot/projects/ia64_epc/sbin/vinum/list.c#5 integrate .. //depot/projects/ia64_epc/sbin/vinum/vinum.8#2 integrate .. //depot/projects/ia64_epc/secure/lib/Makefile#5 integrate .. //depot/projects/ia64_epc/secure/lib/libssh/Makefile#3 integrate .. //depot/projects/ia64_epc/secure/libexec/Makefile#4 integrate .. //depot/projects/ia64_epc/secure/usr.bin/Makefile#4 integrate .. //depot/projects/ia64_epc/secure/usr.bin/ssh/Makefile#4 integrate .. //depot/projects/ia64_epc/secure/usr.sbin/sshd/Makefile#4 integrate .. //depot/projects/ia64_epc/share/dict/web2#2 integrate .. //depot/projects/ia64_epc/share/examples/etc/make.conf#4 integrate .. //depot/projects/ia64_epc/share/man/man4/geom.4#3 integrate .. //depot/projects/ia64_epc/share/man/man5/make.conf.5#4 integrate .. //depot/projects/ia64_epc/share/man/man5/rc.conf.5#12 integrate .. //depot/projects/ia64_epc/share/man/man7/release.7#6 integrate .. //depot/projects/ia64_epc/share/mk/bsd.libnames.mk#4 integrate .. //depot/projects/ia64_epc/share/syscons/keymaps/INDEX.keymaps#2 integrate .. //depot/projects/ia64_epc/share/syscons/keymaps/Makefile#2 integrate .. //depot/projects/ia64_epc/share/syscons/keymaps/norwegian.dvorak.kbd#1 branch .. //depot/projects/ia64_epc/sys/alpha/include/_limits.h#4 integrate .. //depot/projects/ia64_epc/sys/amd64/include/_limits.h#2 integrate .. //depot/projects/ia64_epc/sys/arm/include/_limits.h#3 integrate .. //depot/projects/ia64_epc/sys/boot/common/help.common#3 integrate .. //depot/projects/ia64_epc/sys/boot/common/loader.8#3 integrate .. //depot/projects/ia64_epc/sys/compat/linux/linux_ipc.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/aic7xxx/ahc_eisa.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/aic7xxx/ahc_pci.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/aic7xxx/aic7770.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/aic7xxx/aic79xx.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/aic7xxx/aic79xx.h#4 integrate .. //depot/projects/ia64_epc/sys/dev/aic7xxx/aic79xx.reg#4 integrate .. //depot/projects/ia64_epc/sys/dev/aic7xxx/aic79xx.seq#3 integrate .. //depot/projects/ia64_epc/sys/dev/aic7xxx/aic79xx_inline.h#4 integrate .. //depot/projects/ia64_epc/sys/dev/aic7xxx/aic79xx_osm.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/aic7xxx/aic79xx_pci.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/aic7xxx/aic7xxx.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/aic7xxx/aic7xxx.h#2 integrate .. //depot/projects/ia64_epc/sys/dev/aic7xxx/aic7xxx.reg#2 integrate .. //depot/projects/ia64_epc/sys/dev/aic7xxx/aic7xxx_inline.h#2 integrate .. //depot/projects/ia64_epc/sys/dev/aic7xxx/aic7xxx_osm.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate .. //depot/projects/ia64_epc/sys/dev/ata/ata-all.c#10 integrate .. //depot/projects/ia64_epc/sys/dev/ata/ata-all.h#5 integrate .. //depot/projects/ia64_epc/sys/dev/ata/ata-pci.c#6 integrate .. //depot/projects/ia64_epc/sys/dev/ata/ata-raid.c#8 integrate .. //depot/projects/ia64_epc/sys/dev/ata/ata-raid.h#5 integrate .. //depot/projects/ia64_epc/sys/dev/ata/atapi-tape.c#7 integrate .. //depot/projects/ia64_epc/sys/dev/bge/if_bge.c#9 integrate .. //depot/projects/ia64_epc/sys/dev/en/midway.c#7 integrate .. //depot/projects/ia64_epc/sys/dev/en/midwayvar.h#3 integrate .. //depot/projects/ia64_epc/sys/dev/firewire/firewire.c#10 integrate .. //depot/projects/ia64_epc/sys/dev/firewire/sbp.c#15 integrate .. //depot/projects/ia64_epc/sys/dev/mii/brgphy.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/pccbb/pccbb.c#6 integrate .. //depot/projects/ia64_epc/sys/dev/pccbb/pccbbdevid.h#3 integrate .. //depot/projects/ia64_epc/sys/dev/sio/sio.c#8 integrate .. //depot/projects/ia64_epc/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/ia64_epc/sys/dev/usb/usbdevs.h#9 integrate .. //depot/projects/ia64_epc/sys/dev/usb/usbdevs_data.h#9 integrate .. //depot/projects/ia64_epc/sys/dev/vinum/vinum.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/vinum/vinumconfig.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/vinum/vinumext.h#5 integrate .. //depot/projects/ia64_epc/sys/dev/vinum/vinumio.c#5 integrate .. //depot/projects/ia64_epc/sys/dev/vinum/vinumio.h#2 integrate .. //depot/projects/ia64_epc/sys/dev/vinum/vinumioctl.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/vinum/vinumkw.h#3 integrate .. //depot/projects/ia64_epc/sys/dev/vinum/vinumlock.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/vinum/vinumobj.h#2 integrate .. //depot/projects/ia64_epc/sys/dev/vinum/vinumparser.c#3 integrate .. //depot/projects/ia64_epc/sys/dev/vinum/vinumrequest.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/vinum/vinumrevive.c#3 integrate .. //depot/projects/ia64_epc/sys/fs/procfs/procfs_dbregs.c#2 integrate .. //depot/projects/ia64_epc/sys/fs/procfs/procfs_fpregs.c#2 integrate .. //depot/projects/ia64_epc/sys/fs/procfs/procfs_regs.c#2 integrate .. //depot/projects/ia64_epc/sys/fs/udf/udf.h#2 integrate .. //depot/projects/ia64_epc/sys/fs/udf/udf_vfsops.c#4 integrate .. //depot/projects/ia64_epc/sys/fs/udf/udf_vnops.c#5 integrate .. //depot/projects/ia64_epc/sys/geom/bde/g_bde.c#6 integrate .. //depot/projects/ia64_epc/sys/geom/bde/g_bde_work.c#7 integrate .. //depot/projects/ia64_epc/sys/geom/geom.h#10 integrate .. //depot/projects/ia64_epc/sys/geom/geom_aes.c#6 integrate .. //depot/projects/ia64_epc/sys/geom/geom_bsd.c#9 integrate .. //depot/projects/ia64_epc/sys/geom/geom_bsd_enc.c#3 integrate .. //depot/projects/ia64_epc/sys/geom/geom_ctl.c#7 integrate .. //depot/projects/ia64_epc/sys/i386/include/_limits.h#3 integrate .. //depot/projects/ia64_epc/sys/ia64/include/_limits.h#3 integrate .. //depot/projects/ia64_epc/sys/kern/kern_malloc.c#6 integrate .. //depot/projects/ia64_epc/sys/kern/md5c.c#2 integrate .. //depot/projects/ia64_epc/sys/kern/sysv_shm.c#4 integrate .. //depot/projects/ia64_epc/sys/net/if_atm.h#4 integrate .. //depot/projects/ia64_epc/sys/net/if_atmsubr.c#6 integrate .. //depot/projects/ia64_epc/sys/net/if_ethersubr.c#8 integrate .. //depot/projects/ia64_epc/sys/pci/if_en_pci.c#5 integrate .. //depot/projects/ia64_epc/sys/powerpc/include/_limits.h#3 integrate .. //depot/projects/ia64_epc/sys/powerpc/powerpc/ofwmagic.S#2 integrate .. //depot/projects/ia64_epc/sys/sparc64/include/_limits.h#3 integrate .. //depot/projects/ia64_epc/sys/sparc64/sparc64/trap.c#8 integrate .. //depot/projects/ia64_epc/sys/sys/limits.h#3 integrate .. //depot/projects/ia64_epc/sys/sys/soundcard.h#3 integrate .. //depot/projects/ia64_epc/sys/sys/syscallsubr.h#3 integrate .. //depot/projects/ia64_epc/sys/vm/vm_object.c#15 integrate .. //depot/projects/ia64_epc/sys/vm/vm_pageout.c#9 integrate .. //depot/projects/ia64_epc/tools/tools/tinderbox/tbmaster.pl#5 integrate .. //depot/projects/ia64_epc/usr.bin/Makefile#7 integrate .. //depot/projects/ia64_epc/usr.bin/xlint/xlint/xlint.c#3 integrate .. //depot/projects/ia64_epc/usr.sbin/burncd/burncd.8#3 integrate .. //depot/projects/ia64_epc/usr.sbin/burncd/burncd.c#2 integrate .. //depot/projects/ia64_epc/usr.sbin/sysinstall/menus.c#4 integrate .. //depot/projects/ia64_epc/usr.sbin/syslogd/syslogd.c#4 integrate .. //depot/projects/ia64_epc/usr.sbin/usbd/usbd.8#2 integrate Differences ... ==== //depot/projects/ia64_epc/Makefile.inc1#13 (text+ko) ==== @@ -1,8 +1,8 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.353 2003/05/01 20:41:03 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.356 2003/05/05 12:54:26 bde Exp $ # # Make command line options: -# -DMAKE_KERBEROS5 to build Kerberos5 +# -DNO_KERBEROS Do not build Heimdal (Kerberos 5) # -DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir # -DNOCLEAN do not clean at all # -DNOCRYPT will prevent building of crypt versions @@ -61,7 +61,7 @@ SUBDIR+= gnu .endif .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ - !defined(NOCRYPT) && !defined(NO_OPENSSL) && defined(MAKE_KERBEROS5) + !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_KERBEROS) SUBDIR+= kerberos5 .endif .if exists(${.CURDIR}/libexec) @@ -119,7 +119,9 @@ .endif MAKEOBJDIRPREFIX?= /usr/obj +.if !defined(OSRELDATE) OSRELDATE!= sysctl -n kern.osreldate +.endif TARGET_ARCH?= ${MACHINE_ARCH} .if ${TARGET_ARCH} == ${MACHINE_ARCH} TARGET?= ${MACHINE} @@ -277,14 +279,10 @@ mkdir -p ${WORLDTMP}/legacy/${_dir} .endfor .for _dir in \ - usr/bin usr/lib/compat/aout usr/libdata/ldscripts usr/libexec usr/share/misc + usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \ + usr/libexec usr/share/misc mkdir -p ${WORLDTMP}/${_dir} .endfor -.for _dir in \ - arpa dev fs g++/backward g++/bits g++/ext isc isofs libmilter \ - objc openssl protocols readline rpc rpcsvc security ufs - mkdir -p ${WORLDTMP}/usr/include/${_dir} -.endfor ln -sf ${.CURDIR}/sys ${WORLDTMP} _legacy: @echo @@ -695,7 +693,7 @@ .endif .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ - !defined(NOCRYPT) && defined(MAKE_KERBEROS5) + !defined(NOCRYPT) && !defined(NO_KERBEROS) _libkrb5= kerberos5/lib/libroken kerberos5/lib/libvers \ kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl .endif @@ -782,7 +780,7 @@ _generic_libs= gnu/lib -.if !defined(NOCRYPT) && defined(MAKE_KERBEROS5) +.if !defined(NOCRYPT) && !defined(NO_KERBEROS) _prebuild_libs+= kerberos5/lib/libasn1 _prebuild_libs+= kerberos5/lib/libgssapi _prebuild_libs+= kerberos5/lib/libkrb5 ==== //depot/projects/ia64_epc/UPDATING#8 (text+ko) ==== @@ -17,6 +17,12 @@ developers choose to disable these features on build machines to maximize performance. +20030502: + groff has been updated. If you try to do a buildworld and + get an infinite loop in troff, update to May 4th or newer. If you + have a newer kernel than userland, you may need to set the OSRELDATE + to 500110 in your environment before starting a buildworld. + 20030501: The old rc system has been removed. Please report any problems to freebsd-rc@yahoogroups.com, and/or freebsd-current@freebsd.org. @@ -25,7 +31,6 @@ especially when using mergemaster, since the compatibility code that utilizes these old scripts has also been removed. - 20030423: A bug has been fixed in /dev/devctl which would cause devd to hang on boot, were it not for a workaround in devd. The @@ -1268,4 +1273,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.249 2003/05/02 05:27:33 dougb Exp $ +$FreeBSD: src/UPDATING,v 1.250 2003/05/04 06:26:30 imp Exp $ ==== //depot/projects/ia64_epc/crypto/telnet/libtelnet/auth.c#2 (text+ko) ==== @@ -30,16 +30,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/crypto/telnet/libtelnet/auth.c,v 1.9 2001/12/03 12:13:18 markm Exp $ */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/libtelnet/auth.c,v 1.9 2001/12/03 12:13:18 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)auth.c 8.3 (Berkeley) 5/30/95"; #endif /* not lint */ +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/libtelnet/auth.c,v 1.10 2003/05/04 02:54:48 obrien Exp $"); + /* * Copyright (C) 1990 by the Massachusetts Institute of Technology ==== //depot/projects/ia64_epc/crypto/telnet/libtelnet/enc_des.c#2 (text+ko) ==== @@ -29,17 +29,15 @@ * 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: src/crypto/telnet/libtelnet/enc_des.c,v 1.9 2003/01/29 18:14:28 nectar Exp $ */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/libtelnet/enc_des.c,v 1.9 2003/01/29 18:14:28 nectar Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)enc_des.c 8.3 (Berkeley) 5/30/95"; #endif /* not lint */ +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/libtelnet/enc_des.c,v 1.10 2003/05/04 02:54:48 obrien Exp $"); #ifdef ENCRYPTION # ifdef AUTHENTICATION ==== //depot/projects/ia64_epc/crypto/telnet/telnet/authenc.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/authenc.c,v 1.5 2001/11/30 21:06:35 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)authenc.c 8.1 (Berkeley) 6/6/93"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/authenc.c,v 1.6 2003/05/04 02:54:48 obrien Exp $"); #ifdef AUTHENTICATION #ifdef ENCRYPTION ==== //depot/projects/ia64_epc/crypto/telnet/telnet/commands.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/commands.c,v 1.29 2002/11/27 06:34:24 eric Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)commands.c 8.4 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/commands.c,v 1.30 2003/05/04 02:54:48 obrien Exp $"); #include #include ==== //depot/projects/ia64_epc/crypto/telnet/telnet/main.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/main.c,v 1.16 2002/09/25 07:26:24 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)main.c 8.3 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/main.c,v 1.17 2003/05/04 02:54:48 obrien Exp $"); #include #include ==== //depot/projects/ia64_epc/crypto/telnet/telnet/network.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/network.c,v 1.6 2002/05/11 03:19:44 alfred Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)network.c 8.2 (Berkeley) 12/15/93"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/network.c,v 1.7 2003/05/04 02:54:48 obrien Exp $"); #include #include ==== //depot/projects/ia64_epc/crypto/telnet/telnet/ring.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/ring.c,v 1.6 2001/11/30 21:06:36 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)ring.c 8.2 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/ring.c,v 1.7 2003/05/04 02:54:48 obrien Exp $"); /* * This defines a structure for a ring buffer. ==== //depot/projects/ia64_epc/crypto/telnet/telnet/sys_bsd.c#2 (text+ko) ==== @@ -31,15 +31,13 @@ * SUCH DAMAGE. */ -#include -#include -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/sys_bsd.c,v 1.11 2002/09/25 07:24:01 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)sys_bsd.c 8.4 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/sys_bsd.c,v 1.12 2003/05/04 02:54:48 obrien Exp $"); /* * The following routines try to encapsulate what is system dependent @@ -49,9 +47,11 @@ #include #include #include +#include #include #include #include +#include #include #include ==== //depot/projects/ia64_epc/crypto/telnet/telnet/telnet.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/telnet.c,v 1.12 2002/09/25 07:26:25 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)telnet.c 8.4 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/telnet.c,v 1.13 2003/05/04 02:54:48 obrien Exp $"); #include ==== //depot/projects/ia64_epc/crypto/telnet/telnet/terminal.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/terminal.c,v 1.6 2002/05/11 03:19:44 alfred Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)terminal.c 8.2 (Berkeley) 2/16/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/terminal.c,v 1.7 2003/05/04 02:54:48 obrien Exp $"); #include #include ==== //depot/projects/ia64_epc/crypto/telnet/telnet/utilities.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/utilities.c,v 1.7 2002/05/11 03:19:44 alfred Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)utilities.c 8.3 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/utilities.c,v 1.8 2003/05/04 02:54:48 obrien Exp $"); #define TELOPTS #define TELCMDS ==== //depot/projects/ia64_epc/crypto/telnet/telnetd/authenc.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/authenc.c,v 1.7 2001/11/30 21:06:38 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)authenc.c 8.2 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/authenc.c,v 1.8 2003/05/04 02:54:49 obrien Exp $"); #ifdef AUTHENTICATION #ifdef ENCRYPTION ==== //depot/projects/ia64_epc/crypto/telnet/telnetd/global.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint -#if 0 static const char sccsid[] = "@(#)global.c 8.1 (Berkeley) 6/4/93"; +#endif /* not lint */ #endif -static const char rcsid[] = - "$FreeBSD: src/crypto/telnet/telnetd/global.c,v 1.5 2000/07/16 05:52:45 peter Exp $"; -#endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/global.c,v 1.6 2003/05/04 02:54:49 obrien Exp $"); /* * Allocate global variables. We do this ==== //depot/projects/ia64_epc/crypto/telnet/telnetd/slc.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/slc.c,v 1.8 2001/11/30 21:06:38 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)slc.c 8.2 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/slc.c,v 1.9 2003/05/04 02:54:49 obrien Exp $"); #include "telnetd.h" ==== //depot/projects/ia64_epc/crypto/telnet/telnetd/state.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/state.c,v 1.13 2002/09/25 07:28:04 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)state.c 8.5 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/state.c,v 1.14 2003/05/04 02:54:49 obrien Exp $"); #include #include "telnetd.h" ==== //depot/projects/ia64_epc/crypto/telnet/telnetd/sys_term.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/sys_term.c,v 1.17 2002/05/27 08:10:21 jmallett Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)sys_term.c 8.4+1 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/sys_term.c,v 1.18 2003/05/04 02:54:49 obrien Exp $"); #include #include ==== //depot/projects/ia64_epc/crypto/telnet/telnetd/telnetd.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/telnetd.c,v 1.21 2001/11/30 22:28:07 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)telnetd.c 8.4 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/telnetd.c,v 1.22 2003/05/04 02:54:49 obrien Exp $"); #include "telnetd.h" #include "pathnames.h" ==== //depot/projects/ia64_epc/crypto/telnet/telnetd/termstat.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/termstat.c,v 1.11 2001/11/30 21:06:38 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)termstat.c 8.2 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/termstat.c,v 1.12 2003/05/04 02:54:49 obrien Exp $"); #include "telnetd.h" ==== //depot/projects/ia64_epc/crypto/telnet/telnetd/utility.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint -#if 0 static const char sccsid[] = "@(#)utility.c 8.4 (Berkeley) 5/30/95"; +#endif /* not lint */ #endif -static const char rcsid[] = - "$FreeBSD: src/crypto/telnet/telnetd/utility.c,v 1.12 2001/11/30 21:06:38 markm Exp $"; -#endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/utility.c,v 1.13 2003/05/04 02:54:49 obrien Exp $"); #ifdef __FreeBSD__ #include ==== //depot/projects/ia64_epc/etc/rc.d/abi#2 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/abi,v 1.1 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/abi,v 1.2 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: abi # REQUIRE: LOGIN +# BEFORE: securelevel # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/ia64_epc/etc/rc.d/cron#2 (text+ko) ==== @@ -1,11 +1,12 @@ #!/bin/sh # # $NetBSD: cron,v 1.5 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/cron,v 1.2 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/cron,v 1.3 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: cron # REQUIRE: LOGIN +# BEFORE: securelevel # KEYWORD: FreeBSD NetBSD shutdown . /etc/rc.subr ==== //depot/projects/ia64_epc/etc/rc.d/devfs#3 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/devfs,v 1.3 2003/05/02 08:10:58 mtm Exp $ +# $FreeBSD: src/etc/rc.d/devfs,v 1.4 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: devfs # REQUIRE: LOGIN +# BEFORE: securelevel # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/ia64_epc/etc/rc.d/jail#3 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.3 2003/04/19 07:50:32 mtm Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.4 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: jail # REQUIRE: LOGIN +# BEFORE: securelevel # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/ia64_epc/etc/rc.d/localdaemons#2 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/localdaemons,v 1.1 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/localdaemons,v 1.2 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: localdaemons # REQUIRE: abi +# BEFORE: securelevel # KEYWORD: FreeBSD shutdown . /etc/rc.subr ==== //depot/projects/ia64_epc/etc/rc.d/network3#2 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/network3,v 1.136 2002/10/12 10:31:31 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/network3,v 1.137 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: network3 # REQUIRE: localdaemons +# BEFORE: securelevel # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/ia64_epc/etc/rc.d/securelevel#3 (text+ko) ==== @@ -1,12 +1,10 @@ #!/bin/sh # # $NetBSD: securelevel,v 1.4 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/securelevel,v 1.5 2003/04/24 08:27:29 mtm Exp $ +# $FreeBSD: src/etc/rc.d/securelevel,v 1.6 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: securelevel -# REQUIRE: aftermountlkm ipnat mountd -# BEFORE: DAEMON # KEYWORD: FreeBSD NetBSD . /etc/rc.subr ==== //depot/projects/ia64_epc/etc/rc.d/serial#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/serial,v 1.18 2002/10/12 10:31:31 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/serial,v 1.20 2003/05/05 03:26:50 bde Exp $ # # PROVIDE: serial @@ -33,7 +33,7 @@ # Change some defaults for serial devices. # Standard defaults are: -# dtrwait 300 drainwait 0 +# dtrwait 300 drainwait `sysctl -n kern.drainwait` # initial cflag from = cread cs8 hupcl # initial iflag, lflag and oflag all 0 # speed 9600 @@ -47,10 +47,11 @@ ci=$1; shift # call in device identifier co=$1; shift # call out device identifier + drainwait=`sysctl -n kern.drainwait` for i in $* do - comcontrol /dev/tty${ci}${i} dtrwait 300 drainwait 300 + comcontrol /dev/tty${ci}${i} dtrwait 300 drainwait $drainwait stty < /dev/ttyi${ci}${i} -clocal crtscts hupcl 9600 reprint ^R stty < /dev/ttyl${ci}${i} -clocal -crtscts -hupcl 0 stty < /dev/cuai${co}${i} -clocal crtscts hupcl 9600 reprint ^R @@ -90,9 +91,9 @@ comcontrol /dev/tty${ci}${i} dtrwait 100 drainwait 180 # Lock crtscts on. # Speed reasonable for V42bis. - stty < /dev/ttyi${ci}${i} crtscts 57600 + stty < /dev/ttyi${ci}${i} crtscts 115200 stty < /dev/ttyl${ci}${i} crtscts - stty < /dev/cuai${co}${i} crtscts 57600 + stty < /dev/cuai${co}${i} crtscts 115200 stty < /dev/cual${co}${i} crtscts done } ==== //depot/projects/ia64_epc/etc/rc.d/virecover#3 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: virecover,v 1.6 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/virecover,v 1.4 2003/02/21 09:37:20 dougb Exp $ +# $FreeBSD: src/etc/rc.d/virecover,v 1.5 2003/05/05 09:53:32 mtm Exp $ # # PROVIDE: virecover -# REQUIRE: mountcritremote +# REQUIRE: mountcritremote ldconfig # BEFORE: DAEMON # KEYWORD: FreeBSD NetBSD # ==== //depot/projects/ia64_epc/games/caesar/caesar.c#2 (text+ko) ==== @@ -39,6 +39,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1989, 1993\n\ @@ -46,13 +47,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static const char sccsid[] = "@(#)caesar.c 8.1 (Berkeley) 5/31/93"; -#else -static const char rcsid[] = - "$FreeBSD: src/games/caesar/caesar.c,v 1.12 2002/02/18 05:15:15 imp Exp $"; +#endif /* not lint */ #endif -#endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/games/caesar/caesar.c,v 1.13 2003/05/05 09:52:25 obrien Exp $"); #include #include ==== //depot/projects/ia64_epc/games/fortune/fortune/fortune.c#2 (text+ko) ==== @@ -34,6 +34,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1986, 1993\n\ @@ -41,12 +42,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static const char sccsid[] = "@(#)fortune.c 8.1 (Berkeley) 5/31/93"; +#endif /* not lint */ #endif -static const char rcsid[] = - "$FreeBSD: src/games/fortune/fortune/fortune.c,v 1.22 2002/03/24 01:09:35 imp Exp $"; -#endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/games/fortune/fortune/fortune.c,v 1.23 2003/05/05 09:52:25 obrien Exp $"); # include ==== //depot/projects/ia64_epc/games/fortune/strfile/strfile.c#2 (text+ko) ==== @@ -34,6 +34,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1989, 1993\n\ @@ -41,13 +42,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static const char sccsid[] = "@(#)strfile.c 8.1 (Berkeley) 5/31/93"; -#else -static const char rcsid[] = - "$FreeBSD: src/games/fortune/strfile/strfile.c,v 1.21 2002/03/24 01:09:35 imp Exp $"; +#endif /* not lint */ #endif -#endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/games/fortune/strfile/strfile.c,v 1.22 2003/05/05 09:52:25 obrien Exp $"); # include # include ==== //depot/projects/ia64_epc/games/fortune/unstr/unstr.c#2 (text+ko) ==== @@ -34,6 +34,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 5 12:56:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C151437B404; Mon, 5 May 2003 12:56:58 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5D53737B401 for ; Mon, 5 May 2003 12:56:58 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0998F43F85 for ; Mon, 5 May 2003 12:56:58 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h45Juv0U005615 for ; Mon, 5 May 2003 12:56:57 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h45JuvUT005612 for perforce@freebsd.org; Mon, 5 May 2003 12:56:57 -0700 (PDT) Date: Mon, 5 May 2003 12:56:57 -0700 (PDT) Message-Id: <200305051956.h45JuvUT005612@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30614 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2003 19:56:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=30614 Change 30614 by peter@peter_daintree on 2003/05/05 12:56:39 Grrr. I wonder how many times I'll add this to local trees... Affected files ... .. //depot/projects/hammer/Makefile#8 edit Differences ... ==== //depot/projects/hammer/Makefile#8 (text+ko) ==== @@ -62,7 +62,9 @@ cleandepend cleandir depend distribute distributeworld everything \ hierarchy install installcheck installkernel \ reinstallkernel installmost installworld libraries lint maninstall \ - mk most obj objlink regress rerelease tags update + mk most obj objlink regress rerelease tags update \ + _legacy _bootstrap-tools _cleanobj _obj \ + _build-tools _cross-tools _includes _libraries _depend BITGTS= files includes BITGTS:=${BITGTS} ${BITGTS:S/^/build/} ${BITGTS:S/^/install/} From owner-p4-projects@FreeBSD.ORG Mon May 5 13:06:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4353137B404; Mon, 5 May 2003 13:06:13 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E915237B401 for ; Mon, 5 May 2003 13:06:12 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 49A4F43F85 for ; Mon, 5 May 2003 13:06:11 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h45K6B0U007179 for ; Mon, 5 May 2003 13:06:11 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h45K69xV007176 for perforce@freebsd.org; Mon, 5 May 2003 13:06:09 -0700 (PDT) Date: Mon, 5 May 2003 13:06:09 -0700 (PDT) Message-Id: <200305052006.h45K69xV007176@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30615 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2003 20:06:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=30615 Change 30615 by marcel@marcel_nfs on 2003/05/05 13:05:28 IFC @30610 Affected files ... .. //depot/projects/ia64_epc/sys/ia64/conf/SKI#6 edit .. //depot/projects/sio/Makefile.inc1#3 integrate .. //depot/projects/sio/UPDATING#3 integrate .. //depot/projects/sio/crypto/telnet/libtelnet/auth.c#2 integrate .. //depot/projects/sio/crypto/telnet/libtelnet/enc_des.c#2 integrate .. //depot/projects/sio/crypto/telnet/telnet/authenc.c#2 integrate .. //depot/projects/sio/crypto/telnet/telnet/commands.c#2 integrate .. //depot/projects/sio/crypto/telnet/telnet/main.c#2 integrate .. //depot/projects/sio/crypto/telnet/telnet/network.c#2 integrate .. //depot/projects/sio/crypto/telnet/telnet/ring.c#2 integrate .. //depot/projects/sio/crypto/telnet/telnet/sys_bsd.c#2 integrate .. //depot/projects/sio/crypto/telnet/telnet/telnet.c#2 integrate .. //depot/projects/sio/crypto/telnet/telnet/terminal.c#2 integrate .. //depot/projects/sio/crypto/telnet/telnet/utilities.c#2 integrate .. //depot/projects/sio/crypto/telnet/telnetd/authenc.c#2 integrate .. //depot/projects/sio/crypto/telnet/telnetd/global.c#2 integrate .. //depot/projects/sio/crypto/telnet/telnetd/slc.c#2 integrate .. //depot/projects/sio/crypto/telnet/telnetd/state.c#2 integrate .. //depot/projects/sio/crypto/telnet/telnetd/sys_term.c#2 integrate .. //depot/projects/sio/crypto/telnet/telnetd/telnetd.c#2 integrate .. //depot/projects/sio/crypto/telnet/telnetd/termstat.c#2 integrate .. //depot/projects/sio/crypto/telnet/telnetd/utility.c#2 integrate .. //depot/projects/sio/etc/rc.d/abi#2 integrate .. //depot/projects/sio/etc/rc.d/cron#2 integrate .. //depot/projects/sio/etc/rc.d/devfs#3 integrate .. //depot/projects/sio/etc/rc.d/jail#2 integrate .. //depot/projects/sio/etc/rc.d/localdaemons#2 integrate .. //depot/projects/sio/etc/rc.d/network3#2 integrate .. //depot/projects/sio/etc/rc.d/securelevel#2 integrate .. //depot/projects/sio/etc/rc.d/serial#2 integrate .. //depot/projects/sio/etc/rc.d/virecover#2 integrate .. //depot/projects/sio/games/caesar/caesar.c#2 integrate .. //depot/projects/sio/games/fortune/fortune/fortune.c#2 integrate .. //depot/projects/sio/games/fortune/strfile/strfile.c#2 integrate .. //depot/projects/sio/games/fortune/unstr/unstr.c#2 integrate .. //depot/projects/sio/games/pom/pom.c#2 integrate .. //depot/projects/sio/games/random/random.c#2 integrate .. //depot/projects/sio/gnu/usr.bin/cvs/cvs/Makefile#2 integrate .. //depot/projects/sio/include/Makefile#2 integrate .. //depot/projects/sio/include/rpcsvc/bootparam_prot.x#2 integrate .. //depot/projects/sio/include/rpcsvc/crypt.x#2 integrate .. //depot/projects/sio/include/rpcsvc/key_prot.x#2 integrate .. //depot/projects/sio/include/rpcsvc/klm_prot.x#2 integrate .. //depot/projects/sio/include/rpcsvc/mount.x#2 integrate .. //depot/projects/sio/include/rpcsvc/nfs_prot.x#2 integrate .. //depot/projects/sio/include/rpcsvc/nis.x#2 integrate .. //depot/projects/sio/include/rpcsvc/nis_cache.x#2 integrate .. //depot/projects/sio/include/rpcsvc/nis_callback.x#2 integrate .. //depot/projects/sio/include/rpcsvc/nlm_prot.x#2 integrate .. //depot/projects/sio/include/rpcsvc/pmap_prot.x#2 integrate .. //depot/projects/sio/include/rpcsvc/rex.x#2 integrate .. //depot/projects/sio/include/rpcsvc/rnusers.x#2 integrate .. //depot/projects/sio/include/rpcsvc/rquota.x#2 integrate .. //depot/projects/sio/include/rpcsvc/rstat.x#2 integrate .. //depot/projects/sio/include/rpcsvc/sm_inter.x#2 integrate .. //depot/projects/sio/include/rpcsvc/spray.x#2 integrate .. //depot/projects/sio/include/rpcsvc/yp.x#2 integrate .. //depot/projects/sio/include/rpcsvc/yppasswd.x#2 integrate .. //depot/projects/sio/include/rpcsvc/ypupdate_prot.x#2 integrate .. //depot/projects/sio/include/rpcsvc/ypxfrd.x#2 integrate .. //depot/projects/sio/kerberos5/Makefile#2 integrate .. //depot/projects/sio/lib/Makefile#3 integrate .. //depot/projects/sio/lib/csu/common/crtbrand.c#2 integrate .. //depot/projects/sio/lib/csu/i386-elf/Makefile#2 integrate .. //depot/projects/sio/lib/libc/net/getaddrinfo.c#3 integrate .. //depot/projects/sio/lib/libc/net/name6.c#2 integrate .. //depot/projects/sio/lib/libpam/modules/modules.inc#2 integrate .. //depot/projects/sio/lib/libpthread/sys/lock.c#2 integrate .. //depot/projects/sio/lib/libpthread/sys/lock.h#2 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_create.c#2 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_kern.c#2 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_private.h#2 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_resume_np.c#2 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_sig.c#2 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_suspend_np.c#2 integrate .. //depot/projects/sio/lib/libutil/login.conf.5#2 integrate .. //depot/projects/sio/libexec/Makefile#3 integrate .. //depot/projects/sio/libexec/rlogind/rlogind.c#2 integrate .. //depot/projects/sio/libexec/rtld-elf/malloc.c#2 integrate .. //depot/projects/sio/libexec/rtld-elf/map_object.c#2 integrate .. //depot/projects/sio/libexec/rtld-elf/rtld.c#2 integrate .. //depot/projects/sio/libexec/ypxfr/yp_dbwrite.c#2 integrate .. //depot/projects/sio/libexec/ypxfr/ypxfr_getmap.c#2 integrate .. //depot/projects/sio/libexec/ypxfr/ypxfr_main.c#2 integrate .. //depot/projects/sio/libexec/ypxfr/ypxfr_misc.c#2 integrate .. //depot/projects/sio/libexec/ypxfr/ypxfrd_getmap.c#2 integrate .. //depot/projects/sio/release/Makefile#2 integrate .. //depot/projects/sio/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#2 integrate .. //depot/projects/sio/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#3 integrate .. //depot/projects/sio/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#6 integrate .. //depot/projects/sio/release/i386/dokern.sh#3 integrate .. //depot/projects/sio/sbin/atacontrol/atacontrol.c#3 integrate .. //depot/projects/sio/sbin/bsdlabel/bsdlabel.c#4 integrate .. //depot/projects/sio/sbin/routed/rtquery/rtquery.8#2 integrate .. //depot/projects/sio/sbin/vinum/commands.c#3 integrate .. //depot/projects/sio/sbin/vinum/list.c#3 integrate .. //depot/projects/sio/sbin/vinum/vinum.8#2 integrate .. //depot/projects/sio/secure/lib/Makefile#2 integrate .. //depot/projects/sio/secure/lib/libssh/Makefile#2 integrate .. //depot/projects/sio/secure/libexec/Makefile#2 integrate .. //depot/projects/sio/secure/usr.bin/Makefile#2 integrate .. //depot/projects/sio/secure/usr.bin/ssh/Makefile#2 integrate .. //depot/projects/sio/secure/usr.sbin/sshd/Makefile#2 integrate .. //depot/projects/sio/share/dict/web2#2 integrate .. //depot/projects/sio/share/examples/etc/make.conf#2 integrate .. //depot/projects/sio/share/man/man4/geom.4#2 integrate .. //depot/projects/sio/share/man/man5/make.conf.5#2 integrate .. //depot/projects/sio/share/man/man5/rc.conf.5#3 integrate .. //depot/projects/sio/share/man/man7/release.7#2 integrate .. //depot/projects/sio/share/mk/bsd.libnames.mk#2 integrate .. //depot/projects/sio/share/syscons/keymaps/INDEX.keymaps#2 integrate .. //depot/projects/sio/share/syscons/keymaps/Makefile#2 integrate .. //depot/projects/sio/share/syscons/keymaps/norwegian.dvorak.kbd#1 branch .. //depot/projects/sio/sys/alpha/include/_limits.h#2 integrate .. //depot/projects/sio/sys/amd64/include/_limits.h#2 integrate .. //depot/projects/sio/sys/arm/include/_limits.h#2 integrate .. //depot/projects/sio/sys/boot/common/help.common#2 integrate .. //depot/projects/sio/sys/boot/common/loader.8#2 integrate .. //depot/projects/sio/sys/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/sio/sys/dev/aic7xxx/ahc_eisa.c#2 integrate .. //depot/projects/sio/sys/dev/aic7xxx/ahc_pci.c#2 integrate .. //depot/projects/sio/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic7770.c#2 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic79xx.c#2 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic79xx.h#2 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic79xx.reg#2 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic79xx.seq#2 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic79xx_inline.h#2 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic79xx_osm.c#2 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic7xxx.c#2 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic7xxx.h#2 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic7xxx.reg#2 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic7xxx_inline.h#2 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate .. //depot/projects/sio/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate .. //depot/projects/sio/sys/dev/ata/ata-all.c#4 integrate .. //depot/projects/sio/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/sio/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/sio/sys/dev/ata/ata-raid.c#3 integrate .. //depot/projects/sio/sys/dev/ata/ata-raid.h#3 integrate .. //depot/projects/sio/sys/dev/ata/atapi-tape.c#2 integrate .. //depot/projects/sio/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/sio/sys/dev/en/midway.c#2 integrate .. //depot/projects/sio/sys/dev/en/midwayvar.h#2 integrate .. //depot/projects/sio/sys/dev/firewire/firewire.c#2 integrate .. //depot/projects/sio/sys/dev/firewire/sbp.c#4 integrate .. //depot/projects/sio/sys/dev/mii/brgphy.c#4 integrate .. //depot/projects/sio/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/sio/sys/dev/pccbb/pccbbdevid.h#2 integrate .. //depot/projects/sio/sys/dev/sio/sio.c#7 integrate .. //depot/projects/sio/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/sio/sys/dev/usb/usbdevs.h#3 integrate .. //depot/projects/sio/sys/dev/usb/usbdevs_data.h#3 integrate .. //depot/projects/sio/sys/dev/vinum/vinum.c#2 integrate .. //depot/projects/sio/sys/dev/vinum/vinumconfig.c#2 integrate .. //depot/projects/sio/sys/dev/vinum/vinumext.h#2 integrate .. //depot/projects/sio/sys/dev/vinum/vinumio.c#3 integrate .. //depot/projects/sio/sys/dev/vinum/vinumio.h#2 integrate .. //depot/projects/sio/sys/dev/vinum/vinumioctl.c#2 integrate .. //depot/projects/sio/sys/dev/vinum/vinumkw.h#2 integrate .. //depot/projects/sio/sys/dev/vinum/vinumlock.c#2 integrate .. //depot/projects/sio/sys/dev/vinum/vinumobj.h#2 integrate .. //depot/projects/sio/sys/dev/vinum/vinumparser.c#2 integrate .. //depot/projects/sio/sys/dev/vinum/vinumrequest.c#2 integrate .. //depot/projects/sio/sys/dev/vinum/vinumrevive.c#2 integrate .. //depot/projects/sio/sys/fs/procfs/procfs_dbregs.c#2 integrate .. //depot/projects/sio/sys/fs/procfs/procfs_fpregs.c#2 integrate .. //depot/projects/sio/sys/fs/procfs/procfs_regs.c#2 integrate .. //depot/projects/sio/sys/fs/udf/udf.h#2 integrate .. //depot/projects/sio/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/sio/sys/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/sio/sys/geom/bde/g_bde.c#2 integrate .. //depot/projects/sio/sys/geom/bde/g_bde_work.c#2 integrate .. //depot/projects/sio/sys/geom/geom.h#4 integrate .. //depot/projects/sio/sys/geom/geom_aes.c#4 integrate .. //depot/projects/sio/sys/geom/geom_bsd.c#4 integrate .. //depot/projects/sio/sys/geom/geom_bsd_enc.c#4 integrate .. //depot/projects/sio/sys/geom/geom_ctl.c#3 integrate .. //depot/projects/sio/sys/i386/include/_limits.h#2 integrate .. //depot/projects/sio/sys/ia64/include/_limits.h#2 integrate .. //depot/projects/sio/sys/kern/kern_malloc.c#2 integrate .. //depot/projects/sio/sys/kern/md5c.c#2 integrate .. //depot/projects/sio/sys/kern/sysv_shm.c#2 integrate .. //depot/projects/sio/sys/net/if_atm.h#2 integrate .. //depot/projects/sio/sys/net/if_atmsubr.c#2 integrate .. //depot/projects/sio/sys/net/if_ethersubr.c#2 integrate .. //depot/projects/sio/sys/pci/if_en_pci.c#2 integrate .. //depot/projects/sio/sys/powerpc/include/_limits.h#2 integrate .. //depot/projects/sio/sys/powerpc/powerpc/ofwmagic.S#2 integrate .. //depot/projects/sio/sys/sparc64/include/_limits.h#2 integrate .. //depot/projects/sio/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/sio/sys/sys/limits.h#2 integrate .. //depot/projects/sio/sys/sys/soundcard.h#2 integrate .. //depot/projects/sio/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/sio/sys/vm/vm_object.c#5 integrate .. //depot/projects/sio/sys/vm/vm_pageout.c#2 integrate .. //depot/projects/sio/tools/tools/tinderbox/tbmaster.pl#3 integrate .. //depot/projects/sio/usr.bin/Makefile#3 integrate .. //depot/projects/sio/usr.bin/xlint/xlint/xlint.c#3 integrate .. //depot/projects/sio/usr.sbin/burncd/burncd.8#2 integrate .. //depot/projects/sio/usr.sbin/burncd/burncd.c#2 integrate .. //depot/projects/sio/usr.sbin/sysinstall/menus.c#2 integrate .. //depot/projects/sio/usr.sbin/syslogd/syslogd.c#2 integrate .. //depot/projects/sio/usr.sbin/usbd/usbd.8#2 integrate Differences ... ==== //depot/projects/ia64_epc/sys/ia64/conf/SKI#6 (text+ko) ==== @@ -49,7 +49,7 @@ options SCSI_DELAY=500 #Delay (in ms) before probing SCSI options SKI options SOFTUPDATES #Enable FFS soft updates support -options SSC_NSECT=16384 +options SSC_NSECT=786432 options SYSVMSG #SYSV-style message queues options SYSVSEM #SYSV-style semaphores options SYSVSHM #SYSV-style shared memory ==== //depot/projects/sio/Makefile.inc1#3 (text+ko) ==== @@ -1,8 +1,8 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.353 2003/05/01 20:41:03 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.356 2003/05/05 12:54:26 bde Exp $ # # Make command line options: -# -DMAKE_KERBEROS5 to build Kerberos5 +# -DNO_KERBEROS Do not build Heimdal (Kerberos 5) # -DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir # -DNOCLEAN do not clean at all # -DNOCRYPT will prevent building of crypt versions @@ -61,7 +61,7 @@ SUBDIR+= gnu .endif .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ - !defined(NOCRYPT) && !defined(NO_OPENSSL) && defined(MAKE_KERBEROS5) + !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_KERBEROS) SUBDIR+= kerberos5 .endif .if exists(${.CURDIR}/libexec) @@ -119,7 +119,9 @@ .endif MAKEOBJDIRPREFIX?= /usr/obj +.if !defined(OSRELDATE) OSRELDATE!= sysctl -n kern.osreldate +.endif TARGET_ARCH?= ${MACHINE_ARCH} .if ${TARGET_ARCH} == ${MACHINE_ARCH} TARGET?= ${MACHINE} @@ -277,14 +279,10 @@ mkdir -p ${WORLDTMP}/legacy/${_dir} .endfor .for _dir in \ - usr/bin usr/lib/compat/aout usr/libdata/ldscripts usr/libexec usr/share/misc + usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \ + usr/libexec usr/share/misc mkdir -p ${WORLDTMP}/${_dir} .endfor -.for _dir in \ - arpa dev fs g++/backward g++/bits g++/ext isc isofs libmilter \ - objc openssl protocols readline rpc rpcsvc security ufs - mkdir -p ${WORLDTMP}/usr/include/${_dir} -.endfor ln -sf ${.CURDIR}/sys ${WORLDTMP} _legacy: @echo @@ -695,7 +693,7 @@ .endif .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ - !defined(NOCRYPT) && defined(MAKE_KERBEROS5) + !defined(NOCRYPT) && !defined(NO_KERBEROS) _libkrb5= kerberos5/lib/libroken kerberos5/lib/libvers \ kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl .endif @@ -782,7 +780,7 @@ _generic_libs= gnu/lib -.if !defined(NOCRYPT) && defined(MAKE_KERBEROS5) +.if !defined(NOCRYPT) && !defined(NO_KERBEROS) _prebuild_libs+= kerberos5/lib/libasn1 _prebuild_libs+= kerberos5/lib/libgssapi _prebuild_libs+= kerberos5/lib/libkrb5 ==== //depot/projects/sio/UPDATING#3 (text+ko) ==== @@ -17,6 +17,12 @@ developers choose to disable these features on build machines to maximize performance. +20030502: + groff has been updated. If you try to do a buildworld and + get an infinite loop in troff, update to May 4th or newer. If you + have a newer kernel than userland, you may need to set the OSRELDATE + to 500110 in your environment before starting a buildworld. + 20030501: The old rc system has been removed. Please report any problems to freebsd-rc@yahoogroups.com, and/or freebsd-current@freebsd.org. @@ -25,7 +31,6 @@ especially when using mergemaster, since the compatibility code that utilizes these old scripts has also been removed. - 20030423: A bug has been fixed in /dev/devctl which would cause devd to hang on boot, were it not for a workaround in devd. The @@ -1268,4 +1273,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.249 2003/05/02 05:27:33 dougb Exp $ +$FreeBSD: src/UPDATING,v 1.250 2003/05/04 06:26:30 imp Exp $ ==== //depot/projects/sio/crypto/telnet/libtelnet/auth.c#2 (text+ko) ==== @@ -30,16 +30,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/crypto/telnet/libtelnet/auth.c,v 1.9 2001/12/03 12:13:18 markm Exp $ */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/libtelnet/auth.c,v 1.9 2001/12/03 12:13:18 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)auth.c 8.3 (Berkeley) 5/30/95"; #endif /* not lint */ +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/libtelnet/auth.c,v 1.10 2003/05/04 02:54:48 obrien Exp $"); + /* * Copyright (C) 1990 by the Massachusetts Institute of Technology ==== //depot/projects/sio/crypto/telnet/libtelnet/enc_des.c#2 (text+ko) ==== @@ -29,17 +29,15 @@ * 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: src/crypto/telnet/libtelnet/enc_des.c,v 1.9 2003/01/29 18:14:28 nectar Exp $ */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/libtelnet/enc_des.c,v 1.9 2003/01/29 18:14:28 nectar Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)enc_des.c 8.3 (Berkeley) 5/30/95"; #endif /* not lint */ +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/libtelnet/enc_des.c,v 1.10 2003/05/04 02:54:48 obrien Exp $"); #ifdef ENCRYPTION # ifdef AUTHENTICATION ==== //depot/projects/sio/crypto/telnet/telnet/authenc.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/authenc.c,v 1.5 2001/11/30 21:06:35 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)authenc.c 8.1 (Berkeley) 6/6/93"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/authenc.c,v 1.6 2003/05/04 02:54:48 obrien Exp $"); #ifdef AUTHENTICATION #ifdef ENCRYPTION ==== //depot/projects/sio/crypto/telnet/telnet/commands.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/commands.c,v 1.29 2002/11/27 06:34:24 eric Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)commands.c 8.4 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/commands.c,v 1.30 2003/05/04 02:54:48 obrien Exp $"); #include #include ==== //depot/projects/sio/crypto/telnet/telnet/main.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/main.c,v 1.16 2002/09/25 07:26:24 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)main.c 8.3 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/main.c,v 1.17 2003/05/04 02:54:48 obrien Exp $"); #include #include ==== //depot/projects/sio/crypto/telnet/telnet/network.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/network.c,v 1.6 2002/05/11 03:19:44 alfred Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)network.c 8.2 (Berkeley) 12/15/93"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/network.c,v 1.7 2003/05/04 02:54:48 obrien Exp $"); #include #include ==== //depot/projects/sio/crypto/telnet/telnet/ring.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/ring.c,v 1.6 2001/11/30 21:06:36 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)ring.c 8.2 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/ring.c,v 1.7 2003/05/04 02:54:48 obrien Exp $"); /* * This defines a structure for a ring buffer. ==== //depot/projects/sio/crypto/telnet/telnet/sys_bsd.c#2 (text+ko) ==== @@ -31,15 +31,13 @@ * SUCH DAMAGE. */ -#include -#include -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/sys_bsd.c,v 1.11 2002/09/25 07:24:01 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)sys_bsd.c 8.4 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/sys_bsd.c,v 1.12 2003/05/04 02:54:48 obrien Exp $"); /* * The following routines try to encapsulate what is system dependent @@ -49,9 +47,11 @@ #include #include #include +#include #include #include #include +#include #include #include ==== //depot/projects/sio/crypto/telnet/telnet/telnet.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/telnet.c,v 1.12 2002/09/25 07:26:25 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)telnet.c 8.4 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/telnet.c,v 1.13 2003/05/04 02:54:48 obrien Exp $"); #include ==== //depot/projects/sio/crypto/telnet/telnet/terminal.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/terminal.c,v 1.6 2002/05/11 03:19:44 alfred Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)terminal.c 8.2 (Berkeley) 2/16/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/terminal.c,v 1.7 2003/05/04 02:54:48 obrien Exp $"); #include #include ==== //depot/projects/sio/crypto/telnet/telnet/utilities.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/utilities.c,v 1.7 2002/05/11 03:19:44 alfred Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)utilities.c 8.3 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/utilities.c,v 1.8 2003/05/04 02:54:48 obrien Exp $"); #define TELOPTS #define TELCMDS ==== //depot/projects/sio/crypto/telnet/telnetd/authenc.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/authenc.c,v 1.7 2001/11/30 21:06:38 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)authenc.c 8.2 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/authenc.c,v 1.8 2003/05/04 02:54:49 obrien Exp $"); #ifdef AUTHENTICATION #ifdef ENCRYPTION ==== //depot/projects/sio/crypto/telnet/telnetd/global.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint -#if 0 static const char sccsid[] = "@(#)global.c 8.1 (Berkeley) 6/4/93"; +#endif /* not lint */ #endif -static const char rcsid[] = - "$FreeBSD: src/crypto/telnet/telnetd/global.c,v 1.5 2000/07/16 05:52:45 peter Exp $"; -#endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/global.c,v 1.6 2003/05/04 02:54:49 obrien Exp $"); /* * Allocate global variables. We do this ==== //depot/projects/sio/crypto/telnet/telnetd/slc.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/slc.c,v 1.8 2001/11/30 21:06:38 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)slc.c 8.2 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/slc.c,v 1.9 2003/05/04 02:54:49 obrien Exp $"); #include "telnetd.h" ==== //depot/projects/sio/crypto/telnet/telnetd/state.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/state.c,v 1.13 2002/09/25 07:28:04 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)state.c 8.5 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/state.c,v 1.14 2003/05/04 02:54:49 obrien Exp $"); #include #include "telnetd.h" ==== //depot/projects/sio/crypto/telnet/telnetd/sys_term.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/sys_term.c,v 1.17 2002/05/27 08:10:21 jmallett Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)sys_term.c 8.4+1 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/sys_term.c,v 1.18 2003/05/04 02:54:49 obrien Exp $"); #include #include ==== //depot/projects/sio/crypto/telnet/telnetd/telnetd.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/telnetd.c,v 1.21 2001/11/30 22:28:07 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)telnetd.c 8.4 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/telnetd.c,v 1.22 2003/05/04 02:54:49 obrien Exp $"); #include "telnetd.h" #include "pathnames.h" ==== //depot/projects/sio/crypto/telnet/telnetd/termstat.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/termstat.c,v 1.11 2001/11/30 21:06:38 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)termstat.c 8.2 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/termstat.c,v 1.12 2003/05/04 02:54:49 obrien Exp $"); #include "telnetd.h" ==== //depot/projects/sio/crypto/telnet/telnetd/utility.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint -#if 0 static const char sccsid[] = "@(#)utility.c 8.4 (Berkeley) 5/30/95"; +#endif /* not lint */ #endif -static const char rcsid[] = - "$FreeBSD: src/crypto/telnet/telnetd/utility.c,v 1.12 2001/11/30 21:06:38 markm Exp $"; -#endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/utility.c,v 1.13 2003/05/04 02:54:49 obrien Exp $"); #ifdef __FreeBSD__ #include ==== //depot/projects/sio/etc/rc.d/abi#2 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/abi,v 1.1 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/abi,v 1.2 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: abi # REQUIRE: LOGIN +# BEFORE: securelevel # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/sio/etc/rc.d/cron#2 (text+ko) ==== @@ -1,11 +1,12 @@ #!/bin/sh # # $NetBSD: cron,v 1.5 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/cron,v 1.2 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/cron,v 1.3 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: cron # REQUIRE: LOGIN +# BEFORE: securelevel # KEYWORD: FreeBSD NetBSD shutdown . /etc/rc.subr ==== //depot/projects/sio/etc/rc.d/devfs#3 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/devfs,v 1.3 2003/05/02 08:10:58 mtm Exp $ +# $FreeBSD: src/etc/rc.d/devfs,v 1.4 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: devfs # REQUIRE: LOGIN +# BEFORE: securelevel # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/sio/etc/rc.d/jail#2 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.3 2003/04/19 07:50:32 mtm Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.4 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: jail # REQUIRE: LOGIN +# BEFORE: securelevel # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/sio/etc/rc.d/localdaemons#2 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/localdaemons,v 1.1 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/localdaemons,v 1.2 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: localdaemons # REQUIRE: abi +# BEFORE: securelevel # KEYWORD: FreeBSD shutdown . /etc/rc.subr ==== //depot/projects/sio/etc/rc.d/network3#2 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/network3,v 1.136 2002/10/12 10:31:31 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/network3,v 1.137 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: network3 # REQUIRE: localdaemons +# BEFORE: securelevel # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/sio/etc/rc.d/securelevel#2 (text+ko) ==== @@ -1,12 +1,10 @@ #!/bin/sh # # $NetBSD: securelevel,v 1.4 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/securelevel,v 1.5 2003/04/24 08:27:29 mtm Exp $ +# $FreeBSD: src/etc/rc.d/securelevel,v 1.6 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: securelevel -# REQUIRE: aftermountlkm ipnat mountd -# BEFORE: DAEMON # KEYWORD: FreeBSD NetBSD . /etc/rc.subr ==== //depot/projects/sio/etc/rc.d/serial#2 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/serial,v 1.18 2002/10/12 10:31:31 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/serial,v 1.20 2003/05/05 03:26:50 bde Exp $ # # PROVIDE: serial @@ -33,7 +33,7 @@ # Change some defaults for serial devices. # Standard defaults are: -# dtrwait 300 drainwait 0 +# dtrwait 300 drainwait `sysctl -n kern.drainwait` # initial cflag from = cread cs8 hupcl # initial iflag, lflag and oflag all 0 # speed 9600 @@ -47,10 +47,11 @@ ci=$1; shift # call in device identifier co=$1; shift # call out device identifier + drainwait=`sysctl -n kern.drainwait` for i in $* do - comcontrol /dev/tty${ci}${i} dtrwait 300 drainwait 300 + comcontrol /dev/tty${ci}${i} dtrwait 300 drainwait $drainwait stty < /dev/ttyi${ci}${i} -clocal crtscts hupcl 9600 reprint ^R stty < /dev/ttyl${ci}${i} -clocal -crtscts -hupcl 0 stty < /dev/cuai${co}${i} -clocal crtscts hupcl 9600 reprint ^R @@ -90,9 +91,9 @@ comcontrol /dev/tty${ci}${i} dtrwait 100 drainwait 180 # Lock crtscts on. # Speed reasonable for V42bis. - stty < /dev/ttyi${ci}${i} crtscts 57600 + stty < /dev/ttyi${ci}${i} crtscts 115200 stty < /dev/ttyl${ci}${i} crtscts - stty < /dev/cuai${co}${i} crtscts 57600 + stty < /dev/cuai${co}${i} crtscts 115200 stty < /dev/cual${co}${i} crtscts done } ==== //depot/projects/sio/etc/rc.d/virecover#2 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: virecover,v 1.6 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/virecover,v 1.4 2003/02/21 09:37:20 dougb Exp $ +# $FreeBSD: src/etc/rc.d/virecover,v 1.5 2003/05/05 09:53:32 mtm Exp $ # # PROVIDE: virecover -# REQUIRE: mountcritremote +# REQUIRE: mountcritremote ldconfig # BEFORE: DAEMON # KEYWORD: FreeBSD NetBSD # ==== //depot/projects/sio/games/caesar/caesar.c#2 (text+ko) ==== @@ -39,6 +39,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1989, 1993\n\ @@ -46,13 +47,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static const char sccsid[] = "@(#)caesar.c 8.1 (Berkeley) 5/31/93"; -#else -static const char rcsid[] = - "$FreeBSD: src/games/caesar/caesar.c,v 1.12 2002/02/18 05:15:15 imp Exp $"; +#endif /* not lint */ #endif -#endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/games/caesar/caesar.c,v 1.13 2003/05/05 09:52:25 obrien Exp $"); #include #include ==== //depot/projects/sio/games/fortune/fortune/fortune.c#2 (text+ko) ==== @@ -34,6 +34,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1986, 1993\n\ @@ -41,12 +42,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static const char sccsid[] = "@(#)fortune.c 8.1 (Berkeley) 5/31/93"; +#endif /* not lint */ #endif -static const char rcsid[] = - "$FreeBSD: src/games/fortune/fortune/fortune.c,v 1.22 2002/03/24 01:09:35 imp Exp $"; -#endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/games/fortune/fortune/fortune.c,v 1.23 2003/05/05 09:52:25 obrien Exp $"); # include ==== //depot/projects/sio/games/fortune/strfile/strfile.c#2 (text+ko) ==== @@ -34,6 +34,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1989, 1993\n\ @@ -41,13 +42,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static const char sccsid[] = "@(#)strfile.c 8.1 (Berkeley) 5/31/93"; -#else -static const char rcsid[] = - "$FreeBSD: src/games/fortune/strfile/strfile.c,v 1.21 2002/03/24 01:09:35 imp Exp $"; +#endif /* not lint */ #endif -#endif /* not lint */ +#include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 5 13:15:27 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7CCCD37B404; Mon, 5 May 2003 13:15:26 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F176237B43B for ; Mon, 5 May 2003 13:15:23 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C76543F75 for ; Mon, 5 May 2003 13:15:23 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h45KFN0U007593 for ; Mon, 5 May 2003 13:15:23 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h45KFNHi007590 for perforce@freebsd.org; Mon, 5 May 2003 13:15:23 -0700 (PDT) Date: Mon, 5 May 2003 13:15:23 -0700 (PDT) Message-Id: <200305052015.h45KFNHi007590@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30617 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2003 20:15:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=30617 Change 30617 by peter@peter_daintree on 2003/05/05 13:14:59 hack. amd64-unknown-freebsd isn't a valid binutils/bfd target. Affected files ... .. //depot/projects/hammer/gnu/usr.bin/binutils/libbinutils/Makefile#3 edit Differences ... ==== //depot/projects/hammer/gnu/usr.bin/binutils/libbinutils/Makefile#3 (text+ko) ==== @@ -9,7 +9,12 @@ ieee.c rdcoff.c rddbg.c rename.c stabs.c unwind-ia64.c \ wrstabs.c version.c binemul.c budemang.c emul_vanilla.c WARNS= 0 -CFLAGS+= -DTARGET=\"${TARGET_ARCH}-unknown-freebsd\" +.if ${TARGET_ARCH} == "amd64" +BINUTILS_ARCH=x86_64 +.else +BINUTILS_ARCH=${TARGET_ARCH} +.endif +CFLAGS+= -DTARGET=\"${BINUTILS_ARCH}-unknown-freebsd\" CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\" CFLAGS+= -I${SRCDIR}/binutils CFLAGS+= -I${SRCDIR}/bfd From owner-p4-projects@FreeBSD.ORG Mon May 5 13:22:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D873637B401; Mon, 5 May 2003 13:22:34 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5BE4837B405 for ; Mon, 5 May 2003 13:22:34 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B18C543F93 for ; Mon, 5 May 2003 13:22:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h45KMX0U007912 for ; Mon, 5 May 2003 13:22:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h45KMXX9007909 for perforce@freebsd.org; Mon, 5 May 2003 13:22:33 -0700 (PDT) Date: Mon, 5 May 2003 13:22:33 -0700 (PDT) Message-Id: <200305052022.h45KMXX9007909@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30619 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2003 20:22:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=30619 Change 30619 by peter@peter_daintree on 2003/05/05 13:21:55 rtld startup code isn't finished translation yet Affected files ... .. //depot/projects/hammer/libexec/Makefile#11 edit Differences ... ==== //depot/projects/hammer/libexec/Makefile#11 (text+ko) ==== @@ -23,13 +23,16 @@ rpc.rwalld \ rpc.sprayd \ rshd \ - rtld-elf \ save-entropy \ talkd \ tcpd \ tftpd \ ypxfr +.if ${MACHINE_ARCH} != amd64 +SUBDIR+=rtld-elf +.endif + .if !defined(NO_BIND) SUBDIR+=named-xfer .endif From owner-p4-projects@FreeBSD.ORG Mon May 5 13:27:44 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8ED9137B404; Mon, 5 May 2003 13:27:43 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 41A7737B401 for ; Mon, 5 May 2003 13:27:43 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C689143F75 for ; Mon, 5 May 2003 13:27:41 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h45KRf0U008071 for ; Mon, 5 May 2003 13:27:41 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h45KReV7008067 for perforce@freebsd.org; Mon, 5 May 2003 13:27:40 -0700 (PDT) Date: Mon, 5 May 2003 13:27:40 -0700 (PDT) Message-Id: <200305052027.h45KReV7008067@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 30620 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2003 20:27:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=30620 Change 30620 by jhb@jhb_laptop on 2003/05/05 13:26:54 IFC @30616. Affected files ... .. //depot/projects/smpng/sys/alpha/include/_limits.h#4 integrate .. //depot/projects/smpng/sys/amd64/Makefile#1 branch .. //depot/projects/smpng/sys/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/smpng/sys/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/smpng/sys/amd64/amd64/atomic.c#1 branch .. //depot/projects/smpng/sys/amd64/amd64/autoconf.c#1 branch .. //depot/projects/smpng/sys/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/smpng/sys/amd64/amd64/critical.c#1 branch .. //depot/projects/smpng/sys/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/smpng/sys/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/smpng/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/smpng/sys/amd64/amd64/genassym.c#1 branch .. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#1 branch .. //depot/projects/smpng/sys/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/smpng/sys/amd64/amd64/initcpu.c#1 branch .. //depot/projects/smpng/sys/amd64/amd64/legacy.c#1 branch .. //depot/projects/smpng/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#1 branch .. //depot/projects/smpng/sys/amd64/amd64/mem.c#1 branch .. //depot/projects/smpng/sys/amd64/amd64/nexus.c#1 branch .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#1 branch .. //depot/projects/smpng/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/smpng/sys/amd64/amd64/support.S#1 branch .. //depot/projects/smpng/sys/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/smpng/sys/amd64/amd64/trap.c#1 branch .. //depot/projects/smpng/sys/amd64/amd64/tsc.c#1 branch .. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/smpng/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/smpng/sys/amd64/conf/GENERIC#1 branch .. //depot/projects/smpng/sys/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/smpng/sys/amd64/conf/Makefile#1 branch .. //depot/projects/smpng/sys/amd64/conf/gethints.awk#1 branch .. //depot/projects/smpng/sys/amd64/include/_inttypes.h#1 branch .. //depot/projects/smpng/sys/amd64/include/_limits.h#1 branch .. //depot/projects/smpng/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/smpng/sys/amd64/include/_types.h#1 branch .. //depot/projects/smpng/sys/amd64/include/asm.h#1 branch .. //depot/projects/smpng/sys/amd64/include/asmacros.h#1 branch .. //depot/projects/smpng/sys/amd64/include/atomic.h#1 branch .. //depot/projects/smpng/sys/amd64/include/bus.h#1 branch .. //depot/projects/smpng/sys/amd64/include/bus_at386.h#1 branch .. //depot/projects/smpng/sys/amd64/include/bus_dma.h#1 branch .. //depot/projects/smpng/sys/amd64/include/bus_memio.h#1 branch .. //depot/projects/smpng/sys/amd64/include/bus_pio.h#1 branch .. //depot/projects/smpng/sys/amd64/include/clock.h#1 branch .. //depot/projects/smpng/sys/amd64/include/cpu.h#1 branch .. //depot/projects/smpng/sys/amd64/include/cpufunc.h#1 branch .. //depot/projects/smpng/sys/amd64/include/cputypes.h#1 branch .. //depot/projects/smpng/sys/amd64/include/critical.h#1 branch .. //depot/projects/smpng/sys/amd64/include/db_machdep.h#1 branch .. //depot/projects/smpng/sys/amd64/include/elf.h#1 branch .. //depot/projects/smpng/sys/amd64/include/endian.h#1 branch .. //depot/projects/smpng/sys/amd64/include/exec.h#1 branch .. //depot/projects/smpng/sys/amd64/include/float.h#1 branch .. //depot/projects/smpng/sys/amd64/include/floatingpoint.h#1 branch .. //depot/projects/smpng/sys/amd64/include/frame.h#1 branch .. //depot/projects/smpng/sys/amd64/include/in_cksum.h#1 branch .. //depot/projects/smpng/sys/amd64/include/kse.h#1 branch .. //depot/projects/smpng/sys/amd64/include/legacyvar.h#1 branch .. //depot/projects/smpng/sys/amd64/include/limits.h#1 branch .. //depot/projects/smpng/sys/amd64/include/md_var.h#1 branch .. //depot/projects/smpng/sys/amd64/include/metadata.h#1 branch .. //depot/projects/smpng/sys/amd64/include/mutex.h#1 branch .. //depot/projects/smpng/sys/amd64/include/npx.h#1 branch .. //depot/projects/smpng/sys/amd64/include/param.h#1 branch .. //depot/projects/smpng/sys/amd64/include/pc/display.h#1 branch .. //depot/projects/smpng/sys/amd64/include/pcb.h#1 branch .. //depot/projects/smpng/sys/amd64/include/pcb_ext.h#1 branch .. //depot/projects/smpng/sys/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/smpng/sys/amd64/include/pcpu.h#1 branch .. //depot/projects/smpng/sys/amd64/include/pmap.h#1 branch .. //depot/projects/smpng/sys/amd64/include/proc.h#1 branch .. //depot/projects/smpng/sys/amd64/include/profile.h#1 branch .. //depot/projects/smpng/sys/amd64/include/psl.h#1 branch .. //depot/projects/smpng/sys/amd64/include/ptrace.h#1 branch .. //depot/projects/smpng/sys/amd64/include/reg.h#1 branch .. //depot/projects/smpng/sys/amd64/include/reloc.h#1 branch .. //depot/projects/smpng/sys/amd64/include/resource.h#1 branch .. //depot/projects/smpng/sys/amd64/include/runq.h#1 branch .. //depot/projects/smpng/sys/amd64/include/segments.h#1 branch .. //depot/projects/smpng/sys/amd64/include/setjmp.h#1 branch .. //depot/projects/smpng/sys/amd64/include/sigframe.h#1 branch .. //depot/projects/smpng/sys/amd64/include/signal.h#1 branch .. //depot/projects/smpng/sys/amd64/include/smp.h#1 branch .. //depot/projects/smpng/sys/amd64/include/specialreg.h#1 branch .. //depot/projects/smpng/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/smpng/sys/amd64/include/sysarch.h#1 branch .. //depot/projects/smpng/sys/amd64/include/trap.h#1 branch .. //depot/projects/smpng/sys/amd64/include/tss.h#1 branch .. //depot/projects/smpng/sys/amd64/include/ucontext.h#1 branch .. //depot/projects/smpng/sys/amd64/include/varargs.h#1 branch .. //depot/projects/smpng/sys/amd64/include/vmparam.h#1 branch .. //depot/projects/smpng/sys/amd64/isa/clock.c#1 branch .. //depot/projects/smpng/sys/amd64/isa/icu.h#1 branch .. //depot/projects/smpng/sys/amd64/isa/icu_ipl.S#1 branch .. //depot/projects/smpng/sys/amd64/isa/icu_vector.S#1 branch .. //depot/projects/smpng/sys/amd64/isa/intr_machdep.c#1 branch .. //depot/projects/smpng/sys/amd64/isa/intr_machdep.h#1 branch .. //depot/projects/smpng/sys/amd64/isa/isa.c#1 branch .. //depot/projects/smpng/sys/amd64/isa/isa.h#1 branch .. //depot/projects/smpng/sys/amd64/isa/isa_dma.c#1 branch .. //depot/projects/smpng/sys/amd64/isa/isa_dma.h#1 branch .. //depot/projects/smpng/sys/amd64/isa/ithread.c#1 branch .. //depot/projects/smpng/sys/amd64/isa/npx.c#1 branch .. //depot/projects/smpng/sys/amd64/isa/timerreg.h#1 branch .. //depot/projects/smpng/sys/amd64/isa/vector.S#1 branch .. //depot/projects/smpng/sys/amd64/pci/pci_bus.c#1 branch .. //depot/projects/smpng/sys/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/smpng/sys/arm/include/_limits.h#3 integrate .. //depot/projects/smpng/sys/boot/Makefile#8 integrate .. //depot/projects/smpng/sys/boot/alpha/libalpha/elf_freebsd.c#2 integrate .. //depot/projects/smpng/sys/boot/arc/lib/elf_freebsd.c#2 integrate .. //depot/projects/smpng/sys/boot/common/Makefile.inc#4 integrate .. //depot/projects/smpng/sys/boot/common/bootstrap.h#7 integrate .. //depot/projects/smpng/sys/boot/common/help.common#10 integrate .. //depot/projects/smpng/sys/boot/common/load_elf.c#8 integrate .. //depot/projects/smpng/sys/boot/common/load_elf32.c#1 branch .. //depot/projects/smpng/sys/boot/common/load_elf64.c#1 branch .. //depot/projects/smpng/sys/boot/common/loader.8#22 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/elf_freebsd.c#10 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/Makefile#7 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/smpng/sys/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/smpng/sys/boot/i386/libi386/bootinfo.c#7 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/smpng/sys/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/smpng/sys/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/smpng/sys/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/smpng/sys/boot/i386/libi386/elf_freebsd.c#3 delete .. //depot/projects/smpng/sys/boot/i386/libi386/i386_module.c#7 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/libi386.h#4 integrate .. //depot/projects/smpng/sys/boot/i386/loader/conf.c#7 integrate .. //depot/projects/smpng/sys/boot/i386/loader/main.c#5 integrate .. //depot/projects/smpng/sys/boot/ia64/libski/elf_freebsd.c#6 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/elf_freebsd.c#5 integrate .. //depot/projects/smpng/sys/boot/pc98/boot0.5/start.s#2 integrate .. //depot/projects/smpng/sys/boot/pc98/libpc98/Makefile#7 integrate .. //depot/projects/smpng/sys/boot/pc98/loader/conf.c#1 branch .. //depot/projects/smpng/sys/boot/powerpc/loader/metadata.c#3 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/main.c#13 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/metadata.c#9 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#38 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ipc.c#13 integrate .. //depot/projects/smpng/sys/conf/Makefile.amd64#1 branch .. //depot/projects/smpng/sys/conf/Makefile.x86_64#5 delete .. //depot/projects/smpng/sys/conf/NOTES#42 integrate .. //depot/projects/smpng/sys/conf/files#76 integrate .. //depot/projects/smpng/sys/conf/files.amd64#1 branch .. //depot/projects/smpng/sys/conf/files.pc98#41 integrate .. //depot/projects/smpng/sys/conf/files.x86_64#6 delete .. //depot/projects/smpng/sys/conf/kern.mk#4 integrate .. //depot/projects/smpng/sys/conf/ldscript.amd64#1 branch .. //depot/projects/smpng/sys/conf/options.amd64#1 branch .. //depot/projects/smpng/sys/conf/options.x86_64#6 delete .. //depot/projects/smpng/sys/contrib/dev/acpica/acenv.h#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acfreebsd.h#7 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbcmds.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/dbxface.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwregs.c#10 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/hwsleep.c#13 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/psparse.c#14 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#42 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahc_eisa.c#7 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahc_pci.c#9 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/ahd_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7770.c#7 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.c#10 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.h#8 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.reg#9 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.seq#8 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_inline.h#8 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.c#8 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_pci.c#9 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.c#13 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.h#7 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.reg#7 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_inline.h#6 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.c#8 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_pci.c#9 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#36 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#16 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#10 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#29 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.h#12 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#31 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#6 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.c#19 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.h#13 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#20 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#25 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#13 integrate .. //depot/projects/smpng/sys/dev/ct/ct_isa.c#5 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#20 integrate .. //depot/projects/smpng/sys/dev/em/if_em.h#13 integrate .. //depot/projects/smpng/sys/dev/em/if_em_hw.c#8 integrate .. //depot/projects/smpng/sys/dev/em/if_em_hw.h#8 integrate .. //depot/projects/smpng/sys/dev/em/if_em_osdep.h#11 integrate .. //depot/projects/smpng/sys/dev/en/midway.c#12 integrate .. //depot/projects/smpng/sys/dev/en/midwayvar.h#5 integrate .. //depot/projects/smpng/sys/dev/fb/fbreg.h#9 integrate .. //depot/projects/smpng/sys/dev/fb/vga.c#13 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#16 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp.c#16 integrate .. //depot/projects/smpng/sys/dev/kbd/atkbdc.c#5 integrate .. //depot/projects/smpng/sys/dev/md/md.c#35 integrate .. //depot/projects/smpng/sys/dev/mii/brgphy.c#14 integrate .. //depot/projects/smpng/sys/dev/mii/miidevs#9 integrate .. //depot/projects/smpng/sys/dev/mii/ruephy.c#1 branch .. //depot/projects/smpng/sys/dev/mii/ruephyreg.h#1 branch .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#27 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbdevid.h#9 integrate .. //depot/projects/smpng/sys/dev/ppbus/vpo.c#5 integrate .. //depot/projects/smpng/sys/dev/puc/puc.c#12 integrate .. //depot/projects/smpng/sys/dev/puc/pucdata.c#13 integrate .. //depot/projects/smpng/sys/dev/sio/sio.c#29 integrate .. //depot/projects/smpng/sys/dev/snc/dp83932subr.c#3 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#13 integrate .. //depot/projects/smpng/sys/dev/usb/if_rue.c#1 branch .. //depot/projects/smpng/sys/dev/usb/if_ruereg.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usbdevs#30 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs.h#31 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs_data.h#31 integrate .. //depot/projects/smpng/sys/dev/vinum/request.h#2 integrate .. //depot/projects/smpng/sys/dev/vinum/vinum.c#11 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumconfig.c#11 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumext.h#8 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumio.c#12 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumio.h#2 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumioctl.c#12 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumkw.h#2 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumlock.c#2 integrate .. //depot/projects/smpng/sys/dev/vinum/vinummemory.c#5 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumobj.h#4 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumparser.c#3 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumraid5.c#2 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumrequest.c#10 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumrevive.c#7 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumstate.c#3 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumutil.c#2 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumvar.h#4 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_dbregs.c#11 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_fpregs.c#11 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_regs.c#11 integrate .. //depot/projects/smpng/sys/fs/procfs/procfs_status.c#16 integrate .. //depot/projects/smpng/sys/fs/udf/udf.h#3 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#8 integrate .. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#11 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde.c#10 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_crypt.c#11 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_work.c#9 integrate .. //depot/projects/smpng/sys/geom/geom.h#27 integrate .. //depot/projects/smpng/sys/geom/geom_aes.c#10 integrate .. //depot/projects/smpng/sys/geom/geom_apple.c#5 integrate .. //depot/projects/smpng/sys/geom/geom_bsd.c#29 integrate .. //depot/projects/smpng/sys/geom/geom_bsd_enc.c#2 integrate .. //depot/projects/smpng/sys/geom/geom_ctl.c#10 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#23 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#24 integrate .. //depot/projects/smpng/sys/geom/geom_event.c#17 integrate .. //depot/projects/smpng/sys/geom/geom_gpt.c#11 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#19 integrate .. //depot/projects/smpng/sys/geom/geom_mbr.c#20 integrate .. //depot/projects/smpng/sys/geom/geom_mirror.c#4 integrate .. //depot/projects/smpng/sys/geom/geom_pc98.c#18 integrate .. //depot/projects/smpng/sys/geom/geom_pc98_enc.c#1 branch .. //depot/projects/smpng/sys/geom/geom_slice.c#21 integrate .. //depot/projects/smpng/sys/geom/geom_slice.h#13 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#26 integrate .. //depot/projects/smpng/sys/geom/geom_sunlabel.c#21 integrate .. //depot/projects/smpng/sys/geom/geom_vol_ffs.c#4 integrate .. //depot/projects/smpng/sys/i386/include/_limits.h#3 integrate .. //depot/projects/smpng/sys/i386/include/elf.h#5 integrate .. //depot/projects/smpng/sys/i386/include/metadata.h#1 branch .. //depot/projects/smpng/sys/i386/include/specialreg.h#5 integrate .. //depot/projects/smpng/sys/i386/include/vmparam.h#4 integrate .. //depot/projects/smpng/sys/ia64/ia64/locore.s#17 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#53 integrate .. //depot/projects/smpng/sys/ia64/include/_limits.h#3 integrate .. //depot/projects/smpng/sys/ia64/include/param.h#9 integrate .. //depot/projects/smpng/sys/isa/isa_common.c#10 integrate .. //depot/projects/smpng/sys/isa/vga_isa.c#6 integrate .. //depot/projects/smpng/sys/kern/init_main.c#33 integrate .. //depot/projects/smpng/sys/kern/kern_acct.c#27 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#64 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#59 integrate .. //depot/projects/smpng/sys/kern/kern_idle.c#14 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#29 integrate .. //depot/projects/smpng/sys/kern/kern_kthread.c#11 integrate .. //depot/projects/smpng/sys/kern/kern_ktr.c#18 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#20 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#51 integrate .. //depot/projects/smpng/sys/kern/kern_prot.c#69 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#47 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#6 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#32 integrate .. //depot/projects/smpng/sys/kern/md5c.c#4 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#10 integrate .. //depot/projects/smpng/sys/kern/subr_mbuf.c#30 integrate .. //depot/projects/smpng/sys/kern/subr_prof.c#20 integrate .. //depot/projects/smpng/sys/kern/sysv_shm.c#16 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#19 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#51 integrate .. //depot/projects/smpng/sys/modules/Makefile#51 integrate .. //depot/projects/smpng/sys/modules/mii/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/rue/Makefile#1 branch .. //depot/projects/smpng/sys/net/if_atm.h#5 integrate .. //depot/projects/smpng/sys/net/if_atmsubr.c#9 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#33 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_lock.c#24 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#35 integrate .. //depot/projects/smpng/sys/pci/if_en_pci.c#6 integrate .. //depot/projects/smpng/sys/powerpc/include/_limits.h#3 integrate .. //depot/projects/smpng/sys/powerpc/include/metadata.h#2 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#37 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/ofwmagic.S#2 integrate .. //depot/projects/smpng/sys/sparc64/include/_limits.h#3 integrate .. //depot/projects/smpng/sys/sparc64/include/metadata.h#4 integrate .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#20 integrate .. //depot/projects/smpng/sys/sparc64/sbus/sbus.c#9 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/iommu.c#15 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#49 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#51 integrate .. //depot/projects/smpng/sys/sys/ata.h#13 integrate .. //depot/projects/smpng/sys/sys/disklabel.h#25 integrate .. //depot/projects/smpng/sys/sys/diskpc98.h#5 integrate .. //depot/projects/smpng/sys/sys/limits.h#3 integrate .. //depot/projects/smpng/sys/sys/linker.h#11 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#23 integrate .. //depot/projects/smpng/sys/sys/param.h#40 integrate .. //depot/projects/smpng/sys/sys/proc.h#85 integrate .. //depot/projects/smpng/sys/sys/soundcard.h#6 integrate .. //depot/projects/smpng/sys/sys/syscallsubr.h#6 integrate .. //depot/projects/smpng/sys/sys/user.h#14 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#40 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#17 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#33 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#30 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.h#10 integrate .. //depot/projects/smpng/sys/x86_64/compile/.cvsignore#2 delete .. //depot/projects/smpng/sys/x86_64/include/_limits.h#3 delete .. //depot/projects/smpng/sys/x86_64/include/_stdint.h#2 delete .. //depot/projects/smpng/sys/x86_64/include/_types.h#3 delete .. //depot/projects/smpng/sys/x86_64/include/endian.h#4 delete .. //depot/projects/smpng/sys/x86_64/include/limits.h#5 delete .. //depot/projects/smpng/sys/x86_64/include/param.h#3 delete .. //depot/projects/smpng/sys/x86_64/include/stdarg.h#5 delete Differences ... ==== //depot/projects/smpng/sys/alpha/include/_limits.h#4 (text+ko) ==== @@ -32,7 +32,7 @@ * * @(#)limits.h 8.3 (Berkeley) 1/4/94 * From: NetBSD: limits.h,v 1.3 1997/04/06 08:47:31 cgd Exp - * $FreeBSD: src/sys/alpha/include/_limits.h,v 1.12 2003/04/28 22:35:34 kan Exp $ + * $FreeBSD: src/sys/alpha/include/_limits.h,v 1.13 2003/05/04 22:13:03 kan Exp $ */ #ifndef _MACHINE__LIMITS_H_ @@ -40,6 +40,17 @@ #define __CHAR_BIT 8 /* number of bits in a char */ +/* + * According to ANSI (section 2.2.4.2), the values below must be usable by + * #if preprocessing directives. Additionally, the expression must have the + * same type as would an expression that is an object of the corresponding + * type converted according to the integral promotions. The subtraction for + * INT_MIN, etc., is so the value is not unsigned; e.g., 0x80000000 is an + * unsigned int for 32-bit two's complement ANSI compilers (section 3.1.3.2). + * These numbers are for the default configuration of gcc. They work for + * some other compilers as well, but this should not be depended on. + */ + #define __SCHAR_MAX 0x7f /* max value for a signed char */ #define __SCHAR_MIN (-0x7f-1) /* min value for a signed char */ @@ -72,7 +83,7 @@ #define __OFF_MAX __LONG_MAX /* max value for a off_t */ #define __OFF_MIN __LONG_MIN /* min value for a off_t */ -/* Quads and longs are the same on the alpha. Ensure they stay in sync. */ +/* Quads and longs are the same on the alpha. Ensure they stay in sync. */ #define __UQUAD_MAX (__ULONG_MAX) /* max value for a uquad_t */ #define __QUAD_MAX (__LONG_MAX) /* max value for a quad_t */ #define __QUAD_MIN (__LONG_MIN) /* min value for a quad_t */ @@ -80,12 +91,4 @@ #define __LONG_BIT 64 #define __WORD_BIT 32 -#define __DBL_DIG 15 -#define __DBL_MAX 1.7976931348623157E+308 -#define __DBL_MIN 2.2250738585072014E-308 - -#define __FLT_DIG 6 -#define __FLT_MAX 3.40282347E+38F -#define __FLT_MIN 1.17549435E-38F - #endif /* !_MACHINE__LIMITS_H_ */ ==== //depot/projects/smpng/sys/arm/include/_limits.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)limits.h 8.3 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/arm/include/_limits.h,v 1.4 2003/04/23 21:41:58 kan Exp $ + * $FreeBSD: src/sys/arm/include/_limits.h,v 1.5 2003/05/04 22:13:03 kan Exp $ */ #ifndef _MACHINE__LIMITS_H_ @@ -39,6 +39,17 @@ #define __CHAR_BIT 8 /* number of bits in a char */ +/* + * According to ANSI (section 2.2.4.2), the values below must be usable by + * #if preprocessing directives. Additionally, the expression must have the + * same type as would an expression that is an object of the corresponding + * type converted according to the integral promotions. The subtraction for + * INT_MIN, etc., is so the value is not unsigned; e.g., 0x80000000 is an + * unsigned int for 32-bit two's complement ANSI compilers (section 3.1.3.2). + * These numbers are for the default configuration of gcc. They work for + * some other compilers as well, but this should not be depended on. + */ + #define __SCHAR_MAX 0x7f /* max value for a signed char */ #define __SCHAR_MIN (-0x7f - 1) /* min value for a signed char */ @@ -87,12 +98,4 @@ #endif #define __WORD_BIT 32 -#define __DBL_DIG 15 -#define __DBL_MAX 1.7976931348623157E+308 -#define __DBL_MIN 2.2250738585072014E-308 - -#define __FLT_DIG 6 -#define __FLT_MAX 3.40282347E+38F -#define __FLT_MIN 1.17549435E-38F - #endif /* !_MACHINE__LIMITS_H_ */ ==== //depot/projects/smpng/sys/boot/Makefile#8 (text+ko) ==== @@ -1,4 +1,9 @@ -# $FreeBSD: src/sys/boot/Makefile,v 1.15 2003/02/13 04:35:04 benno Exp $ +# $FreeBSD: src/sys/boot/Makefile,v 1.16 2003/04/30 22:13:36 peter Exp $ + +.if ${MACHINE_ARCH} == "amd64" +MACHINE_ARCH=i386 +MACHINE=i386 +.endif .if !defined(NOFORTH) # Build the add-in FORTH interpreter ==== //depot/projects/smpng/sys/boot/alpha/libalpha/elf_freebsd.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/boot/alpha/libalpha/elf_freebsd.c,v 1.11 2000/11/14 08:10:15 mjacob Exp $ */ +/* $FreeBSD: src/sys/boot/alpha/libalpha/elf_freebsd.c,v 1.12 2003/05/01 03:56:28 peter Exp $ */ /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */ /*- @@ -90,16 +90,16 @@ #define _KERNEL -static int elf_exec(struct preloaded_file *afp); +static int elf64_exec(struct preloaded_file *afp); int bi_load(struct bootinfo_v1 *, vm_offset_t *, struct preloaded_file *); -struct file_format alpha_elf = { elf_loadfile, elf_exec }; +struct file_format alpha_elf = { elf64_loadfile, elf64_exec }; vm_offset_t ffp_save, ptbr_save; static int -elf_exec(struct preloaded_file *fp) +elf64_exec(struct preloaded_file *fp) { static struct bootinfo_v1 bootinfo_v1; struct file_metadata *md; ==== //depot/projects/smpng/sys/boot/arc/lib/elf_freebsd.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/boot/arc/lib/elf_freebsd.c,v 1.3 2000/05/01 17:41:20 bp Exp $ */ +/* $FreeBSD: src/sys/boot/arc/lib/elf_freebsd.c,v 1.4 2003/05/01 03:56:29 peter Exp $ */ /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */ /*- @@ -90,16 +90,16 @@ #define _KERNEL -static int elf_exec(struct preloaded_file *amp); +static int elf64_exec(struct preloaded_file *amp); int bi_load(struct bootinfo_v1 *, vm_offset_t *, struct preloaded_file *); -struct file_format alpha_elf = { elf_loadfile, elf_exec }; +struct file_format alpha_elf = { elf64_loadfile, elf64_exec }; vm_offset_t ffp_save, ptbr_save; static int -elf_exec(struct preloaded_file *fp) +elf64_exec(struct preloaded_file *fp) { #if 0 static struct bootinfo_v1 bootinfo_v1; ==== //depot/projects/smpng/sys/boot/common/Makefile.inc#4 (text+ko) ==== @@ -1,9 +1,19 @@ -# $FreeBSD: src/sys/boot/common/Makefile.inc,v 1.14 2002/08/29 02:02:27 peter Exp $ +# $FreeBSD: src/sys/boot/common/Makefile.inc,v 1.15 2003/05/01 03:56:29 peter Exp $ SRCS+= bcache.c boot.c commands.c console.c devopen.c interp.c -SRCS+= interp_backslash.c interp_parse.c load_elf.c ls.c misc.c +SRCS+= interp_backslash.c interp_parse.c ls.c misc.c SRCS+= module.c panic.c +.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" +SRCS+= load_elf32.c load_elf64.c +.endif +.if ${MACHINE_ARCH} == "powerpc" +SRCS+= load_elf32.c +.endif +.if ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "alpha" +SRCS+= load_elf64.c +.endif + .if defined(LOADER_NET_SUPPORT) SRCS+= dev_net.c .endif @@ -25,3 +35,6 @@ MAN+= loader.8 +.if ${MACHINE_ARCH} == "amd64" +CFLAGS+= -m32 +.endif ==== //depot/projects/smpng/sys/boot/common/bootstrap.h#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/common/bootstrap.h,v 1.37 2003/04/06 06:28:08 peter Exp $ + * $FreeBSD: src/sys/boot/common/bootstrap.h,v 1.38 2003/05/01 03:56:29 peter Exp $ */ #include @@ -210,7 +210,7 @@ struct file_format { /* Load function must return EFTYPE if it can't handle the module supplied */ - int (* l_load)(char *filename, vm_offset_t dest, struct preloaded_file **result); + int (* l_load)(char *filename, u_int64_t dest, struct preloaded_file **result); /* Only a loader that will load a kernel (first module) should have an exec handler */ int (* l_exec)(struct preloaded_file *mp); }; @@ -231,7 +231,9 @@ /* MI module loaders */ -int elf_loadfile(char *filename, vm_offset_t dest, struct preloaded_file **result); +#ifdef __elfN +int __elfN(loadfile)(char *filename, u_int64_t dest, struct preloaded_file **result); +#endif /* * Support for commands ==== //depot/projects/smpng/sys/boot/common/help.common#10 (text+ko) ==== @@ -13,6 +13,11 @@ Some commands may not be available. Use the '?' command to list most available commands. + If needed, disable the use of ACPI with: + + unset acpi_load + $hint.acpi.0.disabled="1" + ################################################################################ # Tautoboot DBoot after a delay ==== //depot/projects/smpng/sys/boot/common/load_elf.c#8 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/boot/common/load_elf.c,v 1.26 2003/04/04 16:35:14 phk Exp $ + * $FreeBSD: src/sys/boot/common/load_elf.c,v 1.27 2003/05/01 03:56:29 peter Exp $ */ #include @@ -41,6 +41,12 @@ #define COPYOUT(s,d,l) archsw.arch_copyout((vm_offset_t)(s), d, l) +#if defined(__i386__) && __ELF_WORD_SIZE == 64 +#undef ELF_TARG_CLASS +#undef ELF_TARG_MACH +#define ELF_TARG_CLASS ELFCLASS64 +#define ELF_TARG_MACH EM_X86_64 +#endif typedef struct elf_file { Elf_Phdr *ph; @@ -59,20 +65,20 @@ caddr_t firstpage; size_t firstlen; int kernel; - vm_offset_t off; + u_int64_t off; } *elf_file_t; -static int elf_loadimage(struct preloaded_file *mp, elf_file_t ef, vm_offset_t loadaddr); -static int elf_lookup_symbol(struct preloaded_file *mp, elf_file_t ef, const char* name, Elf_Sym* sym); +static int __elfN(loadimage)(struct preloaded_file *mp, elf_file_t ef, u_int64_t loadaddr); +static int __elfN(lookup_symbol)(struct preloaded_file *mp, elf_file_t ef, const char* name, Elf_Sym* sym); #ifdef __sparc__ -static void elf_reloc_ptr(struct preloaded_file *mp, elf_file_t ef, +static void __elfN(reloc_ptr)(struct preloaded_file *mp, elf_file_t ef, void *p, void *val, size_t len); #endif -static int elf_parse_modmetadata(struct preloaded_file *mp, elf_file_t ef); +static int __elfN(parse_modmetadata)(struct preloaded_file *mp, elf_file_t ef); static char *fake_modname(const char *name); -const char *elf_kerneltype = "elf kernel"; -const char *elf_moduletype = "elf module"; +const char *__elfN(kerneltype) = "elf kernel"; +const char *__elfN(moduletype) = "elf module"; /* * Attempt to load the file (file) as an ELF module. It will be stored at @@ -80,7 +86,7 @@ * will be saved in (result). */ int -elf_loadfile(char *filename, vm_offset_t dest, struct preloaded_file **result) +__elfN(loadfile)(char *filename, u_int64_t dest, struct preloaded_file **result) { struct preloaded_file *fp, *kfp; struct elf_file ef; @@ -134,12 +140,12 @@ if (ehdr->e_type == ET_DYN) { /* Looks like a kld module */ if (kfp == NULL) { - printf("elf_loadfile: can't load module before kernel\n"); + printf("elf" __XSTRING(__ELF_WORD_SIZE) "_loadfile: can't load module before kernel\n"); err = EPERM; goto oerr; } - if (strcmp(elf_kerneltype, kfp->f_type)) { - printf("elf_loadfile: can't load module with kernel type '%s'\n", kfp->f_type); + if (strcmp(__elfN(kerneltype), kfp->f_type)) { + printf("elf" __XSTRING(__ELF_WORD_SIZE) "_loadfile: can't load module with kernel type '%s'\n", kfp->f_type); err = EPERM; goto oerr; } @@ -155,16 +161,16 @@ } else if (ehdr->e_type == ET_EXEC) { /* Looks like a kernel */ if (kfp != NULL) { - printf("elf_loadfile: kernel already loaded\n"); + printf("elf" __XSTRING(__ELF_WORD_SIZE) "_loadfile: kernel already loaded\n"); err = EPERM; goto oerr; } /* * Calculate destination address based on kernel entrypoint */ - dest = (vm_offset_t) ehdr->e_entry; + dest = ehdr->e_entry; if (dest == 0) { - printf("elf_loadfile: not a kernel (maybe static binary?)\n"); + printf("elf" __XSTRING(__ELF_WORD_SIZE) "_loadfile: not a kernel (maybe static binary?)\n"); err = EPERM; goto oerr; } @@ -180,23 +186,23 @@ */ fp = file_alloc(); if (fp == NULL) { - printf("elf_loadfile: cannot allocate module info\n"); + printf("elf" __XSTRING(__ELF_WORD_SIZE) "_loadfile: cannot allocate module info\n"); err = EPERM; goto out; } if (ef.kernel) setenv("kernelname", filename, 1); fp->f_name = strdup(filename); - fp->f_type = strdup(ef.kernel ? elf_kerneltype : elf_moduletype); + fp->f_type = strdup(ef.kernel ? __elfN(kerneltype) : __elfN(moduletype)); #ifdef ELF_VERBOSE if (ef.kernel) - printf("%s entry at %p\n", filename, (void *) dest); + printf("%s entry at 0x%jx\n", filename, (uintmax_t)dest); #else printf("%s ", filename); #endif - fp->f_size = elf_loadimage(fp, &ef, dest); + fp->f_size = __elfN(loadimage)(fp, &ef, dest); if (fp->f_size == 0 || fp->f_addr == 0) goto ioerr; @@ -224,7 +230,7 @@ * the Elf header, load the image at (off) */ static int -elf_loadimage(struct preloaded_file *fp, elf_file_t ef, vm_offset_t off) +__elfN(loadimage)(struct preloaded_file *fp, elf_file_t ef, u_int64_t off) { int i; u_int j; @@ -238,12 +244,13 @@ size_t resid, chunk; ssize_t result; vm_offset_t dest; - vm_offset_t ssym, esym; + Elf_Addr ssym, esym; Elf_Dyn *dp; + Elf_Addr adp; int ndp; int symstrindex; int symtabindex; - long size; + Elf_Size size; u_int fpcopy; dp = NULL; @@ -253,7 +260,11 @@ ehdr = ef->ehdr; if (ef->kernel) { #ifdef __i386__ +#if __ELF_WORD_SIZE == 64 + off = - (off & 0xffffffffff000000ull);/* x86_64 relocates after locore */ +#else off = - (off & 0xff000000u); /* i386 relocates after locore */ +#endif #else off = 0; /* alpha is direct mapped for kernels */ #endif @@ -261,7 +272,7 @@ ef->off = off; if ((ehdr->e_phoff + ehdr->e_phnum * sizeof(*phdr)) > ef->firstlen) { - printf("elf_loadimage: program header not within first page\n"); + printf("elf" __XSTRING(__ELF_WORD_SIZE) "_loadimage: program header not within first page\n"); goto out; } phdr = (Elf_Phdr *)(ef->firstpage + ehdr->e_phoff); @@ -295,12 +306,12 @@ if (phdr[i].p_filesz > fpcopy) { if (lseek(ef->fd, (off_t)(phdr[i].p_offset + fpcopy), SEEK_SET) == -1) { - printf("\nelf_loadexec: cannot seek\n"); + printf("\nelf" __XSTRING(__ELF_WORD_SIZE) "_loadexec: cannot seek\n"); goto out; } if (archsw.arch_readin(ef->fd, phdr[i].p_vaddr + off + fpcopy, phdr[i].p_filesz - fpcopy) != (ssize_t)(phdr[i].p_filesz - fpcopy)) { - printf("\nelf_loadexec: archsw.readin failed\n"); + printf("\nelf" __XSTRING(__ELF_WORD_SIZE) "_loadexec: archsw.readin failed\n"); goto out; } } @@ -315,7 +326,7 @@ /* no archsw.arch_bzero */ buf = malloc(PAGE_SIZE); if (buf == NULL) { - printf("\nelf_loadimage: malloc() failed\n"); + printf("\nelf" __XSTRING(__ELF_WORD_SIZE) "_loadimage: malloc() failed\n"); goto out; } bzero(buf, PAGE_SIZE); @@ -353,12 +364,12 @@ if (shdr == NULL) goto nosyms; if (lseek(ef->fd, (off_t)ehdr->e_shoff, SEEK_SET) == -1) { - printf("\nelf_loadimage: cannot lseek() to section headers"); + printf("\nelf" __XSTRING(__ELF_WORD_SIZE) "_loadimage: cannot lseek() to section headers"); goto nosyms; } result = read(ef->fd, shdr, chunk); if (result < 0 || (size_t)result != chunk) { - printf("\nelf_loadimage: read section headers failed"); + printf("\nelf" __XSTRING(__ELF_WORD_SIZE) "_loadimage: read section headers failed"); goto nosyms; } symtabindex = -1; @@ -410,7 +421,7 @@ size = shdr[i].sh_size; archsw.arch_copyin(&size, lastaddr, sizeof(size)); - lastaddr += sizeof(long); + lastaddr += sizeof(size); #ifdef ELF_VERBOSE printf("\n%s: 0x%lx@0x%lx -> 0x%lx-0x%lx", secname, @@ -419,25 +430,25 @@ #else if (i == symstrindex) printf("+"); - printf("0x%lx+0x%lx", (long)sizeof(size), size); + printf("0x%lx+0x%lx", (long)sizeof(size), (long)size); #endif if (lseek(ef->fd, (off_t)shdr[i].sh_offset, SEEK_SET) == -1) { - printf("\nelf_loadimage: could not seek for symbols - skipped!"); + printf("\nelf" __XSTRING(__ELF_WORD_SIZE) "_loadimage: could not seek for symbols - skipped!"); lastaddr = ssym; ssym = 0; goto nosyms; } result = archsw.arch_readin(ef->fd, lastaddr, shdr[i].sh_size); if (result < 0 || (size_t)result != shdr[i].sh_size) { - printf("\nelf_loadimage: could not read symbols - skipped!"); + printf("\nelf" __XSTRING(__ELF_WORD_SIZE) "_loadimage: could not read symbols - skipped!"); lastaddr = ssym; ssym = 0; goto nosyms; } /* Reset offsets relative to ssym */ lastaddr += shdr[i].sh_size; - lastaddr = roundup(lastaddr, sizeof(long)); + lastaddr = roundup(lastaddr, sizeof(size)); if (i == symtabindex) symtabindex = -1; else if (i == symstrindex) @@ -461,9 +472,8 @@ for (i = 0; i < ehdr->e_phnum; i++) { if (phdr[i].p_type == PT_DYNAMIC) { php = phdr + i; - dp = (Elf_Dyn *)(php->p_vaddr); - file_addmetadata(fp, MODINFOMD_DYNAMIC, sizeof(dp), &dp); - dp = NULL; + adp = php->p_vaddr; + file_addmetadata(fp, MODINFOMD_DYNAMIC, sizeof(adp), &adp); break; } } @@ -485,19 +495,19 @@ break; switch (dp[i].d_tag) { case DT_HASH: - ef->hashtab = (Elf_Hashelt*)(dp[i].d_un.d_ptr + off); + ef->hashtab = (Elf_Hashelt*)(uintptr_t)(dp[i].d_un.d_ptr + off); break; case DT_STRTAB: - ef->strtab = (char *)(dp[i].d_un.d_ptr + off); + ef->strtab = (char *)(uintptr_t)(dp[i].d_un.d_ptr + off); break; case DT_STRSZ: ef->strsz = dp[i].d_un.d_val; break; case DT_SYMTAB: - ef->symtab = (Elf_Sym*)(dp[i].d_un.d_ptr + off); + ef->symtab = (Elf_Sym*)(uintptr_t)(dp[i].d_un.d_ptr + off); break; case DT_RELA: - ef->rela = (Elf_Rela *)(dp[i].d_un.d_ptr + off); + ef->rela = (Elf_Rela *)(uintptr_t)(dp[i].d_un.d_ptr + off); break; case DT_RELASZ: ef->relasz = dp[i].d_un.d_val; @@ -513,7 +523,7 @@ COPYOUT(ef->hashtab + 1, &ef->nchains, sizeof(ef->nchains)); ef->buckets = ef->hashtab + 2; ef->chains = ef->buckets + ef->nbuckets; - if (elf_parse_modmetadata(fp, ef) == 0) + if (__elfN(parse_modmetadata)(fp, ef) == 0) goto out; if (ef->kernel) /* kernel must not depend on anything */ @@ -559,33 +569,34 @@ } int -elf_parse_modmetadata(struct preloaded_file *fp, elf_file_t ef) +__elfN(parse_modmetadata)(struct preloaded_file *fp, elf_file_t ef) { struct mod_metadata md; struct mod_depend *mdepend; struct mod_version mver; Elf_Sym sym; - char *s, *v, **p, **p_stop; + char *s, **p, **p_stop; int modcnt, minfolen; + Elf_Addr v; - if (elf_lookup_symbol(fp, ef, "__start_set_modmetadata_set", &sym) != 0) + if (__elfN(lookup_symbol)(fp, ef, "__start_set_modmetadata_set", &sym) != 0) return ENOENT; - p = (char **)(sym.st_value + ef->off); - if (elf_lookup_symbol(fp, ef, "__stop_set_modmetadata_set", &sym) != 0) + p = (char **)(uintptr_t)(sym.st_value + ef->off); + if (__elfN(lookup_symbol)(fp, ef, "__stop_set_modmetadata_set", &sym) != 0) return ENOENT; - p_stop = (char **)(sym.st_value + ef->off); + p_stop = (char **)(uintptr_t)(sym.st_value + ef->off); modcnt = 0; while (p < p_stop) { COPYOUT(p, &v, sizeof(v)); #ifdef __sparc64__ - elf_reloc_ptr(fp, ef, p, &v, sizeof(v)); + __elfN(reloc_ptr)(fp, ef, p, &v, sizeof(v)); #else v += ef->off; #endif COPYOUT(v, &md, sizeof(md)); #ifdef __sparc64__ - elf_reloc_ptr(fp, ef, v, &md, sizeof(md)); + __elfN(reloc_ptr)(fp, ef, v, &md, sizeof(md)); #else md.md_cval += ef->off; md.md_data += ef->off; @@ -639,9 +650,9 @@ return h; } -static const char elf_bad_symtable[] = "elf_lookup_symbol: corrupt symbol table\n"; +static const char __elfN(bad_symtable)[] = "elf" __XSTRING(__ELF_WORD_SIZE) "_lookup_symbol: corrupt symbol table\n"; int -elf_lookup_symbol(struct preloaded_file *fp, elf_file_t ef, const char* name, +__elfN(lookup_symbol)(struct preloaded_file *fp, elf_file_t ef, const char* name, Elf_Sym *symp) { Elf_Hashelt symnum; @@ -654,13 +665,13 @@ while (symnum != STN_UNDEF) { if (symnum >= ef->nchains) { - printf(elf_bad_symtable); + printf(__elfN(bad_symtable)); return ENOENT; } COPYOUT(ef->symtab + symnum, &sym, sizeof(sym)); if (sym.st_name == 0) { - printf(elf_bad_symtable); + printf(__elfN(bad_symtable)); return ENOENT; } @@ -688,7 +699,7 @@ * the image in-place, because this is done by kern_linker later on. */ static void -elf_reloc_ptr(struct preloaded_file *mp, elf_file_t ef, +__elfN(reloc_ptr)(struct preloaded_file *mp, elf_file_t ef, void *p, void *val, size_t len) { Elf_Addr off = (Elf_Addr)p - ef->off, word; ==== //depot/projects/smpng/sys/boot/common/loader.8#22 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.54 2003/03/04 23:46:29 seanc Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.55 2003/05/04 08:23:24 murray Exp $ .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. @@ -163,7 +163,7 @@ .Op Fl n .Op Aq message .Xc -Displays a text on the screen. +Displays text on the screen. A new line will be printed unless .Fl n is specified. @@ -181,10 +181,10 @@ .Pp >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 5 13:32:50 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7521E37B40D; Mon, 5 May 2003 13:32:49 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 12F6B37B408 for ; Mon, 5 May 2003 13:32:49 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C5F443F3F for ; Mon, 5 May 2003 13:32:48 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h45KWm0U008334 for ; Mon, 5 May 2003 13:32:48 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h45KWmrB008331 for perforce@freebsd.org; Mon, 5 May 2003 13:32:48 -0700 (PDT) Date: Mon, 5 May 2003 13:32:48 -0700 (PDT) Message-Id: <200305052032.h45KWmrB008331@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30621 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2003 20:32:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=30621 Change 30621 by peter@peter_daintree on 2003/05/05 13:32:46 make this actually compile Affected files ... .. //depot/projects/hammer/lib/libc/amd64/gen/alloca.S#10 edit Differences ... ==== //depot/projects/hammer/lib/libc/amd64/gen/alloca.S#10 (text+ko) ==== @@ -45,7 +45,7 @@ ENTRY(alloca) popq %rdx /* pop return addr */ - movl %rsp,%rcx + movq %rsp,%rcx addq $15,%rdi /* round amount to allocate up to 16 bytes */ andq $~15,%rdi subq %rdi,%rsp From owner-p4-projects@FreeBSD.ORG Mon May 5 14:31:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6BF6837B404; Mon, 5 May 2003 14:31:13 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0C19837B401 for ; Mon, 5 May 2003 14:31:13 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA5E843F85 for ; Mon, 5 May 2003 14:31:12 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h45LVC0U012085 for ; Mon, 5 May 2003 14:31:12 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h45LVCfG012082 for perforce@freebsd.org; Mon, 5 May 2003 14:31:12 -0700 (PDT) Date: Mon, 5 May 2003 14:31:12 -0700 (PDT) Message-Id: <200305052131.h45LVCfG012082@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30632 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2003 21:31:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=30632 Change 30632 by peter@peter_daintree on 2003/05/05 14:30:12 GRRRR! Get out the bigger hammer. Eliminate -O from CFLAGS. Affected files ... .. //depot/projects/hammer/lib/libc/stdio/Makefile.inc#8 edit Differences ... ==== //depot/projects/hammer/lib/libc/stdio/Makefile.inc#8 (text+ko) ==== @@ -61,3 +61,22 @@ wprintf.3 vwprintf.3 wprintf.3 vfwprintf.3 wprintf.3 vswprintf.3 MLINKS+=wscanf.3 fwscanf.3 wscanf.3 swscanf.3 wscanf.3 vwscanf.3 \ wscanf.3 vswscanf.3 wscanf.3 vfwscanf.3 + +.if ${MACHINE_ARCH} == "amd64" +.for _file in vfprintf vfwprintf +${_file}.o: ${_file}.c + ${CC} ${CFLAGS:N-O*} -c ${.IMPSRC} -o ${.TARGET} + @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} + @mv ${.TARGET}.tmp ${.TARGET} + +${_file}.So: ${_file}.c + ${CC} ${PICFLAG} -DPIC ${CFLAGS:N-O*} -c ${.IMPSRC} -o ${.TARGET} + @${LD} ${LDFLAGS} -o ${.TARGET}.tmp -x -r ${.TARGET} + @mv ${.TARGET}.tmp ${.TARGET} + +${_file}.po: ${_file}.c + ${CC} -pg ${CFLAGS:N-O*} -c ${.IMPSRC} -o ${.TARGET} + @${LD} -o ${.TARGET}.tmp -X -r ${.TARGET} + @mv ${.TARGET}.tmp ${.TARGET} +.endfor +.endif From owner-p4-projects@FreeBSD.ORG Mon May 5 14:36:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6128637B404; Mon, 5 May 2003 14:36:21 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 00EEC37B401 for ; Mon, 5 May 2003 14:36:21 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A39A43F93 for ; Mon, 5 May 2003 14:36:20 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h45LaJ0U012260 for ; Mon, 5 May 2003 14:36:20 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h45LaJZS012257 for perforce@freebsd.org; Mon, 5 May 2003 14:36:19 -0700 (PDT) Date: Mon, 5 May 2003 14:36:19 -0700 (PDT) Message-Id: <200305052136.h45LaJZS012257@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30634 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2003 21:36:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=30634 Change 30634 by peter@peter_daintree on 2003/05/05 14:35:51 stub out sys/boot entirely for amd64 for the time being. The makefiles are not up to it. Affected files ... .. //depot/projects/hammer/sys/Makefile#2 edit Differences ... ==== //depot/projects/hammer/sys/Makefile#2 (text+ko) ==== @@ -1,7 +1,10 @@ # $FreeBSD: src/sys/Makefile,v 1.26 2002/04/26 17:55:21 ru Exp $ +SUBDIR= # The boot loader -SUBDIR= boot +.if ${MACHINE_ARCH} != "amd64" +SUBDIR+=boot +.endif # KLD modules build for both a.out and ELF .if defined(MODULES_WITH_WORLD) From owner-p4-projects@FreeBSD.ORG Mon May 5 14:43:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9FF7E37B401; Mon, 5 May 2003 14:43:31 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3EA0837B404 for ; Mon, 5 May 2003 14:43:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8AD3743F75 for ; Mon, 5 May 2003 14:43:30 -0700 (PDT) (envelope-from obrien@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h45LhU0U012605 for ; Mon, 5 May 2003 14:43:30 -0700 (PDT) (envelope-from obrien@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h45LhU4M012602 for perforce@freebsd.org; Mon, 5 May 2003 14:43:30 -0700 (PDT) Date: Mon, 5 May 2003 14:43:30 -0700 (PDT) Message-Id: <200305052143.h45LhU4M012602@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to obrien@freebsd.org using -f From: "David E. O'Brien" To: Perforce Change Reviews Subject: PERFORCE change 30636 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2003 21:43:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=30636 Change 30636 by obrien@obrien_trang on 2003/05/05 14:43:24 Make this usable -- the misc Binutil utils supidily uses the configure tuple, rahter than the default emution to decide which emulation to to process with. Affected files ... .. //depot/projects/hammer/gnu/usr.bin/binutils/libbinutils/Makefile#4 edit Differences ... ==== //depot/projects/hammer/gnu/usr.bin/binutils/libbinutils/Makefile#4 (text+ko) ==== @@ -14,7 +14,7 @@ .else BINUTILS_ARCH=${TARGET_ARCH} .endif -CFLAGS+= -DTARGET=\"${BINUTILS_ARCH}-unknown-freebsd\" +CFLAGS+= -DTARGET=\"${BINUTILS_ARCH}-undermyevildesk-freebsd\" CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\" CFLAGS+= -I${SRCDIR}/binutils CFLAGS+= -I${SRCDIR}/bfd From owner-p4-projects@FreeBSD.ORG Mon May 5 14:47:50 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9444937B404; Mon, 5 May 2003 14:47:49 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2DB3137B401 for ; Mon, 5 May 2003 14:47:49 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B98F143F85 for ; Mon, 5 May 2003 14:47:48 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h45Llm0U012792 for ; Mon, 5 May 2003 14:47:48 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h45LlmYq012789 for perforce@freebsd.org; Mon, 5 May 2003 14:47:48 -0700 (PDT) Date: Mon, 5 May 2003 14:47:48 -0700 (PDT) Message-Id: <200305052147.h45LlmYq012789@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30637 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2003 21:47:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=30637 Change 30637 by peter@peter_daintree on 2003/05/05 14:46:46 add amd64 to the list of arches that ignore gprof and truss Affected files ... .. //depot/projects/hammer/usr.bin/Makefile#12 edit Differences ... ==== //depot/projects/hammer/usr.bin/Makefile#12 (text+ko) ==== @@ -11,7 +11,7 @@ _xlint= xlint .endif -.if ${MACHINE_ARCH} != "powerpc" +.if ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "amd64" _gprof= gprof _truss= truss .endif From owner-p4-projects@FreeBSD.ORG Mon May 5 14:49:53 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B1ADD37B401; Mon, 5 May 2003 14:49:52 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4B7E337B408 for ; Mon, 5 May 2003 14:49:52 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D6C1543F75 for ; Mon, 5 May 2003 14:49:51 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h45Lnp0U012879 for ; Mon, 5 May 2003 14:49:51 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h45LnpTC012873 for perforce@freebsd.org; Mon, 5 May 2003 14:49:51 -0700 (PDT) Date: Mon, 5 May 2003 14:49:51 -0700 (PDT) Message-Id: <200305052149.h45LnpTC012873@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30638 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2003 21:49:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=30638 Change 30638 by peter@peter_daintree on 2003/05/05 14:48:57 add amd64 Affected files ... .. //depot/projects/hammer/usr.bin/xlint/lint1/param.h#3 edit Differences ... ==== //depot/projects/hammer/usr.bin/xlint/lint1/param.h#3 (text+ko) ==== @@ -65,6 +65,9 @@ #ifdef __ia64__ #define PTRDIFF_IS_LONG 1 #define SIZEOF_IS_ULONG 1 +#elif __amd64__ +#define PTRDIFF_IS_LONG 1 +#define SIZEOF_IS_ULONG 1 #elif __alpha__ #define PTRDIFF_IS_LONG 1 #define SIZEOF_IS_ULONG 1 From owner-p4-projects@FreeBSD.ORG Mon May 5 15:05:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ECDE837B404; Mon, 5 May 2003 15:05:13 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8AD1237B401 for ; Mon, 5 May 2003 15:05:13 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3000343F3F for ; Mon, 5 May 2003 15:05:13 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h45M5C0U014989 for ; Mon, 5 May 2003 15:05:12 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h45M5CMM014986 for perforce@freebsd.org; Mon, 5 May 2003 15:05:12 -0700 (PDT) Date: Mon, 5 May 2003 15:05:12 -0700 (PDT) Message-Id: <200305052205.h45M5CMM014986@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30639 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2003 22:05:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=30639 Change 30639 by marcel@marcel_nfs on 2003/05/05 15:04:42 Actually remove a couple more device flags we don't use: COM_NOFIFO, COM_ST16650A, COM_TI16754 and COM_FIFOSIZE are kludges we don't need, now that we probe the FIFO size and we also don't want because we should probe the UART for additional features. COM_NOPROBE was not used before I started axing. COM_NOSCR was mainly used to kludge around phase ordering. We don't need to access the scratch pad, unless we need (want) to destinguish between 8250 and 16450. This depends on the existence of a FIFO and should not be done unconditionally. Affected files ... .. //depot/projects/sio/sys/dev/sio/sio.c#8 edit Differences ... ==== //depot/projects/sio/sys/dev/sio/sio.c#8 (text+ko) ==== @@ -90,16 +90,9 @@ | ((unit) & 0x1f)) #define COM_LOSESOUTINTS(flags) ((flags) & 0x08) -#define COM_NOFIFO(flags) ((flags) & 0x02) #define COM_PPSCTS(flags) ((flags) & 0x10000) -#define COM_ST16650A(flags) ((flags) & 0x20000) -#define COM_C_NOPROBE (0x40000) -#define COM_NOPROBE(flags) ((flags) & COM_C_NOPROBE) #define COM_C_IIR_TXRDYBUG (0x80000) #define COM_IIR_TXRDYBUG(flags) ((flags) & COM_C_IIR_TXRDYBUG) -#define COM_NOSCR(flags) ((flags) & 0x100000) -#define COM_TI16754(flags) ((flags) & 0x200000) -#define COM_FIFOSIZE(flags) (((flags) & 0xff000000) >> 24) /* * com state bits. From owner-p4-projects@FreeBSD.ORG Mon May 5 15:52:27 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 308C937B47B; Mon, 5 May 2003 15:52:24 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AD89637B47C for ; Mon, 5 May 2003 15:52:23 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 648F144086 for ; Mon, 5 May 2003 15:51:17 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h45MpA0U017476 for ; Mon, 5 May 2003 15:51:10 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h45MpAvs017473 for perforce@freebsd.org; Mon, 5 May 2003 15:51:10 -0700 (PDT) Date: Mon, 5 May 2003 15:51:10 -0700 (PDT) Message-Id: <200305052251.h45MpAvs017473@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 30642 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2003 22:52:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=30642 Change 30642 by rwatson@rwatson_tislabs on 2003/05/05 15:50:27 Restore older ordering of zeroing pcb pointer in socket to minimize diff against -current. Affected files ... .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_subr.c#31 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/netinet/tcp_subr.c#31 (text+ko) ==== @@ -1648,11 +1648,11 @@ } tcp_discardcb(tp); so = inp->inp_socket; + so->so_pcb = NULL; tw->tw_cred = crhold(so->so_cred); tw->tw_so_options = so->so_options; if (acknow) tcp_twrespond(tw, so, NULL, TH_ACK); - so->so_pcb = NULL; sotryfree(so); inp->inp_socket = NULL; inp->inp_ppcb = (caddr_t)tw; From owner-p4-projects@FreeBSD.ORG Mon May 5 16:09:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 23C5737B404; Mon, 5 May 2003 16:09:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B177F37B401 for ; Mon, 5 May 2003 16:09:34 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C64D043F85 for ; Mon, 5 May 2003 16:09:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h45N9X0U019027 for ; Mon, 5 May 2003 16:09:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h45N9XDO019024 for perforce@freebsd.org; Mon, 5 May 2003 16:09:33 -0700 (PDT) Date: Mon, 5 May 2003 16:09:33 -0700 (PDT) Message-Id: <200305052309.h45N9XDO019024@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30643 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2003 23:09:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=30643 Change 30643 by peter@peter_daintree on 2003/05/05 16:09:03 IFC @30641 (repocopied machine/ieeefp.h from i386 on cvs) Affected files ... .. //depot/projects/hammer/UPDATING#11 integrate .. //depot/projects/hammer/etc/newsyslog.conf#6 integrate .. //depot/projects/hammer/etc/pccard_ether#3 integrate .. //depot/projects/hammer/etc/remote#2 integrate .. //depot/projects/hammer/etc/services#4 integrate .. //depot/projects/hammer/lib/libpam/libpam/Makefile#5 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#7 integrate .. //depot/projects/hammer/sbin/Makefile#4 integrate .. //depot/projects/hammer/sbin/bsdlabel/Makefile#4 integrate .. //depot/projects/hammer/share/mk/bsd.sys.mk#6 integrate .. //depot/projects/hammer/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/hammer/sys/conf/NOTES#16 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#12 integrate .. //depot/projects/hammer/sys/kern/kern_subr.c#5 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#15 integrate .. //depot/projects/hammer/sys/kern/uipc_syscalls.c#7 integrate .. //depot/projects/hammer/sys/sys/signalvar.h#5 integrate .. //depot/projects/hammer/sys/sys/syscallsubr.h#6 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.c#7 integrate Differences ... ==== //depot/projects/hammer/UPDATING#11 (text+ko) ==== @@ -17,6 +17,11 @@ developers choose to disable these features on build machines to maximize performance. +20030505: + Kerberos 5 (Heimdal) is now built by default. Setting + MAKE_KERBEROS5 no longer has any effect. If you do NOT + want the "base" Kerberos 5, you need to set NO_KERBEROS. + 20030502: groff has been updated. If you try to do a buildworld and get an infinite loop in troff, update to May 4th or newer. If you @@ -1273,4 +1278,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.250 2003/05/04 06:26:30 imp Exp $ +$FreeBSD: src/UPDATING,v 1.251 2003/05/05 20:05:37 markm Exp $ ==== //depot/projects/hammer/etc/newsyslog.conf#6 (text+ko) ==== @@ -1,5 +1,14 @@ # configuration file for newsyslog -# $FreeBSD: src/etc/newsyslog.conf,v 1.44 2003/04/08 16:14:02 des Exp $ +# $FreeBSD: src/etc/newsyslog.conf,v 1.46 2003/05/05 19:08:33 gad Exp $ +# +# Entries which do not specify the '/pid_file' field will cause the +# syslogd process to be signalled when that log file is rotated. This +# action is only appropriate for log files which are written to by the +# syslogd process (ie, files listed in /etc/syslogd.conf). If there +# is no process which needs to be signalled when a given log file is +# rotated, then the entry for that file should include the 'N' flag. +# +# The 'flags' field is one or more of the letters: BCGJNUWZ or a '-'. # # Note: some sites will want to select more restrictive protections than the # defaults. In particular, it may be desirable to switch many of the 644 @@ -7,23 +16,23 @@ # contents of maillog, messages, and lpd-errs to be confidential. In the # future, these defaults may change to more conservative ones. # -# logfilename [owner:group] mode count size when [ZJB] [/pid_file] [sig_num] +# logfilename [owner:group] mode count size when flags [/pid_file] [sig_num] /var/log/all.log 600 7 * @T00 J /var/log/amd.log 644 7 100 * J /var/log/auth.log 600 7 100 * J /var/log/console.log 600 5 100 * J /var/log/cron 600 3 100 * J -/var/log/daily.log 640 7 * @T00 J +/var/log/daily.log 640 7 * @T00 JN /var/log/debug.log 600 7 100 * J /var/log/kerberos.log 600 7 100 * J /var/log/lpd-errs 644 7 100 * J /var/log/maillog 640 7 * @T00 J /var/log/messages 644 5 100 * J -/var/log/monthly.log 640 12 * $M1D0 J +/var/log/monthly.log 640 12 * $M1D0 JN /var/log/ppp.log root:network 640 3 100 * J /var/log/security 600 10 100 * J /var/log/sendmail.st 640 10 * 168 B /var/log/slip.log root:network 640 3 100 * J -/var/log/weekly.log 640 5 1 $W6D0 J +/var/log/weekly.log 640 5 1 $W6D0 JN /var/log/wtmp 644 3 * @01T05 B /var/log/xferlog 600 7 100 * J ==== //depot/projects/hammer/etc/pccard_ether#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/etc/pccard_ether,v 1.28 2002/12/12 09:31:09 imp Exp $ +# $FreeBSD: src/etc/pccard_ether,v 1.29 2003/05/05 19:06:46 ume Exp $ # # pccard_ether interfacename [start|stop] [ifconfig option] # @@ -134,8 +134,8 @@ # IPv6 setup case ${ipv6_enable} in [Yy][Ee][Ss]) - if [ -r /etc/rc.network6 ]; then - . /etc/rc.network6 + if [ -r /etc/rc.d/network_ipv6 ]; then + . /etc/rc.d/network_ipv6 network6_interface_setup ${interface} fi ;; ==== //depot/projects/hammer/etc/remote#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/remote,v 1.11 2001/02/21 19:45:47 nik Exp $ +# $FreeBSD: src/etc/remote,v 1.12 2003/05/05 21:37:43 dougb Exp $ # # @(#)remote 5.2 (Berkeley) 6/30/90 # @@ -52,7 +52,7 @@ cuaa0c|cua0c:dv=/dev/cuaa0:br#9600:pa=none: # Finger friendly shortcuts -com1:dv=/dev/cuaa0:br#9600:pa=none: -com2:dv=/dev/cuaa1:br#9600:pa=none: -com3:dv=/dev/cuaa2:br#9600:pa=none: -com4:dv=/dev/cuaa3:br#9600:pa=none: +sio0|com1:dv=/dev/cuaa0:br#9600:pa=none: +sio1|com2:dv=/dev/cuaa1:br#9600:pa=none: +sio2|com3:dv=/dev/cuaa2:br#9600:pa=none: +sio3|com4:dv=/dev/cuaa3:br#9600:pa=none: ==== //depot/projects/hammer/etc/services#4 (text+ko) ==== @@ -16,7 +16,7 @@ # Kerberos services are for Kerberos v4, and are unofficial. Sites running # v5 should uncomment v5 entries and comment v4 entries. # -# $FreeBSD: src/etc/services,v 1.92 2003/04/29 09:54:06 mdodd Exp $ +# $FreeBSD: src/etc/services,v 1.93 2003/05/05 22:10:14 dougb Exp $ # From: @(#)services 5.8 (Berkeley) 5/9/91 # # WELL KNOWN PORT NUMBERS @@ -1198,6 +1198,7 @@ accessbuilder 888/tcp accessbuilder 888/udp swat 901/tcp # samba web configuration tool +rndc 953/tcp # named's rndc control socket ftps-data 989/tcp # ftp protocol, data, over TLS/SSL ftps-data 989/udp ftps 990/tcp # ftp protocol, control, over TLS/SSL @@ -1922,6 +1923,8 @@ dec-notes 3333/tcp #DEC Notes dec-notes 3333/udp #DEC Notes rsvp-encap 3455/udp #RSVP encapsulated in UDP +nut 3493/tcp #Network UPS Tools +nut 3493/udp #Network UPS Tools mapper-nodemgr 3984/tcp #MAPPER network node manager mapper-nodemgr 3984/udp #MAPPER network node manager mapper-mapethd 3985/tcp #MAPPER TCP/IP server ==== //depot/projects/hammer/lib/libpam/libpam/Makefile#5 (text+ko) ==== @@ -33,7 +33,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/libpam/Makefile,v 1.43 2003/05/01 14:55:06 des Exp $ +# $FreeBSD: src/lib/libpam/libpam/Makefile,v 1.44 2003/05/05 21:15:35 des Exp $ OPENPAM= ${.CURDIR}/../../../contrib/openpam .PATH: ${OPENPAM}/include ${OPENPAM}/lib ${OPENPAM}/doc/man @@ -127,7 +127,7 @@ pam_vprompt.3 CSTD?= c99 -WARNS?= 5 +WARNS?= 6 CFLAGS+= -I${.CURDIR} -I${OPENPAM}/include CFLAGS+= -DLIB_MAJ=${SHLIB_MAJOR} ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#7 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -2207,8 +2207,8 @@ Features: - 21164 EV5 CPUs at 266, 300 MHz or 21164A EV56 - CPUs at 400, 466, 533, 600 and 666 Mhz + 21164 EV5 CPUs at 266, 300, 333 MHz or 21164A EV56 + CPUs at 400, 466, 533, 600 Mhz cache: 4 Mbytes per CPU. EV5 300 MHz was also ==== //depot/projects/hammer/sbin/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 -# $FreeBSD: src/sbin/Makefile,v 1.119 2003/03/02 01:50:32 mckusick Exp $ +# $FreeBSD: src/sbin/Makefile,v 1.120 2003/05/05 21:28:07 phk Exp $ # XXX MISSING: icheck ncheck @@ -7,6 +7,7 @@ atacontrol \ atm \ badsect \ + bsdlabel \ camcontrol \ ccdconfig \ clri \ @@ -94,7 +95,6 @@ SUBDIR+=cxconfig \ mount_nwfs \ mount_smbfs -SUBDIR+=disklabel .if ${MACHINE} == "pc98" SUBDIR+=fdisk_pc98 .else @@ -104,15 +104,10 @@ .if ${MACHINE_ARCH} == "ia64" SUBDIR+=fdisk \ - disklabel \ gpt \ mca .endif -.if ${MACHINE_ARCH} == "alpha" -SUBDIR+=disklabel -.endif - .if ${MACHINE_ARCH} == "sparc64" SUBDIR+=sunlabel .endif ==== //depot/projects/hammer/sbin/bsdlabel/Makefile#4 (text+ko) ==== @@ -1,11 +1,21 @@ # @(#)Makefile 8.2 (Berkeley) 3/17/94 -# $FreeBSD: src/sbin/bsdlabel/Makefile,v 1.14 2003/05/03 08:04:24 phk Exp $ +# $FreeBSD: src/sbin/bsdlabel/Makefile,v 1.15 2003/05/05 21:28:08 phk Exp $ PROG= bsdlabel SRCS= bsdlabel.c geom_bsd_enc.c #MAN+= bsdlabel.5 MAN+= bsdlabel.8 +.if ${MACHINE_ARCH} == "i386" +LINKS= ${BINDIR}/bsdlabel ${BINDIR}/disklabel +MLINKS+= bsdlabel.8 disklabel.8 +.endif + +.if ${MACHINE_ARCH} == "alpha" +LINKS= ${BINDIR}/bsdlabel ${BINDIR}/disklabel +MLINKS+= bsdlabel.8 disklabel.8 +.endif + DDADD= ${LIBGEOM} LDADD= -lgeom -lbsdxml -lsbuf ==== //depot/projects/hammer/share/mk/bsd.sys.mk#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.sys.mk,v 1.15 2003/05/01 14:36:27 des Exp $ +# $FreeBSD: src/share/mk/bsd.sys.mk,v 1.17 2003/05/05 21:14:36 des Exp $ # # This file contains common settings used for building FreeBSD # sources. @@ -11,14 +11,17 @@ .if !defined(NO_WARNS) . if defined(CSTD) . if ${CSTD} == "k&r" -CFLAGS += -traditional +CFLAGS += -traditional . elif ${CSTD} == "c89" || ${CSTD} == "c90" -CFLAGS += -std=iso9899:1990 +CFLAGS += -std=iso9899:1990 . elif ${CSTD} == "c94" || ${CSTD} == "c95" -CFLAGS += -std=iso9899:199409 +CFLAGS += -std=iso9899:199409 . elif ${CSTD} == "c99" -CFLAGS += -std=iso9899:1999 +CFLAGS += -std=iso9899:1999 +. else +CFLAGS += -std=${CSTD} . endif +CFLAGS += -pedantic . endif . if defined(WARNS) . if ${WARNS} > 0 @@ -38,7 +41,7 @@ . endif # BDECFLAGS . if ${WARNS} > 5 -CFLAGS += -pedantic -Wno-long-long -Wbad-function-cast -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls +CFLAGS += -Wbad-function-cast -Wchar-subscripts -Winline -Wnested-externs -Wredundant-decls . endif . if ${WARNS} > 1 && ${WARNS} < 5 # XXX Delete -Wuninitialized by default for now -- the compiler doesn't ==== //depot/projects/hammer/sys/conf/NOTES#16 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1147 2003/05/03 10:16:55 akiyama Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1148 2003/05/05 21:21:31 phk Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -116,15 +116,15 @@ # options INCLUDE_CONFIG_FILE # Include this file in kernel -options GEOM_AES -options GEOM_APPLE -options GEOM_BDE -options GEOM_BSD -options GEOM_GPT -options GEOM_MBR -options GEOM_PC98 -options GEOM_SUNLABEL -options GEOM_VOL +options GEOM_AES # Don't use, use GEOM_BDE +options GEOM_APPLE # Apple partitioning +options GEOM_BDE # Disk encryption. +options GEOM_BSD # BSD disklabels +options GEOM_GPT # GPT partitioning +options GEOM_MBR # DOS/MBR partitioning +options GEOM_PC98 # NEC PC9800 partitioning +options GEOM_SUNLABEL # Sun/Solaris partitioning +options GEOM_VOL # Volume names from UFS superblock # # The root device and filesystem type can be compiled in; ==== //depot/projects/hammer/sys/kern/kern_sig.c#12 (text+ko) ==== @@ -36,40 +36,40 @@ * SUCH DAMAGE. * * @(#)kern_sig.c 8.7 (Berkeley) 4/18/94 - * $FreeBSD: src/sys/kern/kern_sig.c,v 1.233 2003/04/30 19:45:13 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_sig.c,v 1.236 2003/05/05 21:26:25 jhb Exp $ */ #include "opt_compat.h" #include "opt_ktrace.h" #include -#include -#include #include #include -#include #include +#include +#include #include -#include -#include -#include #include -#include +#include +#include +#include #include +#include #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include +#include +#include #include -#include -#include -#include +#include #include +#include #include @@ -82,6 +82,7 @@ static int coredump(struct thread *); static char *expand_name(const char *, uid_t, pid_t); static int killpg1(struct thread *td, int sig, int pgid, int all); +static int issignal(struct thread *p); static int sigprop(int sig); static void stop(struct proc *); static void tdsigwakeup(struct thread *td, int sig, sig_t action); @@ -731,9 +732,11 @@ error = copyout(&info.si_signo, uap->sig, sizeof(info.si_signo)); /* Repost if we got an error. */ - if (error && info.si_signo) + if (error && info.si_signo) { + PROC_LOCK(td->td_proc); tdsignal(td, info.si_signo); - + PROC_UNLOCK(td->td_proc); + } return (error); } /* @@ -767,9 +770,11 @@ error = copyout(&info, uap->info, sizeof(info)); /* Repost if we got an error. */ - if (error && info.si_signo) + if (error && info.si_signo) { + PROC_LOCK(td->td_proc); tdsignal(td, info.si_signo); - + PROC_UNLOCK(td->td_proc); + } return (error); } @@ -793,9 +798,11 @@ error = copyout(&info, uap->info, sizeof(info)); /* Repost if we got an error. */ - if (error && info.si_signo) + if (error && info.si_signo) { + PROC_LOCK(td->td_proc); tdsignal(td, info.si_signo); - + PROC_UNLOCK(td->td_proc); + } return (error); } @@ -1886,7 +1893,7 @@ * while (sig = cursig(curthread)) * postsig(sig); */ -int +static int issignal(td) struct thread *td; { ==== //depot/projects/hammer/sys/kern/kern_subr.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_subr.c 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/kern_subr.c,v 1.73 2003/03/25 20:13:24 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_subr.c,v 1.74 2003/05/05 21:27:29 jhb Exp $ */ #include "opt_zero.h" @@ -185,9 +185,9 @@ n -= cnt; } out: - if (td) { + if (td && save == 0) { mtx_lock_spin(&sched_lock); - td->td_flags = (td->td_flags & ~TDF_DEADLKTREAT) | save; + td->td_flags &= ~TDF_DEADLKTREAT; mtx_unlock_spin(&sched_lock); } return (error); ==== //depot/projects/hammer/sys/kern/kern_synch.c#15 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_synch.c 8.9 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/kern/kern_synch.c,v 1.220 2003/05/01 17:05:24 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_synch.c,v 1.221 2003/05/05 21:12:36 jhb Exp $ */ #include "opt_ddb.h" @@ -467,9 +467,7 @@ p = td->td_proc; /* XXX */ KASSERT(!TD_ON_RUNQ(td), ("mi_switch: called by old code")); #ifdef INVARIANTS - if (!TD_ON_LOCK(td) && - !TD_ON_RUNQ(td) && - !TD_IS_RUNNING(td)) + if (!TD_ON_LOCK(td) && !TD_IS_RUNNING(td)) mtx_assert(&Giant, MA_NOTOWNED); #endif KASSERT(td->td_critnest == 1, ==== //depot/projects/hammer/sys/kern/uipc_syscalls.c#7 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)uipc_syscalls.c 8.4 (Berkeley) 2/21/94 - * $FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.145 2003/03/31 06:25:42 alc Exp $ + * $FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.146 2003/05/05 20:33:37 dwmalone Exp $ */ #include "opt_compat.h" @@ -619,47 +619,18 @@ register struct msghdr *mp; int flags; { - struct uio auio; - register struct iovec *iov; - register int i; struct mbuf *control; - struct sockaddr *to = NULL; - int len, error; - struct socket *so; -#ifdef KTRACE - struct iovec *ktriov = NULL; - struct uio ktruio; - int iovlen; -#endif + struct sockaddr *to; + int error; - if ((error = fgetsock(td, s, &so, NULL)) != 0) - return (error); - -#ifdef MAC - error = mac_check_socket_send(td->td_ucred, so); - if (error) - goto bad; -#endif - - auio.uio_iov = mp->msg_iov; - auio.uio_iovcnt = mp->msg_iovlen; - auio.uio_segflg = UIO_USERSPACE; - auio.uio_rw = UIO_WRITE; - auio.uio_td = td; - auio.uio_offset = 0; /* XXX */ - auio.uio_resid = 0; - iov = mp->msg_iov; - for (i = 0; i < mp->msg_iovlen; i++, iov++) { - if ((auio.uio_resid += iov->iov_len) < 0) { - error = EINVAL; - goto bad; - } - } - if (mp->msg_name) { + if (mp->msg_name != NULL) { error = getsockaddr(&to, mp->msg_name, mp->msg_namelen); if (error) - goto bad; - } + return error; + mp->msg_name = to; + } else + to = NULL; + if (mp->msg_control) { if (mp->msg_controllen < sizeof(struct cmsghdr) #ifdef COMPAT_OLDSOCK @@ -690,7 +661,59 @@ } #endif } else { - control = 0; + control = NULL; + } + + error = kern_sendit(td, s, mp, flags, control); + +bad: + if (to) + FREE(to, M_SONAME); + return (error); +} + +int +kern_sendit(td, s, mp, flags, control) + struct thread *td; + int s; + struct msghdr *mp; + int flags; + struct mbuf *control; +{ + struct uio auio; + struct iovec *iov; + struct socket *so; + int i; + int len, error; +#ifdef KTRACE + struct iovec *ktriov = NULL; + struct uio ktruio; + int iovlen; +#endif + + mtx_lock(&Giant); + if ((error = fgetsock(td, s, &so, NULL)) != 0) + goto bad2; + +#ifdef MAC + error = mac_check_socket_send(td->td_ucred, so); + if (error) + goto bad; +#endif + + auio.uio_iov = mp->msg_iov; + auio.uio_iovcnt = mp->msg_iovlen; + auio.uio_segflg = UIO_USERSPACE; + auio.uio_rw = UIO_WRITE; + auio.uio_td = td; + auio.uio_offset = 0; /* XXX */ + auio.uio_resid = 0; + iov = mp->msg_iov; + for (i = 0; i < mp->msg_iovlen; i++, iov++) { + if ((auio.uio_resid += iov->iov_len) < 0) { + error = EINVAL; + goto bad; + } } #ifdef KTRACE if (KTRPOINT(td, KTR_GENIO)) { @@ -701,8 +724,8 @@ } #endif len = auio.uio_resid; - error = so->so_proto->pr_usrreqs->pru_sosend(so, to, &auio, 0, control, - flags, td); + error = so->so_proto->pr_usrreqs->pru_sosend(so, mp->msg_name, &auio, + 0, control, flags, td); if (error) { if (auio.uio_resid != len && (error == ERESTART || error == EINTR || error == EWOULDBLOCK)) @@ -728,8 +751,8 @@ #endif bad: fputsock(so); - if (to) - FREE(to, M_SONAME); +bad2: + mtx_unlock(&Giant); return (error); } @@ -762,9 +785,7 @@ #endif aiov.iov_base = uap->buf; aiov.iov_len = uap->len; - mtx_lock(&Giant); error = sendit(td, uap->s, &msg, uap->flags); - mtx_unlock(&Giant); return (error); } @@ -794,9 +815,7 @@ aiov.iov_len = uap->len; msg.msg_control = 0; msg.msg_flags = 0; - mtx_lock(&Giant); error = sendit(td, uap->s, &msg, uap->flags); - mtx_unlock(&Giant); return (error); } @@ -816,7 +835,6 @@ struct iovec aiov[UIO_SMALLIOV], *iov; int error; - mtx_lock(&Giant); error = copyin(uap->msg, &msg, sizeof (struct omsghdr)); if (error) goto done2; @@ -842,7 +860,6 @@ if (iov != aiov) FREE(iov, M_IOV); done2: - mtx_unlock(&Giant); return (error); } #endif @@ -863,7 +880,6 @@ struct iovec aiov[UIO_SMALLIOV], *iov; int error; - mtx_lock(&Giant); error = copyin(uap->msg, &msg, sizeof (msg)); if (error) goto done2; @@ -891,7 +907,6 @@ if (iov != aiov) FREE(iov, M_IOV); done2: - mtx_unlock(&Giant); return (error); } ==== //depot/projects/hammer/sys/sys/signalvar.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)signalvar.h 8.6 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/signalvar.h,v 1.59 2003/04/30 19:57:21 jhb Exp $ + * $FreeBSD: src/sys/sys/signalvar.h,v 1.60 2003/05/05 21:16:28 jhb Exp $ */ #ifndef _SYS_SIGNALVAR_H_ @@ -238,7 +238,6 @@ int cursig(struct thread *td); void execsigs(struct proc *p); void gsignal(int pgid, int sig); -int issignal(struct thread *p); void killproc(struct proc *p, char *why); void pgsigio(struct sigio **, int signum, int checkctty); void pgsignal(struct pgrp *pgrp, int sig, int checkctty); ==== //depot/projects/hammer/sys/sys/syscallsubr.h#6 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/syscallsubr.h,v 1.8 2003/05/05 09:22:58 mbr Exp $ + * $FreeBSD: src/sys/sys/syscallsubr.h,v 1.9 2003/05/05 20:33:38 dwmalone Exp $ */ #ifndef _SYS_SYSCALLSUBR_H_ @@ -32,6 +32,8 @@ #include struct sockaddr; +struct msghdr; +struct mbuf; int kern___getcwd(struct thread *td, u_char *buf, enum uio_seg bufseg, u_int buflen); @@ -70,6 +72,8 @@ int kern_rmdir(struct thread *td, char *path, enum uio_seg pathseg); int kern_select(struct thread *td, int nd, fd_set *fd_in, fd_set *fd_ou, fd_set *fd_ex, struct timeval *tvp); +int kern_sendit(struct thread *td, int s, struct msghdr *mp, int flags, + struct mbuf *control); int kern_shmat(struct thread *td, int shmid, const void *shmaddr, int shmflg, int wantrem); int kern_shmctl(struct thread *td, int shmid, int cmd, void *buf, ==== //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.c#7 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/newsyslog/newsyslog.c,v 1.68 2003/05/03 21:06:38 obrien Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/newsyslog/newsyslog.c,v 1.69 2003/05/05 22:27:37 gad Exp $"); #define OSF #ifndef COMPRESS_POSTFIX @@ -155,6 +155,7 @@ * range 0 to 255, plus EOF. Define wrappers which can take * values of type 'char', either signed or unsigned. */ +#define isdigitch(Anychar) isdigit(((int) Anychar) & 255) #define isprintch(Anychar) isprint(((int) Anychar) & 255) #define isspacech(Anychar) isspace(((int) Anychar) & 255) #define tolowerch(Anychar) tolower(((int) Anychar) & 255) @@ -949,10 +950,15 @@ errx(1, "malformed line (missing fields):\n%s", errline); *parse = '\0'; - if (isdigit(*q)) + if (isdigitch(*q)) working->size = atoi(q); - else + else if (strcmp(q,"*") == 0) + working->size = -1; + else { + warnx("Invalid value of '%s' for 'size' in line:\n%s", + q, errline); working->size = -1; + } working->flags = 0; q = parse = missing_field(sob(++parse), errline); From owner-p4-projects@FreeBSD.ORG Mon May 5 16:41:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D340637B404; Mon, 5 May 2003 16:41:13 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7425037B401 for ; Mon, 5 May 2003 16:41:13 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 20D5743F85 for ; Mon, 5 May 2003 16:41:13 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h45NfC0U020281 for ; Mon, 5 May 2003 16:41:12 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h45NfCYo020278 for perforce@freebsd.org; Mon, 5 May 2003 16:41:12 -0700 (PDT) Date: Mon, 5 May 2003 16:41:12 -0700 (PDT) Message-Id: <200305052341.h45NfCYo020278@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30645 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2003 23:41:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=30645 Change 30645 by peter@peter_daintree on 2003/05/05 16:40:20 I just dont see how this can work, given that we don't have stack frames. The compiler uses xxx(%rsp) offsets instead of xxx(%rbp) like on i386. Affected files ... .. //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#6 edit Differences ... ==== //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#6 (text+ko) ==== @@ -1,6 +1,6 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 # $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.19 2003/04/30 18:08:01 peter Exp $ -SRCS+= _setjmp.S setjmp.S sigsetjmp.S alloca.S \ +SRCS+= _setjmp.S setjmp.S sigsetjmp.S \ fabs.S modf.S \ frexp.c infinity.c isinf.c From owner-p4-projects@FreeBSD.ORG Mon May 5 16:53:29 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F00537B404; Mon, 5 May 2003 16:53:29 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 100E437B401 for ; Mon, 5 May 2003 16:53:29 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9BB8E43F3F for ; Mon, 5 May 2003 16:53:28 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h45NrS0U025906 for ; Mon, 5 May 2003 16:53:28 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h45NrSPH025903 for perforce@freebsd.org; Mon, 5 May 2003 16:53:28 -0700 (PDT) Date: Mon, 5 May 2003 16:53:28 -0700 (PDT) Message-Id: <200305052353.h45NrSPH025903@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30646 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 May 2003 23:53:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=30646 Change 30646 by peter@peter_daintree on 2003/05/05 16:52:52 like ia64, long double is 16 bytes. Affected files ... .. //depot/projects/hammer/lib/libc/amd64/_fpmath.h#5 edit Differences ... ==== //depot/projects/hammer/lib/libc/amd64/_fpmath.h#5 (text+ko) ==== @@ -33,7 +33,7 @@ unsigned int manh :32; unsigned int exp :15; unsigned int sign :1; - unsigned int junk :16; + unsigned int junk :48; } bits; }; From owner-p4-projects@FreeBSD.ORG Mon May 5 17:14:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9DF5B37B404; Mon, 5 May 2003 17:14:18 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 30E8B37B401 for ; Mon, 5 May 2003 17:14:18 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BEFE343F93 for ; Mon, 5 May 2003 17:14:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h460EF0U028223 for ; Mon, 5 May 2003 17:14:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h460DrDH027932 for perforce@freebsd.org; Mon, 5 May 2003 17:13:53 -0700 (PDT) Date: Mon, 5 May 2003 17:13:53 -0700 (PDT) Message-Id: <200305060013.h460DrDH027932@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 30647 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 May 2003 00:14:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=30647 Change 30647 by rwatson@rwatson_tislabs on 2003/05/05 17:13:02 Integrate the TrustedBSD MAC tree; pull in AMD64 support, additional process locking, troff upgrade, texinfo upgrade, sendmail upgrade, openssh upgrade, openpam upgrade, and a lot more. Loop back the move to m_tags. Affected files ... .. //depot/projects/trustedbsd/mac/MAINTAINERS#16 integrate .. //depot/projects/trustedbsd/mac/Makefile#20 integrate .. //depot/projects/trustedbsd/mac/Makefile.inc1#37 integrate .. //depot/projects/trustedbsd/mac/Makefile.upgrade#4 delete .. //depot/projects/trustedbsd/mac/UPDATING#26 integrate .. //depot/projects/trustedbsd/mac/bin/cat/cat.c#10 integrate .. //depot/projects/trustedbsd/mac/bin/chflags/chflags.c#2 integrate .. //depot/projects/trustedbsd/mac/bin/chio/chio.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/chmod/chmod.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/cp/cp.1#6 integrate .. //depot/projects/trustedbsd/mac/bin/cp/cp.c#12 integrate .. //depot/projects/trustedbsd/mac/bin/cp/extern.h#7 integrate .. //depot/projects/trustedbsd/mac/bin/cp/utils.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/csh/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/bin/dd/dd.c#10 integrate .. //depot/projects/trustedbsd/mac/bin/df/df.c#14 integrate .. //depot/projects/trustedbsd/mac/bin/domainname/domainname.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/echo/echo.1#3 integrate .. //depot/projects/trustedbsd/mac/bin/echo/echo.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/ed/ed.1#6 integrate .. //depot/projects/trustedbsd/mac/bin/ed/main.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/hostname/hostname.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/kill/kill.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/ln/ln.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/ls/extern.h#8 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.c#26 integrate .. //depot/projects/trustedbsd/mac/bin/ls/print.c#18 integrate .. //depot/projects/trustedbsd/mac/bin/ls/util.c#10 integrate .. //depot/projects/trustedbsd/mac/bin/mkdir/mkdir.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/mv/mv.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/pax/ar_io.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/pax/ar_subs.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/pax/cache.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/pax/cpio.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/pax/extern.h#4 integrate .. //depot/projects/trustedbsd/mac/bin/pax/gen_subs.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/pax/getoldopt.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/pax/options.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/pax/pat_rep.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/pax/pax.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/pax/pax.h#6 integrate .. //depot/projects/trustedbsd/mac/bin/pax/tar.1#7 integrate .. //depot/projects/trustedbsd/mac/bin/pax/tar.c#7 integrate .. //depot/projects/trustedbsd/mac/bin/ps/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/bin/ps/fmt.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/ps/keyword.c#17 integrate .. //depot/projects/trustedbsd/mac/bin/ps/print.c#21 integrate .. //depot/projects/trustedbsd/mac/bin/ps/ps.1#15 integrate .. //depot/projects/trustedbsd/mac/bin/ps/ps.h#7 integrate .. //depot/projects/trustedbsd/mac/bin/pwd/pwd.1#7 integrate .. //depot/projects/trustedbsd/mac/bin/pwd/pwd.c#8 integrate .. //depot/projects/trustedbsd/mac/bin/rcp/rcp.c#11 integrate .. //depot/projects/trustedbsd/mac/bin/rm/rm.c#9 integrate .. //depot/projects/trustedbsd/mac/bin/rmdir/rmdir.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/sh/Makefile#7 integrate .. //depot/projects/trustedbsd/mac/bin/sh/arith.y#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/arith_lex.l#4 integrate .. //depot/projects/trustedbsd/mac/bin/sh/mknodes.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/sh/mksyntax.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/sh/sh.1#12 integrate .. //depot/projects/trustedbsd/mac/bin/sleep/sleep.c#6 integrate .. //depot/projects/trustedbsd/mac/bin/stty/gfmt.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/stty/stty.c#5 integrate .. //depot/projects/trustedbsd/mac/bin/sync/sync.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/freebsd.h#12 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/freebsd64.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/i386.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/gdtoa/gdtoaimp.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/ChangeLog#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/FREEBSD-upgrade#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/INSTALL#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/MANIFEST#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/Makefile.ccpg#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/Makefile.comm#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/Makefile.dev#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/Makefile.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/Makefile.lib#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/NEWS#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/PROBLEMS#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/REVISION#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/VERSION#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/aclocal.m4#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/configure#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/configure.ac#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/groffer/ChangeLog#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/groffer/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/groffer/README#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/groffer/TODO#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/groffer/groffer.man#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/groffer/groffer.sh#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mm/ChangeLog#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mm/groff_mm.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mm/m.tmac#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mm/mm/4.MT#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/BUGS#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/ChangeLog#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/NEWS#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/examples/elvis_syntax#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/examples/typeset.mom#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/momdoc/docelement.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/momdoc/docprocessing.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/momdoc/goodies.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/momdoc/inlines.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/momdoc/intro.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/momdoc/reserved.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/momdoc/toc.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/momdoc/typesetting.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/mom/om.tmac#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/contrib/pic2graph/pic2graph.sh#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/doc/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/doc/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/doc/groff#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/doc/groff-1#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/doc/groff-10#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/doc/groff-11#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/doc/groff-2#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/doc/groff-3#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/doc/groff-4#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/doc/groff-5#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/doc/groff-6#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/doc/groff-7#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/doc/groff-8#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/doc/groff-9#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/doc/groff.texinfo#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/doc/pic.ms#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/doc/texinfo.tex#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/doc/webpage.ms#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100-12/CB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100-12/CBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100-12/CI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100-12/CR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100-12/HB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100-12/HBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100-12/HI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100-12/HR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100-12/NB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100-12/NBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100-12/NI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100-12/NR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100-12/S#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100-12/TB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100-12/TBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100-12/TI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100-12/TR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100/CB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100/CBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100/CI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100/CR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100/HB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100/HBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100/HI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100/HR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100/NB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100/NBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100/NI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100/NR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100/S#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100/TB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100/TBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100/TI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX100/TR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75-12/CB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75-12/CBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75-12/CI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75-12/CR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75-12/HB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75-12/HBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75-12/HI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75-12/HR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75-12/NB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75-12/NBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75-12/NI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75-12/NR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75-12/S#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75-12/TB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75-12/TBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75-12/TI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75-12/TR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75/CB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75/CBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75/CI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75/CR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75/HB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75/HBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75/HI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75/HR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75/NB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75/NBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75/NI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75/NR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75/S#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75/TB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75/TBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75/TI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devX75/TR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devascii/R.proto#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devcp1047/R.proto#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/CW#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/CWEC#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/CWI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/CWIEC#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/CWITC#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/CWTC#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/EX#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/HB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/HBEC#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/HBI#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/HBIEC#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/HBITC#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/HBTC#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/HI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/HIEC#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/HITC#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/HR#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/HREC#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/HRTC#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/MI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/S#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/SC#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/TB#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/TBEC#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/TBI#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/TBIEC#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/TBITC#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/TBTC#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/TI#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/TIEC#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/TITC#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/TR#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/TREC#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/TRTC#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/generate/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/generate/ec.map#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/generate/tc.map#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/generate/texb.map#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/generate/texex.map#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/generate/texi.map#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/generate/texmi.map#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/generate/texr.map#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/generate/texsy.map#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/generate/textex.map#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/font/devdvi/generate/textt.map#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devhtml/DESC.proto#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devhtml/R.proto#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlatin1/R.proto#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlbp/CB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlbp/CI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlbp/CR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlbp/EB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlbp/EI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlbp/ER#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlbp/HB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlbp/HBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlbp/HI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlbp/HNB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlbp/HNBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlbp/HNI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlbp/HNR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlbp/HR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlbp/TB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlbp/TBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlbp/TI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlbp/TR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/ALBB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/ALBR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/AOB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/AOI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/AOR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/CB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/CBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/CI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/CLARENDON#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/CORONET#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/CR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/GB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/GBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/GI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/GR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/LGB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/LGI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/LGR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/MARIGOLD#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/OB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/OBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/OI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/OR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/S#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/TB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/TBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/TI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/TR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/UB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/UBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/UCB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/UCBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/UCI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/UCR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/UI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/UR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/generate/special.map#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devlj4/generate/text.map#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/AB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/ABI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/AI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/AR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/BMB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/BMBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/BMI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/BMR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/CB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/CBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/CI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/CR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/EURO#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/HB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/HBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/HI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/HNB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/HNBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/HNI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/HNR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/HR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/NB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/NBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/NI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/NR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/PB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/PBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/PI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/PR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/S#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/SS#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/TB#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/TBI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/TI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/TR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/ZCMI#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/ZD#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/ZDR#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/download#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/freeeuro.afm#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/freeeuro.pfa#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/generate/Makefile#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/generate/freeeuro.sfd#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/generate/sfdtopfa.pe#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/generate/symbolchars#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/generate/textmap#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/prologue.ps#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devps/symbolmap#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devutf8/NOTES#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/font/devutf8/R.proto#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/man/groff.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/man/groff_char.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/man/groff_diff.man#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/man/groff_font.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/man/groff_out.man#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/man/groff_tmac.man#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/man/roff.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grodvi/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grodvi/dvi.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grodvi/dvi.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grodvi/grodvi.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grohtml/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grohtml/html-table.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grohtml/html-table.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grohtml/html-table.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grohtml/html-text.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grohtml/html-text.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grohtml/html-text.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grohtml/output.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grohtml/output.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grohtml/post-html.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grohtml/post-html.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grolbp/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grolbp/charset.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grolbp/lbp.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grolbp/lbp.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grolbp/lbp.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grolj4/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grolj4/lj4.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grolj4/lj4.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grops/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grops/TODO#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grops/grops.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grops/ps.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grops/ps.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grops/ps.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grops/psrm.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grops/psrm.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grotty/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grotty/tty.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/devices/grotty/tty.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/color.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/config.hin#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/driver.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/error.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/html-strings.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/lib.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/nonposix.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/printer.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/include/ptable.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libbib/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libbib/common.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libbib/common.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libbib/index.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libbib/index.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libbib/linear.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libbib/linear.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libbib/search.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libbib/search.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libdriver/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libdriver/input.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libdriver/input.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libdriver/printer.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libdriver/printer.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/assert.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/assert.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/change_lf.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/change_lf.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/cmap.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/cmap.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/color.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/color.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/cset.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/cset.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/device.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/device.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/errarg.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/errarg.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/error.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/error.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/fatal.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/fatal.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/filename.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/filename.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/font.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/font.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/fontfile.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/fontfile.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/geometry.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/geometry.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/htmlhint.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/htmlhint.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/invalid.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/invalid.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/lf.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/lf.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/lineno.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/lineno.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/macropath.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/macropath.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/maxfilename.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/maxfilename.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/mksdir.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/mksdir.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/mkstemp.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/mkstemp.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/nametoindex.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/nametoindex.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/new.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/new.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/paper.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/paper.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/prime.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/prime.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/progname.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/progname.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/ptable.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/ptable.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/searchpath.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/searchpath.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/strcasecmp.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/string.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/string.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/strncasecmp.c#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/strsave.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/strsave.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/tmpfile.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/tmpfile.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/tmpname.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/libs/libgroff/tmpname.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/box.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/box.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/delim.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/delim.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/lex.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/lex.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/limit.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/limit.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/list.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/list.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/main.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/main.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/mark.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/mark.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/neqn.sh#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/other.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/other.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/over.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/over.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/pile.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/pile.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/script.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/script.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/special.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/special.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/sqrt.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/sqrt.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/text.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/eqn/text.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/grn/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/grn/README#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/grn/hdb.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/grn/hdb.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/grn/hgraph.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/grn/hgraph.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/grn/hpoint.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/grn/hpoint.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/grn/main.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/grn/main.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/html/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/html/pre-html.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/html/pre-html.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/html/pushback.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/html/pushback.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/html/pushback.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/pic/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/pic/common.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/pic/common.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/pic/lex.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/pic/lex.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/pic/main.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/pic/main.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/pic/object.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/pic/object.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/pic/pic.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/pic/pic.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/pic/pic.y#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/pic/tex.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/pic/tex.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/pic/troff.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/pic/troff.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/refer/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/refer/command.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/refer/command.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/refer/ref.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/refer/ref.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/refer/refer.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/refer/refer.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/refer/refer.man#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/refer/token.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/refer/token.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/soelim/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/soelim/soelim.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/soelim/soelim.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/soelim/soelim.man#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/tbl/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/tbl/main.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/tbl/main.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/tbl/table.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/tbl/table.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/preproc/tbl/tbl.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/groff/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/groff/groff.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/groff/groff.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/groff/groff.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/groff/pipeline.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/grog/grog.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/nroff/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/nroff/nroff.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/nroff/nroff.sh#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/charinfo.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/column.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/column.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/dictionary.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/dictionary.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/div.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/div.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/div.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/env.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/env.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/glyphuni.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/input.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/input.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/node.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/node.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/node.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/number.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/number.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/reg.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/reg.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/reg.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/symbol.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/symbol.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/token.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/troff.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/unicode.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/unicode.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/uniglyph.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/roff/troff/uniuni.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/addftinfo/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/addftinfo/addftinfo.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/addftinfo/addftinfo.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/addftinfo/guess.cc#3 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/addftinfo/guess.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/afmtodit/Makefile.sub#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/afmtodit/afmtodit.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/afmtodit/afmtodit.pl#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/hpftodit/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/hpftodit/hpftodit.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/hpftodit/hpftodit.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/hpftodit/hpftodit.man#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/indxbib/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/indxbib/indxbib.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/indxbib/indxbib.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/lkbib/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/lkbib/lkbib.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/lkbib/lkbib.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/lookbib/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/lookbib/lookbib.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/lookbib/lookbib.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/pfbtops/pfbtops.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/pfbtops/pfbtops.man#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/tfmtodit/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/tfmtodit/tfmtodit.cc#4 delete .. //depot/projects/trustedbsd/mac/contrib/groff/src/utils/tfmtodit/tfmtodit.cpp#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/ChangeLog#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/DviChar.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/Imakefile.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/src/xditview/draw.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/Makefile.sub#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/README#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/X.tmac#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/Xps.tmac#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/a4.tmac#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/an-old.tmac#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/composite.tmac#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/cp1047.tmac#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc-common#10 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc-ditroff#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc-nroff#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/doc.tmac#5 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/dvi.tmac#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/ec.tmac#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/eqnrc#3 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/europs.tmac#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/groff_man.man#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/groff_mdoc.man#8 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/html-end.tmac#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/html.tmac#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/hyphen.us#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/hyphenex.pl#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/hyphenex.us#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/latin1.tmac#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/latin2.tmac#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/latin9.tmac#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/lbp.tmac#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/lj4.tmac#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/papersize.tmac#1 branch .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/ps.tmac#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/pspic.tmac#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/troffrc#8 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/troffrc-end#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/tty-char.tmac#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/tty.tmac#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/tmac/www.tmac#4 integrate .. //depot/projects/trustedbsd/mac/contrib/groff/win32-diffs#4 delete .. //depot/projects/trustedbsd/mac/contrib/ipfilter/Makefile#5 integrate .. //depot/projects/trustedbsd/mac/contrib/ipfilter/man/ipmon.8#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/HISTORY#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/README#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/RELNOTES#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam.3#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_borrow_cred.3#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_free_data.3#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_get_option.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_log.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_nullconv.3#7 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_restore_cred.3#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_set_option.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/openpam_ttyconv.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_acct_mgmt.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_authenticate.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_chauthtok.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_close_session.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_end.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_error.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_authtok.3#13 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_data.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_item.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_get_user.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_getenv.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_getenvlist.3#13 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_info.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_open_session.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_prompt.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_putenv.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_set_data.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_set_item.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_setcred.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_setenv.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_acct_mgmt.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_authenticate.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_chauthtok.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_close_session.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_open_session.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_sm_setcred.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_start.3#13 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_strerror.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_verror.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_vinfo.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/doc/man/pam_vprompt.3#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/openpam_version.h#6 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_appl.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/include/security/pam_constants.h#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_dispatch.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_dynamic.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_impl.h#11 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/openpam_log.c#12 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_getenv.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/openpam/lib/pam_set_item.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/FREEBSD-upgrade#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/RELEASE_NOTES#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/README#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/cf/submit.cf#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/cfhead.m4#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/proto.m4#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/m4/version.m4#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/cf/mailer/usenet.m4#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/contrib/buildvirtuser#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/doc/op/op.me#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/editmap/editmap.8#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/bdb.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/include/sm/conf.h#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/api.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/design.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/index.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/installation.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/other.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/overview.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/sample.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_addheader.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_addrcpt.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_chgheader.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_delrcpt.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_getpriv.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_getsymval.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_main.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_register.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_replacebody.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_setbacklog.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_setconn.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_setpriv.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_setreply.html#4 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/smfi_settimeout.html#3 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/xxfi_abort.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/xxfi_body.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/xxfi_close.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/xxfi_connect.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/xxfi_envfrom.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/xxfi_envrcpt.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/xxfi_eoh.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/xxfi_eom.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/xxfi_header.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libmilter/docs/xxfi_helo.html#2 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/clock.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/libsm/config.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/mail.local/mail.local.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/README#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/collect.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/conf.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/deliver.c#14 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/headers.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/main.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/milter.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/parseaddr.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/queue.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/readcf.c#9 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sendmail.h#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/sm_resolve.c#5 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/srvrsmtp.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/tls.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/usersmtp.c#8 integrate .. //depot/projects/trustedbsd/mac/contrib/sendmail/src/version.c#10 integrate .. //depot/projects/trustedbsd/mac/contrib/smbfs/lib/smb/ctx.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/smbfs/smbutil/common.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/AUTHORS#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/COPYING#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/COPYING.DOC#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/ChangeLog#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/FREEBSD-Xlist#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/FREEBSD-upgrade#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/INSTALL#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/INTRODUCTION#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/NEWS#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/README#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/TODO#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/config.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/config.h.in#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/README#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/fdl.texi#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/help2man#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/info-stnd.texi#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/info.1#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/info.5#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/info.texi#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/install-info.1#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/makeinfo.1#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/texindex.1#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/texinfo.5#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/texinfo.txi#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/version-stnd.texi#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/doc/version.texi#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/README#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/dir.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/display.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/display.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/doc.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/doc.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/echo-area.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/echo-area.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/filesys.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/filesys.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/footnotes.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/footnotes.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/funs.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/gc.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/indices.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/indices.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/info-utils.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/info-utils.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/info.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/info.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/infodoc.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/infokey.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/infokey.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/infomap.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/infomap.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/m-x.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/man.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/man.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/nodemenu.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/nodes.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/nodes.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/search.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/search.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/session.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/session.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/signals.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/signals.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/termdep.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/terminal.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/terminal.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/tilde.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/variables.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/variables.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/window.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/info/window.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/lib/README#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/lib/getopt.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/lib/getopt.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/lib/getopt1.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/lib/gettext.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/lib/substring.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/lib/system.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/lib/xalloc.h#1 branch .. //depot/projects/trustedbsd/mac/contrib/texinfo/lib/xexit.c#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/lib/xstrdup.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/README#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/cmds.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/cmds.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/defun.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/defun.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/docbook.c#2 delete .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/docbook.h#2 delete .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/files.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/files.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/footnote.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/footnote.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/html.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/html.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/index.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/index.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/insertion.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/insertion.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/lang.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/lang.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/macro.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/macro.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/makeinfo.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/makeinfo.h#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/multi.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/node.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/node.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/sectioning.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/sectioning.h#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/texinfo.dtd#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/texinfo.xsl#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/toc.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/toc.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/xml.c#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/makeinfo/xml.h#3 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/util/README#2 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/util/install-info.c#4 integrate .. //depot/projects/trustedbsd/mac/contrib/texinfo/util/texindex.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/ChangeLog#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/FREEBSD-tricks#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/FREEBSD-upgrade#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/Makefile.in#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/README#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/README.privsep#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/TODO#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/acconfig.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-chall.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-krb4.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-krb5.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-pam.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-passwd.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-sia.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth-sia.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth1.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-pam-freebsd.c#7 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth2-pam.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/auth2.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/authfd.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/authfd.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/authfile.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/bufaux.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/canohost.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/channels.c#8 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/channels.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/cipher.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/clientloop.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/compat.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/compat.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/config.guess#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/config.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/config.sub#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/configure.ac#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/crc32.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/crc32.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/defines.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/dh.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/fixpaths#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/hostfile.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/hostfile.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/includes.h#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/kex.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/kex.h#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/kexdh.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/kexdhc.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/kexdhs.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/kexgex.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/kexgexc.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/kexgexs.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/key.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/key.h#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/log.c#5 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/loginrec.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/misc.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/monitor.c#6 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/monitor_wrap.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/msg.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/msg.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/Makefile.in#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/base64.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/base64.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/basename.c#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/basename.h#1 branch .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-arc4random.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-cray.h#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-cygwin_util.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-getpeereid.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-misc.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-misc.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/bsd-snprintf.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/fake-getaddrinfo.c#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/fake-getaddrinfo.h#2 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/getcwd.c#3 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/getopt.c#4 integrate .. //depot/projects/trustedbsd/mac/crypto/openssh/openbsd-compat/mktemp.c#3 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 5 19:06:34 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4D41637B404; Mon, 5 May 2003 19:06:34 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E13AE37B401 for ; Mon, 5 May 2003 19:06:33 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 76EF143F3F for ; Mon, 5 May 2003 19:06:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4626X0U057531 for ; Mon, 5 May 2003 19:06:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4626Xmr057528 for perforce@freebsd.org; Mon, 5 May 2003 19:06:33 -0700 (PDT) Date: Mon, 5 May 2003 19:06:33 -0700 (PDT) Message-Id: <200305060206.h4626Xmr057528@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30651 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 May 2003 02:06:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=30651 Change 30651 by peter@peter_daintree on 2003/05/05 19:05:52 argh. Affected files ... .. //depot/projects/hammer/lib/libc/amd64/_fpmath.h#6 edit Differences ... ==== //depot/projects/hammer/lib/libc/amd64/_fpmath.h#6 (text+ko) ==== @@ -33,7 +33,8 @@ unsigned int manh :32; unsigned int exp :15; unsigned int sign :1; - unsigned int junk :48; + unsigned int junkl :16; + unsigned int junkh :32; } bits; }; From owner-p4-projects@FreeBSD.ORG Tue May 6 05:40:27 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F8BD37B405; Tue, 6 May 2003 05:40:26 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1678537B404 for ; Tue, 6 May 2003 05:40:26 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2030043FDD for ; Tue, 6 May 2003 05:40:25 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h46CeO0U011549 for ; Tue, 6 May 2003 05:40:24 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h46CeOfF011522 for perforce@freebsd.org; Tue, 6 May 2003 05:40:24 -0700 (PDT) Date: Tue, 6 May 2003 05:40:24 -0700 (PDT) Message-Id: <200305061240.h46CeOfF011522@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 30664 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 May 2003 12:40:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=30664 Change 30664 by rwatson@rwatson_tislabs on 2003/05/06 05:40:02 Submerge local changes: no longer required to support UFS2. Affected files ... .. //depot/projects/trustedbsd/mac/lib/libdisk/Makefile#9 edit .. //depot/projects/trustedbsd/mac/lib/libdisk/blocks.c#6 edit .. //depot/projects/trustedbsd/mac/lib/libdisk/change.c#6 edit .. //depot/projects/trustedbsd/mac/lib/libdisk/chunk.c#14 edit .. //depot/projects/trustedbsd/mac/lib/libdisk/create_chunk.c#16 edit .. //depot/projects/trustedbsd/mac/lib/libdisk/disk.c#24 edit .. //depot/projects/trustedbsd/mac/lib/libdisk/libdisk.3#7 edit .. //depot/projects/trustedbsd/mac/lib/libdisk/libdisk.h#16 edit .. //depot/projects/trustedbsd/mac/lib/libdisk/rules.c#10 edit .. //depot/projects/trustedbsd/mac/lib/libdisk/tst01.c#8 edit .. //depot/projects/trustedbsd/mac/lib/libdisk/write_alpha_disk.c#8 edit .. //depot/projects/trustedbsd/mac/lib/libdisk/write_amd64_disk.c#2 edit .. //depot/projects/trustedbsd/mac/lib/libdisk/write_disk.c#11 edit .. //depot/projects/trustedbsd/mac/lib/libdisk/write_i386_disk.c#7 edit .. //depot/projects/trustedbsd/mac/lib/libdisk/write_ia64_disk.c#6 edit .. //depot/projects/trustedbsd/mac/lib/libdisk/write_pc98_disk.c#9 edit .. //depot/projects/trustedbsd/mac/lib/libdisk/write_sparc64_disk.c#6 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libdisk/Makefile#9 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/lib/libdisk/blocks.c#6 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/lib/libdisk/change.c#6 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/lib/libdisk/chunk.c#14 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/lib/libdisk/create_chunk.c#16 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/lib/libdisk/disk.c#24 (text+ko) ==== @@ -192,8 +192,6 @@ d->sector_size = s; len /= s; /* media size in number of sectors. */ - d->bbsize = BBSIZE; /* default, insufficient for UFS2 */ - if (Add_Chunk(d, 0, len, name, whole, 0, 0, "-")) DPRINT(("Failed to add 'whole' chunk")); @@ -558,40 +556,39 @@ } int -Set_Boot_Block_Size(struct disk *d, size_t boot_block_size) -{ - - d->bbsize = boot_block_size; - return 0; -} - -int Set_Boot_Blocks(struct disk *d, const u_char *b1, const u_char *b2) { #if defined(__i386__) || defined(__amd64__) if (d->boot1) free(d->boot1); - d->boot1 = malloc(b1size); + d->boot1 = malloc(512); if (!d->boot1) return -1; - memcpy(d->boot1, b1, b1size); + memcpy(d->boot1, b1, 512); if (d->boot2) free(d->boot2); - d->boot2 = malloc(b2size); + d->boot2 = malloc(15 * 512); if (!d->boot2) return -1; - memcpy(d->boot2, b2, b2size); -#elif defined(__alpha__) || defined(__sparc64__) + memcpy(d->boot2, b2, 15 * 512); +#elif defined(__alpha__) if (d->boot1) free(d->boot1); - d->boot1 = malloc(b1size); + d->boot1 = malloc(15 * 512); if (!d->boot1) return -1; - memcpy(d->boot1, b1, b1size); + memcpy(d->boot1, b1, 15 * 512); +#elif defined(__sparc64__) + if (d->boot1 != NULL) + free(d->boot1); + d->boot1 = malloc(16 * 512); + if (d->boot1 == NULL) + return (-1); + memcpy(d->boot1, b1, 16 * 512); #elif defined(__ia64__) /* nothing */ #else -/* Should be: #error "Set_Large_Boot_Blocks: unknown arch"; */ +/* Should be: #error "Set_Boot_Blocks: unknown arch"; */ #endif return 0; } ==== //depot/projects/trustedbsd/mac/lib/libdisk/libdisk.3#7 (text+ko) ==== @@ -44,7 +44,6 @@ .Nm Disk_Names , .Nm Set_Boot_Mgr , .Nm Set_Boot_Blocks , -.Nm Set_Large_Boot_Blocks , .Nm Write_Disk , .Nm Cyl_Aligned , .Nm Next_Cyl_Aligned , @@ -92,8 +91,6 @@ .Ft int .Fn Set_Boot_Blocks "struct disk *d" "const u_char *boot1" "const u_char *boot2" .Ft int -.Fn Set_Large_Boot_Blocks "struct disk *d" "const u_char *boot1" "size_t boot1size" "const u_char *boot2" "size_t boot2size" -.Ft int .Fn Write_Disk "struct disk *d" .Ft int .Fn Cyl_Aligned "struct disk *d" "u_long offset" @@ -259,9 +256,7 @@ is called. .Pp .Fn Set_Boot_Blocks -and -.Fn Set_Large_Boot_Blocks -set the boot-blocks for use on this disk. Gets written when +sets the boot-blocks for use on this disk. Gets written when .Fn Write_Disk is called. .Pp ==== //depot/projects/trustedbsd/mac/lib/libdisk/libdisk.h#16 (text+ko) ==== @@ -75,7 +75,6 @@ #endif struct chunk *chunks; u_long sector_size; /* media sector size, a power of 2 */ - u_int bbsize; /* boot block size for disklabel */ }; struct chunk { @@ -151,9 +150,6 @@ Set_Bios_Geom(struct disk *, u_long, u_long, u_long); /* Set the geometry the bios uses. */ -int -Set_Boot_Block_Size(struct disk *, const size_t); - void Sanitize_Bios_Geom(struct disk *); /* Set the bios geometry to something sane */ @@ -216,9 +212,6 @@ int Set_Boot_Blocks(struct disk *, const u_char *, const u_char *); -int -Set_Large_Boot_Blocks(struct disk *, const u_char *, size_t, const u_char *, - size_t); /* * Use these boot-blocks on this disk. Gets written when Write_Disk() * is called. Returns nonzero upon failure. ==== //depot/projects/trustedbsd/mac/lib/libdisk/rules.c#10 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/lib/libdisk/tst01.c#8 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/lib/libdisk/write_alpha_disk.c#8 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/lib/libdisk/write_amd64_disk.c#2 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/lib/libdisk/write_disk.c#11 (text+ko) ==== @@ -44,7 +44,7 @@ dl->d_partitions[j].p_fstype = c2->subtype; } - dl->d_bbsize = new->bbsize; + dl->d_bbsize = BBSIZE; /* * Add in defaults for superblock size, interleave, and rpms */ ==== //depot/projects/trustedbsd/mac/lib/libdisk/write_i386_disk.c#7 (text+ko) ==== @@ -32,12 +32,9 @@ struct disklabel *dl; int i; void *p; - u_char *buf; + u_char buf[BBSIZE]; - buf = malloc(new->bbsize); - if (buf == NULL) - return -1; - for (i = 0; i < new->bbsize / 512; i++) { + for (i = 0; i < BBSIZE/512; i++) { p = read_block(fd, i + c1->offset, 512); memcpy(buf + 512 * i, p, 512); free(p); @@ -46,15 +43,14 @@ memcpy(buf, new->boot1, 512); if (new->boot2) - memcpy(buf + 512, new->boot2, new->bbsize - 512); + memcpy(buf + 512, new->boot2, BBSIZE - 512); dl = (struct disklabel *)(buf + 512 * LABELSECTOR + LABELOFFSET); Fill_Disklabel(dl, new, c1); - for (i = 0; i < new->bbsize / 512; i++) + for (i = 0; i < BBSIZE / 512; i++) write_block(fd, i + c1->offset, buf + 512 * i, 512); - free(buf); return 0; } ==== //depot/projects/trustedbsd/mac/lib/libdisk/write_ia64_disk.c#6 (text+ko) ==== ==== //depot/projects/trustedbsd/mac/lib/libdisk/write_pc98_disk.c#9 (text+ko) ==== @@ -34,11 +34,9 @@ struct disklabel *dl; int i; void *p; - u_char *buf; + u_char buf[BBSIZE]; - if (buf == NULL) - return -1; - for (i = 0; i < new->bbsize / 512; i++) { + for (i = 0; i < BBSIZE / 512; i++) { p = read_block(fd, i + c1->offset, 512); memcpy(buf + 512 * i, p, 512); free(p); @@ -47,15 +45,14 @@ memcpy(buf, new->boot1, 512); if (new->boot2) - memcpy(buf + 512, new->boot2, new->bbsize - 512); + memcpy(buf + 512, new->boot2, BBSIZE - 512); dl = (struct disklabel *)(buf + 512 * LABELSECTOR + LABELOFFSET); Fill_Disklabel(dl, new, c1); - for (i = 0; i < new->bbsize / 512; i++) + for (i = 0; i < BBSIZE / 512; i++) write_block(fd, i + c1->offset, buf + 512 * i, 512); - free(buf); return 0; } ==== //depot/projects/trustedbsd/mac/lib/libdisk/write_sparc64_disk.c#6 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue May 6 08:59:33 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C391B37B401; Tue, 6 May 2003 08:59:32 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D294D37B423 for ; Tue, 6 May 2003 08:59:30 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6AF4D43FA3 for ; Tue, 6 May 2003 08:59:30 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h46FxU0U026949 for ; Tue, 6 May 2003 08:59:30 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h46FxT7G026946 for perforce@freebsd.org; Tue, 6 May 2003 08:59:29 -0700 (PDT) Date: Tue, 6 May 2003 08:59:29 -0700 (PDT) Message-Id: <200305061559.h46FxT7G026946@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 30669 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 May 2003 15:59:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=30669 Change 30669 by rwatson@rwatson_tislabs on 2003/05/06 08:58:38 Revert local big boot block changes; no longer required to boot UFS2. Affected files ... .. //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/disks.c#14 edit Differences ... ==== //depot/projects/trustedbsd/mac/usr.sbin/sysinstall/disks.c#14 (text+ko) ==== @@ -832,12 +832,6 @@ diskPartitionWrite(dialogMenuItem *self) { Device **devs; -#ifdef __i386__ - size_t boot1size, boot2size; - Chunk *slice; - PartInfo *pi; - int bigbb, nonbigbb; -#endif int i; if (!variable_cmp(DISK_PARTITIONED, "written")) @@ -860,60 +854,7 @@ if (!devs[i]->enabled) continue; -#ifdef __i386__ - /* - * For i386, use "big" boot blocks if the first partition in - * every FreeBSD slice is UFS2 and therefore has 64KB of space - * available rather than UFS1's mere 8KB. We could be more - * intelligent here and move forward uncreated non-UFS2 - * partitions to accomodate, and check that already-created - * slice aren't actually created with an offset from the - * beginning of their slice in the first place. - */ - nonbigbb = bigbb = 0; - for (slice = d->chunks->part; slice; slice = slice->next) { - if (slice->type != freebsd) - continue; - if (slice->part->type == unused) - continue; /* just an empty FreeBSD slice */ - if (slice->part->subtype != FS_BSDFFS) { - nonbigbb = 1; /* assume non-UFS2 means non-64KB */ - continue; - } - pi = slice->part->private_data; - if (pi == NULL || pi->newfs_type != NEWFS_UFS || - !pi->newfs_data.newfs_ufs.ufs2) { - nonbigbb = 1; /* assume non-UFS2 means non-64KB */ - continue; - } - bigbb = 1; - } - if (bigbb && nonbigbb) - msgConfirm("Warning: Some FreeBSD slices on this disk preclude the " - "installation of UFS2-capable boot blocks. You will need " - "to manually use disklabel(8) on these slices to install " - "the correct boot blocks."); - /* - * Boot blocks may switch back and forth if the installer is - * writing out labels on multiple disks. - */ - free(boot1); - free(boot2); - if (!nonbigbb && bigbb) { - boot1 = bootalloc("boot1", &boot1size); - boot2 = bootalloc("boot2", &boot2size); - Set_Boot_Block_Size(d, 0x10000); - if (Set_Large_Boot_Blocks(d, boot1, boot1size, boot2, - boot2size)) { - msgConfirm("ERROR: Unable to use boot blocks on disk %s!", d->name); - return DITEM_FAILURE; - } - } else { - boot1 = bootalloc("boot1", &boot1size); - boot2 = bootalloc("boot2-ufs1", &boot2size); - Set_Boot_Blocks(d, boot1, boot2); - } -#elif defined(__ia64__) +#if defined(__i386__) || defined(__ia64__) if (!boot1) boot1 = bootalloc("boot1", NULL); if (!boot2) boot2 = bootalloc("boot2", NULL); Set_Boot_Blocks(d, boot1, boot2); From owner-p4-projects@FreeBSD.ORG Tue May 6 19:56:55 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 273E037B404; Tue, 6 May 2003 19:56:55 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B301D37B401 for ; Tue, 6 May 2003 19:56:54 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4A04943FDF for ; Tue, 6 May 2003 19:56:54 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h472us0U074435 for ; Tue, 6 May 2003 19:56:54 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h472urmG074432 for perforce@freebsd.org; Tue, 6 May 2003 19:56:53 -0700 (PDT) Date: Tue, 6 May 2003 19:56:53 -0700 (PDT) Message-Id: <200305070256.h472urmG074432@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30685 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 May 2003 02:56:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=30685 Change 30685 by marcel@marcel_nfs on 2003/05/06 19:56:03 pmap_growkernel: o Turn this function into a critical section. o Move initialization of kernel_vm_end to pmap_bootstrap() to avoid having to do it here. o Don't further adjust kernel_vm_end by looking at the page table directory entry, as if we cannot trust the value. pmap_install: o Do not treat kernel maps differently by not installing them. This breaks the common usage of temporarily installing a new map and then switch back again if the original map is the kernel map. o Clear the pm_active bit for this CPU on the old map, not the new map. Hence, we never cleared pm_active... Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia64/pmap.c#9 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia64/pmap.c#9 (text+ko) ==== @@ -354,6 +354,7 @@ ia64_kptdir[i] = (void*)pmap_steal_memory(PAGE_SIZE); } nkpt = NKPT; + kernel_vm_end = NKPT * PAGE_SIZE * NKPTEPG + VM_MIN_KERNEL_ADDRESS; avail_start = phys_avail[0]; for (i = 0; phys_avail[i+2]; i+= 2) ; @@ -875,40 +876,30 @@ struct ia64_lpte *ptepage; vm_page_t nkpg; - if (kernel_vm_end == 0) { - kernel_vm_end = nkpt * PAGE_SIZE * NKPTEPG - + VM_MIN_KERNEL_ADDRESS; - } - addr = (addr + PAGE_SIZE * NKPTEPG) & ~(PAGE_SIZE * NKPTEPG - 1); + if (kernel_vm_end >= addr) + return; + + critical_enter(); + while (kernel_vm_end < addr) { - if (ia64_kptdir[KPTE_DIR_INDEX(kernel_vm_end)]) { - kernel_vm_end = (kernel_vm_end + PAGE_SIZE * NKPTEPG) - & ~(PAGE_SIZE * NKPTEPG - 1); - continue; - } - - /* - * We could handle more by increasing the size of kptdir. - */ + /* We could handle more by increasing the size of kptdir. */ if (nkpt == MAXKPT) panic("pmap_growkernel: out of kernel address space"); - /* - * This index is bogus, but out of the way - */ nkpg = vm_page_alloc(NULL, nkpt, VM_ALLOC_NOOBJ | VM_ALLOC_SYSTEM | VM_ALLOC_WIRED); if (!nkpg) panic("pmap_growkernel: no memory to grow kernel"); - - nkpt++; ptepage = (struct ia64_lpte *) - IA64_PHYS_TO_RR7(VM_PAGE_TO_PHYS(nkpg)); + IA64_PHYS_TO_RR7(VM_PAGE_TO_PHYS(nkpg)); bzero(ptepage, PAGE_SIZE); ia64_kptdir[KPTE_DIR_INDEX(kernel_vm_end)] = ptepage; - kernel_vm_end = (kernel_vm_end + PAGE_SIZE * NKPTEPG) & ~(PAGE_SIZE * NKPTEPG - 1); + nkpt++; + kernel_vm_end += PAGE_SIZE * NKPTEPG; } + + critical_exit(); } /*************************************************** @@ -1171,9 +1162,9 @@ pmap_find_kpte(vm_offset_t va) { KASSERT((va >> 61) == 5, - ("kernel mapping 0x%lx not in region 5", va)); + ("kernel mapping 0x%lx not in region 5", va)); KASSERT(IA64_RR_MASK(va) < (nkpt * PAGE_SIZE * NKPTEPG), - ("kernel mapping 0x%lx out of range", va)); + ("kernel mapping 0x%lx out of range", va)); return (&ia64_kptdir[KPTE_DIR_INDEX(va)][KPTE_PTE_INDEX(va)]); } @@ -2531,39 +2522,37 @@ critical_enter(); oldpmap = PCPU_GET(current_pmap); - - if (pmap == oldpmap || pmap == kernel_pmap) { + if (oldpmap == pmap) { critical_exit(); - return pmap; + return (oldpmap); } - if (oldpmap) { - atomic_clear_32(&pmap->pm_active, PCPU_GET(cpumask)); - } + if (oldpmap != NULL) + atomic_clear_32(&oldpmap->pm_active, PCPU_GET(cpumask)); PCPU_SET(current_pmap, pmap); - if (!pmap) { - /* - * RIDs 0..4 have no mappings to make sure we generate - * page faults on accesses. - */ + + if (pmap == NULL) { + /* Invalidate regions 0-4. */ ia64_set_rr(IA64_RR_BASE(0), (0 << 8)|(PAGE_SHIFT << 2)|1); ia64_set_rr(IA64_RR_BASE(1), (1 << 8)|(PAGE_SHIFT << 2)|1); ia64_set_rr(IA64_RR_BASE(2), (2 << 8)|(PAGE_SHIFT << 2)|1); ia64_set_rr(IA64_RR_BASE(3), (3 << 8)|(PAGE_SHIFT << 2)|1); ia64_set_rr(IA64_RR_BASE(4), (4 << 8)|(PAGE_SHIFT << 2)|1); critical_exit(); - return oldpmap; + return (oldpmap); } atomic_set_32(&pmap->pm_active, PCPU_GET(cpumask)); - for (i = 0; i < 5; i++) + for (i = 0; i < 5; i++) { ia64_set_rr(IA64_RR_BASE(i), - (pmap->pm_rid[i] << 8)|(PAGE_SHIFT << 2)|1); + (pmap->pm_rid[i] << 8)|(PAGE_SHIFT << 2)|1); + } critical_exit(); - return oldpmap; + + return (oldpmap); } vm_offset_t From owner-p4-projects@FreeBSD.ORG Wed May 7 00:15:08 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 356AE37B404; Wed, 7 May 2003 00:15:08 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C3FCA37B401 for ; Wed, 7 May 2003 00:15:07 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A32543F3F for ; Wed, 7 May 2003 00:15:07 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h477F70U098895 for ; Wed, 7 May 2003 00:15:07 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h477F6s9098892 for perforce@freebsd.org; Wed, 7 May 2003 00:15:06 -0700 (PDT) Date: Wed, 7 May 2003 00:15:06 -0700 (PDT) Message-Id: <200305070715.h477F6s9098892@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30689 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 May 2003 07:15:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=30689 Change 30689 by marcel@marcel_nfs on 2003/05/07 00:15:05 Fix bug introduced by the previous commit to pmap_growkernel that was accidentally non-present prior to the previous commit. We index the kernel page tables based on the VA in region 5. This covers the pageway page that we put that offset 0 in that region although we have set VM_MIN_KERNEL_ADDRESS to start after it. Initializing kernel_vm_end based on VM_MIN_KERNEL_ADDRESS is wrong as it has the adjustion for the gateway page, which does not apply here. Therefore subtract the gateway page size from VM_MIN_KERNEL_ADDRESS. The gateway page size has been abstracted to allow for a larger gateway. This fixes the border case when we try to enter a mapping at the last page in the VM space. A VM space that is 1 page smaller than we think it is. Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia64/pmap.c#10 edit .. //depot/projects/ia64_epc/sys/ia64/include/vmparam.h#2 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia64/pmap.c#10 (text+ko) ==== @@ -354,7 +354,8 @@ ia64_kptdir[i] = (void*)pmap_steal_memory(PAGE_SIZE); } nkpt = NKPT; - kernel_vm_end = NKPT * PAGE_SIZE * NKPTEPG + VM_MIN_KERNEL_ADDRESS; + kernel_vm_end = NKPT * PAGE_SIZE * NKPTEPG + VM_MIN_KERNEL_ADDRESS - + VM_GATEWAY_SIZE; avail_start = phys_avail[0]; for (i = 0; phys_avail[i+2]; i+= 2) ; ==== //depot/projects/ia64_epc/sys/ia64/include/vmparam.h#2 (text+ko) ==== @@ -140,7 +140,8 @@ /* user/kernel map constants */ #define VM_MIN_ADDRESS 0 #define VM_MAX_ADDRESS IA64_RR_BASE(5) -#define VM_MAXUSER_ADDRESS VM_MAX_ADDRESS + PAGE_SIZE +#define VM_GATEWAY_SIZE PAGE_SIZE +#define VM_MAXUSER_ADDRESS VM_MAX_ADDRESS + VM_GATEWAY_SIZE #define VM_MIN_KERNEL_ADDRESS VM_MAXUSER_ADDRESS #define VM_MAX_KERNEL_ADDRESS (IA64_RR_BASE(6) - 1) From owner-p4-projects@FreeBSD.ORG Wed May 7 06:17:26 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F14D537B404; Wed, 7 May 2003 06:17:25 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 950D237B401 for ; Wed, 7 May 2003 06:17:25 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3B1A543F75 for ; Wed, 7 May 2003 06:17:25 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h47DHP0U029087 for ; Wed, 7 May 2003 06:17:25 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h47DHOiq029084 for perforce@freebsd.org; Wed, 7 May 2003 06:17:24 -0700 (PDT) Date: Wed, 7 May 2003 06:17:24 -0700 (PDT) Message-Id: <200305071317.h47DHOiq029084@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 30690 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 May 2003 13:17:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=30690 Change 30690 by cvance@cvance_demo on 2003/05/07 06:16:32 Allow ugidfw to add rules without requiring a rule number, just use the next empty slot. Affected files ... .. //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.c#9 edit .. //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.h#5 edit Differences ... ==== //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.c#9 (text+ko) ==== @@ -708,3 +708,40 @@ return (0); } + +int +bsde_add_rule(struct mac_bsdextended_rule *rule, size_t buflen, char *errstr) +{ + char charstr[BUFSIZ]; + int name[10]; + size_t len, size; + int error, rule_slots; + + len = 10; + error = bsde_get_mib(MIB ".rules", name, &len); + if (error) { + len = snprintf(errstr, buflen, "%s: %s", MIB ".rules", + strerror(errno)); + return (-1); + } + + rule_slots = bsde_get_rule_slots(BUFSIZ, charstr); + if (rule_slots == -1) { + len = snprintf(errstr, buflen, "unable to get rule slots: %s", + strerror(errno)); + return (-1); + } + + name[len] = rule_slots; + len++; + + size = sizeof(*rule); + error = sysctl(name, len, NULL, NULL, rule, size); + if (error) { + len = snprintf(errstr, buflen, "%s.%d: %s", MIB ".rules", + rule_slots, strerror(errno)); + return (-1); + } + + return (0); +} ==== //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.h#5 (text+ko) ==== @@ -54,6 +54,8 @@ int bsde_delete_rule(int rulenum, size_t buflen, char *errstr); int bsde_set_rule(int rulenum, struct mac_bsdextended_rule *rule, size_t buflen, char *errstr); +int bsde_add_rule(struct mac_bsdextended_rule *rule, size_t buflen, + char *errstr); __END_DECLS #endif From owner-p4-projects@FreeBSD.ORG Wed May 7 06:19:29 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4DD2737B404; Wed, 7 May 2003 06:19:29 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D77AB37B401 for ; Wed, 7 May 2003 06:19:28 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8005A43F3F for ; Wed, 7 May 2003 06:19:28 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h47DJS0U029158 for ; Wed, 7 May 2003 06:19:28 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h47DJRZo029155 for perforce@freebsd.org; Wed, 7 May 2003 06:19:27 -0700 (PDT) Date: Wed, 7 May 2003 06:19:27 -0700 (PDT) Message-Id: <200305071319.h47DJRZo029155@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 30691 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 May 2003 13:19:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=30691 Change 30691 by cvance@cvance_demo on 2003/05/07 06:19:07 Add KDE menus when installing the demo Add the actual package used for the DISCEX demo Affected files ... .. //depot/projects/trustedbsd/misc/discex3/package/mac_bsdextended.tgz#1 add .. //depot/projects/trustedbsd/misc/discex3/package/pkg-plist#2 edit Differences ... ==== //depot/projects/trustedbsd/misc/discex3/package/pkg-plist#2 (text+ko) ==== @@ -7,6 +7,9 @@ usr/lib/libugidfw.so usr/lib/libugidfw_p.a usr/include/ugidfw.h +usr/local/share/applnk/UGIDFW/.directory +usr/local/share/applnk/UGIDFW/KUGIDFW.desktop +usr/local/share/applnk/UGIDFW/Uninstall.desktop usr/share/man/man3/libugidfw.3.gz usr/share/man/man8/ugidfw.8.gz usr/share/man/man4/mac_bsdextended.4.gz @@ -14,6 +17,8 @@ @exec /bin/mv %D/boot/loader.conf %D/boot/loader.conf.tmp @exec /usr/bin/grep -v mac_bsdextended_load %D/boot/loader.conf.tmp > %D/boot/loader.conf @exec /bin/echo 'mac_bsdextended_load="YES"' >> %D/boot/loader.conf +@exec /sbin/kldload mac_bsdextended @unexec /sbin/ldconfig -R @unexec /bin/mv %D/boot/loader.conf %D/boot/loader.conf.tmp @unexec /usr/bin/grep -v mac_bsdextended_load %D/boot/loader.conf.tmp > %D/boot/loader.conf +@unexec /sbin/kldunload mac_bsdextended From owner-p4-projects@FreeBSD.ORG Wed May 7 06:21:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8403C37B404; Wed, 7 May 2003 06:21:32 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 00CCD37B401 for ; Wed, 7 May 2003 06:21:32 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F47143FAF for ; Wed, 7 May 2003 06:21:31 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h47DLV0U029314 for ; Wed, 7 May 2003 06:21:31 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h47DLV5r029311 for perforce@freebsd.org; Wed, 7 May 2003 06:21:31 -0700 (PDT) Date: Wed, 7 May 2003 06:21:31 -0700 (PDT) Message-Id: <200305071321.h47DLV5r029311@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 30692 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 May 2003 13:21:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=30692 Change 30692 by cvance@cvance_demo on 2003/05/07 06:21:13 Use a different hard-coded path for the installer (it's only a demo!) Affected files ... .. //depot/projects/trustedbsd/misc/kbsdextinstall/kbsdextinstaller.cc#2 edit Differences ... ==== //depot/projects/trustedbsd/misc/kbsdextinstall/kbsdextinstaller.cc#2 (text+ko) ==== @@ -190,7 +190,7 @@ "Checking for install package"); memset(sysbuf, NULL, sizeof (sysbuf)); p = sysbuf; - p = strcat(p, "stat /tmp/mac_bsdextended.tgz"); + p = strcat(p, "stat /cdrom/mac_bsdextended.tgz"); error = system(sysbuf); if (error) { fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error); @@ -204,7 +204,7 @@ memset(sysbuf, NULL, sizeof (sysbuf)); p = sysbuf; - p = strcat(p, "/usr/sbin/pkg_add /tmp/mac_bsdextended.tgz"); + p = strcat(p, "/usr/sbin/pkg_add /cdrom/mac_bsdextended.tgz"); error = system(sysbuf); if (error) fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error); From owner-p4-projects@FreeBSD.ORG Wed May 7 06:24:37 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9E5637B404; Wed, 7 May 2003 06:24:36 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 77A4237B401 for ; Wed, 7 May 2003 06:24:36 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 01B2443F75 for ; Wed, 7 May 2003 06:24:36 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h47DOZ0U029384 for ; Wed, 7 May 2003 06:24:35 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h47DOZwX029381 for perforce@freebsd.org; Wed, 7 May 2003 06:24:35 -0700 (PDT) Date: Wed, 7 May 2003 06:24:35 -0700 (PDT) Message-Id: <200305071324.h47DOZwX029381@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 30693 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 May 2003 13:24:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=30693 Change 30693 by cvance@cvance_demo on 2003/05/07 06:23:43 A couple other minor tweaks for the DISCEX demo Affected files ... .. //depot/projects/trustedbsd/misc/kmounter/kmounter.cc#2 edit .. //depot/projects/trustedbsd/misc/kugidfw/ruleeditor.cc#2 edit Differences ... ==== //depot/projects/trustedbsd/misc/kmounter/kmounter.cc#2 (text+ko) ==== @@ -41,6 +41,7 @@ #include #include +#include #include #include ==== //depot/projects/trustedbsd/misc/kugidfw/ruleeditor.cc#2 (text+ko) ==== @@ -234,6 +234,7 @@ select_subject_group->insertItem( QString::null ); select_subject_group->insertItem( tr2i18n( "wheel" ) ); select_subject_group->insertItem( tr2i18n( "www" ) ); + select_subject_group->insertItem( tr2i18n( "frank" ) ); select_subject_group->insertItem( tr2i18n( "nobody" ) ); select_subject_group->insertItem( tr2i18n( "cvance" ) ); select_subject_group->insertItem( tr2i18n( "demo" ) ); @@ -247,6 +248,7 @@ select_subject_user->insertItem( QString::null ); select_subject_user->insertItem( tr2i18n( "root" ) ); select_subject_user->insertItem( tr2i18n( "www" ) ); + select_subject_user->insertItem( tr2i18n( "frank" ) ); select_subject_user->insertItem( tr2i18n( "cvance" ) ); select_subject_user->insertItem( tr2i18n( "demo" ) ); select_subject_user->insertItem( tr2i18n( "nobody" ) ); @@ -257,15 +259,17 @@ select_target_user->insertItem( QString::null ); select_target_user->insertItem( tr2i18n( "root" ) ); select_target_user->insertItem( tr2i18n( "www" ) ); + select_target_user->insertItem( tr2i18n( "frank" ) ); select_target_user->insertItem( tr2i18n( "cvance" ) ); select_target_user->insertItem( tr2i18n( "demo" ) ); select_target_user->insertItem( tr2i18n( "nobody" ) ); - textLabel1_2->setText( tr2i18n( "

Deny

" ) ); + textLabel1_2->setText( tr2i18n( "

Allow

" ) ); textLabel2->setText( tr2i18n( "user" ) ); select_target_group->clear(); select_target_group->insertItem( QString::null ); select_target_group->insertItem( tr2i18n( "wheel" ) ); select_target_group->insertItem( tr2i18n( "www" ) ); + select_target_group->insertItem( tr2i18n( "frank" ) ); select_target_group->insertItem( tr2i18n( "nobody" ) ); select_target_group->insertItem( tr2i18n( "cvance" ) ); select_target_group->insertItem( tr2i18n( "demo" ) ); From owner-p4-projects@FreeBSD.ORG Wed May 7 09:54:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D75137B404; Wed, 7 May 2003 09:54:41 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EFC9337B401 for ; Wed, 7 May 2003 09:54:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8C2FF43F3F for ; Wed, 7 May 2003 09:54:40 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h47Gse0U045916 for ; Wed, 7 May 2003 09:54:40 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h47GseKN045913 for perforce@freebsd.org; Wed, 7 May 2003 09:54:40 -0700 (PDT) Date: Wed, 7 May 2003 09:54:40 -0700 (PDT) Message-Id: <200305071654.h47GseKN045913@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 30703 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 May 2003 16:54:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=30703 Change 30703 by rwatson@rwatson_tislabs on 2003/05/07 09:54:08 Sync MAC with GENERIC. Affected files ... .. //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#44 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#44 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.376 2003/02/13 22:24:43 obrien Exp $ +# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.382 2003/04/21 16:44:04 simokawa Exp $ machine i386 cpu I486_CPU @@ -213,6 +213,7 @@ device ex # Intel EtherExpress Pro/10 and Pro/10+ device ep # Etherlink III based cards device fe # Fujitsu MB8696x based cards +device ie # EtherExpress 8/16, 3C507, StarLAN 10 etc. device lnc # NE2100, NE32-VL Lance Ethernet cards device sn # SMC's 9000 series of ethernet chips device xe # Xircom pccard ethernet @@ -254,5 +255,11 @@ device uscanner # Scanners # USB Ethernet, requires mii device aue # ADMtek USB ethernet +device axe # ASIX Electronics USB ethernet device cue # CATC USB ethernet device kue # Kawasaki LSI USB ethernet + +# FireWire support +device firewire # FireWire bus code +device sbp # SCSI over FireWire (Requires scbus and da) +device fwe # Ethernet over FireWire (non-standard!) From owner-p4-projects@FreeBSD.ORG Wed May 7 10:50:54 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4884C37B401; Wed, 7 May 2003 10:50:54 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1DA4637B431 for ; Wed, 7 May 2003 10:50:50 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 501F643F93 for ; Wed, 7 May 2003 10:50:50 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h47Hoo0U049471 for ; Wed, 7 May 2003 10:50:50 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h47Hon7E049468 for perforce@freebsd.org; Wed, 7 May 2003 10:50:49 -0700 (PDT) Date: Wed, 7 May 2003 10:50:49 -0700 (PDT) Message-Id: <200305071750.h47Hon7E049468@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 30706 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 May 2003 17:50:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=30706 Change 30706 by rwatson@rwatson_tislabs on 2003/05/07 10:49:58 Prefer the name "slots" to "policies" when refering to in-kernel transient object label limits. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#384 edit .. //depot/projects/trustedbsd/mac/sys/sys/_label.h#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#384 (text+ko) ==== @@ -98,14 +98,14 @@ SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0, "TrustedBSD MAC policy controls"); -#if MAC_MAX_POLICIES > 32 -#error "MAC_MAX_POLICIES too large" +#if MAC_MAX_SLOTS > 32 +#error "MAC_MAX_SLOTS too large" #endif -static unsigned int mac_max_policies = MAC_MAX_POLICIES; -static unsigned int mac_policy_offsets_free = (1 << MAC_MAX_POLICIES) - 1; -SYSCTL_UINT(_security_mac, OID_AUTO, max_policies, CTLFLAG_RD, - &mac_max_policies, 0, ""); +static unsigned int mac_max_slots = MAC_MAX_SLOTS; +static unsigned int mac_slots_offsets_free = (1 << MAC_MAX_SLOTS) - 1; +SYSCTL_UINT(_security_mac, OID_AUTO, max_slots, CTLFLAG_RD, + &mac_max_slots, 0, ""); /* * Has the kernel started generating labeled objects yet? All read/write @@ -645,13 +645,13 @@ } } if (mpc->mpc_field_off != NULL) { - slot = ffs(mac_policy_offsets_free); + slot = ffs(mac_slot_offsets_free); if (slot == 0) { error = ENOMEM; goto out; } slot--; - mac_policy_offsets_free &= ~(1 << slot); + mac_slot_offsets_free &= ~(1 << slot); *mpc->mpc_field_off = slot; } mpc->mpc_runtime_flags |= MPC_RUNTIME_FLAG_REGISTERED; ==== //depot/projects/trustedbsd/mac/sys/sys/_label.h#7 (text+ko) ==== @@ -41,7 +41,7 @@ * and various other messes. */ -#define MAC_MAX_POLICIES 8 +#define MAC_MAX_SLOTS 8 #define MAC_FLAG_INITIALIZED 0x0000001 /* Is initialized for use. */ @@ -50,7 +50,7 @@ union { void *l_ptr; long l_long; - } l_perpolicy[MAC_MAX_POLICIES]; + } l_perpolicy[MAC_MAX_SLOTS]; }; #endif /* !_SYS__LABEL_H */ From owner-p4-projects@FreeBSD.ORG Wed May 7 11:06:12 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0479237B404; Wed, 7 May 2003 11:06:12 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 94F8E37B401 for ; Wed, 7 May 2003 11:06:11 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 90EDE43FA3 for ; Wed, 7 May 2003 11:06:10 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h47I6A0U051246 for ; Wed, 7 May 2003 11:06:10 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h47I69hs051243 for perforce@freebsd.org; Wed, 7 May 2003 11:06:09 -0700 (PDT) Date: Wed, 7 May 2003 11:06:09 -0700 (PDT) Message-Id: <200305071806.h47I69hs051243@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 30708 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 May 2003 18:06:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=30708 Change 30708 by jhb@jhb_laptop on 2003/05/07 11:05:24 IFC @30704. Affected files ... .. //depot/projects/smpng/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/smpng/sys/conf/NOTES#43 integrate .. //depot/projects/smpng/sys/conf/newvers.sh#4 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#11 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#7 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/uhci_pci.c#3 integrate .. //depot/projects/smpng/sys/geom/geom_bsd.c#30 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#20 integrate .. //depot/projects/smpng/sys/i386/isa/intr_machdep.c#19 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#65 integrate .. //depot/projects/smpng/sys/kern/kern_subr.c#23 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#48 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#33 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#20 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#34 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#33 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#31 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#14 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#25 integrate .. //depot/projects/smpng/sys/sys/dkstat.h#3 integrate .. //depot/projects/smpng/sys/sys/signalvar.h#15 integrate .. //depot/projects/smpng/sys/sys/syscallsubr.h#7 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#26 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#34 integrate .. //depot/projects/smpng/sys/vm/vm_pager.c#12 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#30 integrate Differences ... ==== //depot/projects/smpng/sys/conf/NOTES#43 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1147 2003/05/03 10:16:55 akiyama Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1148 2003/05/05 21:21:31 phk Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -116,15 +116,15 @@ # options INCLUDE_CONFIG_FILE # Include this file in kernel -options GEOM_AES -options GEOM_APPLE -options GEOM_BDE -options GEOM_BSD -options GEOM_GPT -options GEOM_MBR -options GEOM_PC98 -options GEOM_SUNLABEL -options GEOM_VOL +options GEOM_AES # Don't use, use GEOM_BDE +options GEOM_APPLE # Apple partitioning +options GEOM_BDE # Disk encryption. +options GEOM_BSD # BSD disklabels +options GEOM_GPT # GPT partitioning +options GEOM_MBR # DOS/MBR partitioning +options GEOM_PC98 # NEC PC9800 partitioning +options GEOM_SUNLABEL # Sun/Solaris partitioning +options GEOM_VOL # Volume names from UFS superblock # # The root device and filesystem type can be compiled in; ==== //depot/projects/smpng/sys/conf/newvers.sh#4 (text+ko) ==== @@ -32,11 +32,11 @@ # SUCH DAMAGE. # # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 -# $FreeBSD: src/sys/conf/newvers.sh,v 1.49 2002/12/13 08:47:15 murray Exp $ +# $FreeBSD: src/sys/conf/newvers.sh,v 1.50 2003/05/06 03:55:24 scottl Exp $ TYPE="FreeBSD" -REVISION="5.0" -BRANCH="CURRENT" +REVISION="5.1" +BRANCH="BETA" RELEASE="${REVISION}-${BRANCH}" VERSION="${TYPE} ${RELEASE}" ==== //depot/projects/smpng/sys/dev/ata/ata-chipset.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ * (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: src/sys/dev/ata/ata-chipset.c,v 1.23 2003/05/03 18:26:00 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.24 2003/05/06 19:31:56 jhb Exp $ */ #include "opt_ata.h" #include @@ -773,6 +773,7 @@ { ATA_I82801CA, 0, 0, 0x00, ATA_UDMA5, "Intel ICH3" }, { ATA_I82801CA_1, 0, 0, 0x00, ATA_UDMA5, "Intel ICH3" }, { ATA_I82801DB, 0, 0, 0x00, ATA_UDMA5, "Intel ICH4" }, + { ATA_I82801EB, 0, 0, 0x00, ATA_UDMA5, "Intel ICH5" }, { 0, 0, 0, 0, 0, 0}}; char buffer[64]; ==== //depot/projects/smpng/sys/dev/ata/ata-pci.h#7 (text+ko) ==== @@ -25,7 +25,7 @@ * (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: src/sys/dev/ata/ata-pci.h,v 1.8 2003/05/01 06:20:50 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.9 2003/05/06 19:31:56 jhb Exp $ */ /* structure holding chipset config info */ @@ -111,6 +111,7 @@ #define ATA_I82801CA 0x248a8086 #define ATA_I82801CA_1 0x248b8086 #define ATA_I82801DB 0x24cb8086 +#define ATA_I82801EB 0x24db8086 #define ATA_NVIDIA_ID 0x10de #define ATA_NFORCE1 0x01bc10de ==== //depot/projects/smpng/sys/dev/em/if_em.c#21 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.24 2003/05/03 07:35:47 pdeuskar Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.25 2003/05/06 03:55:12 des Exp $*/ #include @@ -1777,7 +1777,8 @@ BUS_DMA_NOWAIT, &dma->dma_map); if (r != 0) { printf("em%d: em_dma_malloc: bus_dmammem_alloc failed; " - "size %u, error %u\n", adapter->unit, size, r); + "size %ju, error %d\n", adapter->unit, + (uintmax_t)size, r); goto fail_2; } ==== //depot/projects/smpng/sys/dev/usb/uhci_pci.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/uhci_pci.c,v 1.45 2003/02/28 13:21:17 imp Exp $ + * $FreeBSD: src/sys/dev/usb/uhci_pci.c,v 1.46 2003/05/06 19:30:41 jhb Exp $ */ /* Universal Host Controller Interface @@ -114,6 +114,18 @@ #define PCI_UHCI_DEVICEID_ICH4_C 0x24c78086 static const char *uhci_device_ich4_c = "Intel 82801DB (ICH4) USB controller USB-C"; +#define PCI_UHCI_DEVICEID_ICH5_A 0x24d28086 +static const char *uhci_device_ich5_a = "Intel 82801EB (ICH5) USB controller USB-A"; + +#define PCI_UHCI_DEVICEID_ICH5_B 0x24d48086 +static const char *uhci_device_ich5_b = "Intel 82801EB (ICH5) USB controller USB-B"; + +#define PCI_UHCI_DEVICEID_ICH5_C 0x24d78086 +static const char *uhci_device_ich5_c = "Intel 82801EB (ICH5) USB controller USB-C"; + +#define PCI_UHCI_DEVICEID_ICH5_D 0x24de8086 +static const char *uhci_device_ich5_d = "Intel 82801EB (ICH5) USB controller USB-D"; + #define PCI_UHCI_DEVICEID_440MX 0x719a8086 static const char *uhci_device_440mx = "Intel 82443MX USB controller"; @@ -188,6 +200,14 @@ return (uhci_device_ich4_b); } else if (device_id == PCI_UHCI_DEVICEID_ICH4_C) { return (uhci_device_ich4_c); + } else if (device_id == PCI_UHCI_DEVICEID_ICH5_A) { + return (uhci_device_ich5_a); + } else if (device_id == PCI_UHCI_DEVICEID_ICH5_B) { + return (uhci_device_ich5_b); + } else if (device_id == PCI_UHCI_DEVICEID_ICH5_C) { + return (uhci_device_ich5_c); + } else if (device_id == PCI_UHCI_DEVICEID_ICH5_D) { + return (uhci_device_ich5_d); } else if (device_id == PCI_UHCI_DEVICEID_440MX) { return (uhci_device_440mx); } else if (device_id == PCI_UHCI_DEVICEID_460GX) { ==== //depot/projects/smpng/sys/geom/geom_bsd.c#30 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom_bsd.c,v 1.59 2003/05/05 08:30:59 phk Exp $ + * $FreeBSD: src/sys/geom/geom_bsd.c,v 1.60 2003/05/06 19:36:13 phk Exp $ * * This is the method for dealing with BSD disklabels. It has been * extensively (by my standards at least) commented, in the vain hope that @@ -142,10 +142,10 @@ rawoffset = 0; } - if (rawoffset != 0 && (off_t)rawoffset * dl.d_secsize != ms->mbroffset) + if (rawoffset != 0 && (off_t)rawoffset != ms->mbroffset) printf("WARNING: Expected rawoffset %jd, found %jd\n", (intmax_t)ms->mbroffset/dl.d_secsize, - (intmax_t)ms->rawoffset); + (intmax_t)rawoffset/dl.d_secsize); /* Don't munge open partitions. */ for (i = 0; i < dl.d_npartitions; i++) { ==== //depot/projects/smpng/sys/geom/geom_io.c#20 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom_io.c,v 1.41 2003/05/02 12:36:12 phk Exp $ + * $FreeBSD: src/sys/geom/geom_io.c,v 1.42 2003/05/07 05:37:31 phk Exp $ */ @@ -283,7 +283,8 @@ pp->nend++; if (error == ENOMEM) { - printf("ENOMEM %p on %p(%s)\n", bp, pp, pp->name); + if (bootverbose) + printf("ENOMEM %p on %p(%s)\n", bp, pp, pp->name); g_io_request(bp, cp); pace++; return; ==== //depot/projects/smpng/sys/i386/isa/intr_machdep.c#19 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/i386/isa/intr_machdep.c,v 1.74 2003/03/24 19:14:46 mdodd Exp $ + * $FreeBSD: src/sys/i386/isa/intr_machdep.c,v 1.75 2003/05/07 17:21:38 jhb Exp $ */ #include "opt_auto_eoi.h" @@ -309,7 +309,8 @@ /* * ICU reinitialize when ICU configuration has lost. */ -void icu_reinit() +void +icu_reinit() { int i; register_t crit; @@ -349,7 +350,8 @@ /* *initialize 8259's */ -static void init_i8259() +static void +init_i8259() { #ifdef DEV_MCA ==== //depot/projects/smpng/sys/kern/kern_sig.c#65 (text+ko) ==== @@ -36,40 +36,40 @@ * SUCH DAMAGE. * * @(#)kern_sig.c 8.7 (Berkeley) 4/18/94 - * $FreeBSD: src/sys/kern/kern_sig.c,v 1.233 2003/04/30 19:45:13 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_sig.c,v 1.236 2003/05/05 21:26:25 jhb Exp $ */ #include "opt_compat.h" #include "opt_ktrace.h" #include -#include -#include #include #include -#include #include +#include +#include #include -#include -#include -#include #include -#include +#include +#include +#include #include +#include #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include +#include +#include #include -#include -#include -#include +#include #include +#include #include @@ -82,6 +82,7 @@ static int coredump(struct thread *); static char *expand_name(const char *, uid_t, pid_t); static int killpg1(struct thread *td, int sig, int pgid, int all); +static int issignal(struct thread *p); static int sigprop(int sig); static void stop(struct proc *); static void tdsigwakeup(struct thread *td, int sig, sig_t action); @@ -731,9 +732,11 @@ error = copyout(&info.si_signo, uap->sig, sizeof(info.si_signo)); /* Repost if we got an error. */ - if (error && info.si_signo) + if (error && info.si_signo) { + PROC_LOCK(td->td_proc); tdsignal(td, info.si_signo); - + PROC_UNLOCK(td->td_proc); + } return (error); } /* @@ -767,9 +770,11 @@ error = copyout(&info, uap->info, sizeof(info)); /* Repost if we got an error. */ - if (error && info.si_signo) + if (error && info.si_signo) { + PROC_LOCK(td->td_proc); tdsignal(td, info.si_signo); - + PROC_UNLOCK(td->td_proc); + } return (error); } @@ -793,9 +798,11 @@ error = copyout(&info, uap->info, sizeof(info)); /* Repost if we got an error. */ - if (error && info.si_signo) + if (error && info.si_signo) { + PROC_LOCK(td->td_proc); tdsignal(td, info.si_signo); - + PROC_UNLOCK(td->td_proc); + } return (error); } @@ -1886,7 +1893,7 @@ * while (sig = cursig(curthread)) * postsig(sig); */ -int +static int issignal(td) struct thread *td; { ==== //depot/projects/smpng/sys/kern/kern_subr.c#23 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_subr.c 8.3 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/kern_subr.c,v 1.73 2003/03/25 20:13:24 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_subr.c,v 1.74 2003/05/05 21:27:29 jhb Exp $ */ #include "opt_zero.h" @@ -185,9 +185,9 @@ n -= cnt; } out: - if (td) { + if (td && save == 0) { mtx_lock_spin(&sched_lock); - td->td_flags = (td->td_flags & ~TDF_DEADLKTREAT) | save; + td->td_flags &= ~TDF_DEADLKTREAT; mtx_unlock_spin(&sched_lock); } return (error); ==== //depot/projects/smpng/sys/kern/kern_synch.c#48 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_synch.c 8.9 (Berkeley) 5/19/95 - * $FreeBSD: src/sys/kern/kern_synch.c,v 1.220 2003/05/01 17:05:24 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_synch.c,v 1.221 2003/05/05 21:12:36 jhb Exp $ */ #include "opt_ddb.h" @@ -467,9 +467,7 @@ p = td->td_proc; /* XXX */ KASSERT(!TD_ON_RUNQ(td), ("mi_switch: called by old code")); #ifdef INVARIANTS - if (!TD_ON_LOCK(td) && - !TD_ON_RUNQ(td) && - !TD_IS_RUNNING(td)) + if (!TD_ON_LOCK(td) && !TD_IS_RUNNING(td)) mtx_assert(&Giant, MA_NOTOWNED); #endif KASSERT(td->td_critnest == 1, ==== //depot/projects/smpng/sys/kern/uipc_syscalls.c#33 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)uipc_syscalls.c 8.4 (Berkeley) 2/21/94 - * $FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.145 2003/03/31 06:25:42 alc Exp $ + * $FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.146 2003/05/05 20:33:37 dwmalone Exp $ */ #include "opt_compat.h" @@ -619,47 +619,18 @@ register struct msghdr *mp; int flags; { - struct uio auio; - register struct iovec *iov; - register int i; struct mbuf *control; - struct sockaddr *to = NULL; - int len, error; - struct socket *so; -#ifdef KTRACE - struct iovec *ktriov = NULL; - struct uio ktruio; - int iovlen; -#endif + struct sockaddr *to; + int error; - if ((error = fgetsock(td, s, &so, NULL)) != 0) - return (error); - -#ifdef MAC - error = mac_check_socket_send(td->td_ucred, so); - if (error) - goto bad; -#endif - - auio.uio_iov = mp->msg_iov; - auio.uio_iovcnt = mp->msg_iovlen; - auio.uio_segflg = UIO_USERSPACE; - auio.uio_rw = UIO_WRITE; - auio.uio_td = td; - auio.uio_offset = 0; /* XXX */ - auio.uio_resid = 0; - iov = mp->msg_iov; - for (i = 0; i < mp->msg_iovlen; i++, iov++) { - if ((auio.uio_resid += iov->iov_len) < 0) { - error = EINVAL; - goto bad; - } - } - if (mp->msg_name) { + if (mp->msg_name != NULL) { error = getsockaddr(&to, mp->msg_name, mp->msg_namelen); if (error) - goto bad; - } + return error; + mp->msg_name = to; + } else + to = NULL; + if (mp->msg_control) { if (mp->msg_controllen < sizeof(struct cmsghdr) #ifdef COMPAT_OLDSOCK @@ -690,7 +661,59 @@ } #endif } else { - control = 0; + control = NULL; + } + + error = kern_sendit(td, s, mp, flags, control); + +bad: + if (to) + FREE(to, M_SONAME); + return (error); +} + +int +kern_sendit(td, s, mp, flags, control) + struct thread *td; + int s; + struct msghdr *mp; + int flags; + struct mbuf *control; +{ + struct uio auio; + struct iovec *iov; + struct socket *so; + int i; + int len, error; +#ifdef KTRACE + struct iovec *ktriov = NULL; + struct uio ktruio; + int iovlen; +#endif + + mtx_lock(&Giant); + if ((error = fgetsock(td, s, &so, NULL)) != 0) + goto bad2; + +#ifdef MAC + error = mac_check_socket_send(td->td_ucred, so); + if (error) + goto bad; +#endif + + auio.uio_iov = mp->msg_iov; + auio.uio_iovcnt = mp->msg_iovlen; + auio.uio_segflg = UIO_USERSPACE; + auio.uio_rw = UIO_WRITE; + auio.uio_td = td; + auio.uio_offset = 0; /* XXX */ + auio.uio_resid = 0; + iov = mp->msg_iov; + for (i = 0; i < mp->msg_iovlen; i++, iov++) { + if ((auio.uio_resid += iov->iov_len) < 0) { + error = EINVAL; + goto bad; + } } #ifdef KTRACE if (KTRPOINT(td, KTR_GENIO)) { @@ -701,8 +724,8 @@ } #endif len = auio.uio_resid; - error = so->so_proto->pr_usrreqs->pru_sosend(so, to, &auio, 0, control, - flags, td); + error = so->so_proto->pr_usrreqs->pru_sosend(so, mp->msg_name, &auio, + 0, control, flags, td); if (error) { if (auio.uio_resid != len && (error == ERESTART || error == EINTR || error == EWOULDBLOCK)) @@ -728,8 +751,8 @@ #endif bad: fputsock(so); - if (to) - FREE(to, M_SONAME); +bad2: + mtx_unlock(&Giant); return (error); } @@ -762,9 +785,7 @@ #endif aiov.iov_base = uap->buf; aiov.iov_len = uap->len; - mtx_lock(&Giant); error = sendit(td, uap->s, &msg, uap->flags); - mtx_unlock(&Giant); return (error); } @@ -794,9 +815,7 @@ aiov.iov_len = uap->len; msg.msg_control = 0; msg.msg_flags = 0; - mtx_lock(&Giant); error = sendit(td, uap->s, &msg, uap->flags); - mtx_unlock(&Giant); return (error); } @@ -816,7 +835,6 @@ struct iovec aiov[UIO_SMALLIOV], *iov; int error; - mtx_lock(&Giant); error = copyin(uap->msg, &msg, sizeof (struct omsghdr)); if (error) goto done2; @@ -842,7 +860,6 @@ if (iov != aiov) FREE(iov, M_IOV); done2: - mtx_unlock(&Giant); return (error); } #endif @@ -863,7 +880,6 @@ struct iovec aiov[UIO_SMALLIOV], *iov; int error; - mtx_lock(&Giant); error = copyin(uap->msg, &msg, sizeof (msg)); if (error) goto done2; @@ -891,7 +907,6 @@ if (iov != aiov) FREE(iov, M_IOV); done2: - mtx_unlock(&Giant); return (error); } ==== //depot/projects/smpng/sys/kern/vfs_default.c#20 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * - * $FreeBSD: src/sys/kern/vfs_default.c,v 1.83 2003/05/02 19:33:21 alc Exp $ + * $FreeBSD: src/sys/kern/vfs_default.c,v 1.84 2003/05/06 02:45:28 alc Exp $ */ #include @@ -657,11 +657,11 @@ else VM_OBJECT_UNLOCK(obj); } else { - VM_OBJECT_UNLOCK(obj); /* * Woe to the process that tries to page now :-). */ vm_pager_deallocate(obj); + VM_OBJECT_UNLOCK(obj); } return (0); } ==== //depot/projects/smpng/sys/netinet/ip_input.c#34 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ip_input.c 8.2 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/netinet/ip_input.c,v 1.236 2003/04/29 21:36:18 mdodd Exp $ + * $FreeBSD: src/sys/netinet/ip_input.c,v 1.237 2003/05/06 20:34:04 rwatson Exp $ */ #include "opt_bootp.h" @@ -1797,13 +1797,10 @@ mcopy->m_len = imin((ip->ip_hl << 2) + 8, (int)ip->ip_len); m_copydata(m, 0, mcopy->m_len, mtod(mcopy, caddr_t)); -#ifdef MAC /* - * XXXMAC: This will eventually become an explicit - * labeling point. + * XXXMAC: Eventually, we may have an explict labeling + * point here. */ - mac_create_mbuf_from_mbuf(m, mcopy); -#endif } #ifdef IPSTEALTH ==== //depot/projects/smpng/sys/netinet/tcp_input.c#33 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_input.c 8.12 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.204 2003/04/21 16:27:45 obrien Exp $ + * $FreeBSD: src/sys/netinet/tcp_input.c,v 1.205 2003/05/07 05:26:27 rwatson Exp $ */ #include "opt_ipfw.h" /* for ipfw_fwd */ @@ -2950,7 +2950,7 @@ */ if (thflags != TH_ACK || tlen != 0 || th->th_seq != tw->rcv_nxt || th->th_ack != tw->snd_nxt) - tcp_twrespond(tw, TH_ACK); + tcp_twrespond(tw, NULL, m, TH_ACK); goto drop; reset: ==== //depot/projects/smpng/sys/netinet/tcp_subr.c#31 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_subr.c 8.2 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.159 2003/04/10 20:33:10 rwatson Exp $ + * $FreeBSD: src/sys/netinet/tcp_subr.c,v 1.160 2003/05/07 05:26:27 rwatson Exp $ */ #include "opt_compat.h" @@ -1661,13 +1661,13 @@ so->so_pcb = NULL; tw->tw_cred = crhold(so->so_cred); tw->tw_so_options = so->so_options; + if (acknow) + tcp_twrespond(tw, so, NULL, TH_ACK); sotryfree(so); inp->inp_socket = NULL; inp->inp_ppcb = (caddr_t)tw; inp->inp_vflag |= INP_TIMEWAIT; tcp_timer_2msl_reset(tw, tw_time); - if (acknow) - tcp_twrespond(tw, TH_ACK); INP_UNLOCK(inp); } @@ -1693,8 +1693,13 @@ return (NULL); } +/* + * One of so and msrc must be non-NULL for use by the MAC Framework to + * construct a label for ay resulting packet. + */ int -tcp_twrespond(struct tcptw *tw, int flags) +tcp_twrespond(struct tcptw *tw, struct socket *so, struct mbuf *msrc, + int flags) { struct inpcb *inp = tw->tw_inpcb; struct tcphdr *th; @@ -1708,11 +1713,21 @@ int isipv6 = inp->inp_inc.inc_isipv6; #endif + KASSERT(so != NULL || msrc != NULL, + ("tcp_twrespond: so and msrc NULL")); + m = m_gethdr(M_DONTWAIT, MT_HEADER); if (m == NULL) return (ENOBUFS); m->m_data += max_linkhdr; +#ifdef MAC + if (so != NULL) + mac_create_mbuf_from_socket(so, m); + else + mac_create_mbuf_netlayer(msrc, m); +#endif + #ifdef INET6 if (isipv6) { hdrlen = sizeof(struct ip6_hdr) + sizeof(struct tcphdr); ==== //depot/projects/smpng/sys/netinet/tcp_var.h#14 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tcp_var.h 8.4 (Berkeley) 5/24/95 - * $FreeBSD: src/sys/netinet/tcp_var.h,v 1.88 2003/04/01 21:16:46 hsu Exp $ + * $FreeBSD: src/sys/netinet/tcp_var.h,v 1.89 2003/05/07 05:26:27 rwatson Exp $ */ #ifndef _NETINET_TCP_VAR_H_ @@ -491,7 +491,7 @@ tcp_quench(struct inpcb *, int); void tcp_respond(struct tcpcb *, void *, struct tcphdr *, struct mbuf *, tcp_seq, tcp_seq, int); -int tcp_twrespond(struct tcptw *, int); +int tcp_twrespond(struct tcptw *, struct socket *, struct mbuf *, int); struct rtentry * tcp_rtlookup(struct in_conninfo *); void tcp_setpersist(struct tcpcb *); ==== //depot/projects/smpng/sys/pci/if_sis.c#25 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/pci/if_sis.c,v 1.74 2003/04/21 18:34:04 imp Exp $ + * $FreeBSD: src/sys/pci/if_sis.c,v 1.75 2003/05/06 02:00:01 cognet Exp $ */ /* @@ -58,7 +58,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/pci/if_sis.c,v 1.74 2003/04/21 18:34:04 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/pci/if_sis.c,v 1.75 2003/05/06 02:00:01 cognet Exp $"); #include #include @@ -1374,8 +1374,6 @@ goto fail; } - callout_handle_init(&sc->sis_stat_ch); - /* * Call MI attach routine. */ @@ -1748,8 +1746,6 @@ sis_start(ifp); } - sc->sis_stat_ch = timeout(sis_tick, sc, hz); - SIS_UNLOCK(sc); return; ==== //depot/projects/smpng/sys/sys/dkstat.h#3 (text+ko) ==== @@ -36,12 +36,12 @@ * SUCH DAMAGE. * * @(#)dkstat.h 8.2 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/sys/dkstat.h,v 1.16 2003/02/16 14:15:03 phk Exp $ + * $FreeBSD: src/sys/sys/dkstat.h,v 1.17 2003/05/07 15:26:43 phk Exp $ */ #ifndef _SYS_DKSTAT_H_ #define _SYS_DKSTAT_H_ 1 -#warning " is deprecated and should not be #include'd" +#include #endif /* _SYS_DKSTAT_H_ */ ==== //depot/projects/smpng/sys/sys/signalvar.h#15 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)signalvar.h 8.6 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/signalvar.h,v 1.59 2003/04/30 19:57:21 jhb Exp $ + * $FreeBSD: src/sys/sys/signalvar.h,v 1.60 2003/05/05 21:16:28 jhb Exp $ */ #ifndef _SYS_SIGNALVAR_H_ @@ -238,7 +238,6 @@ int cursig(struct thread *td); void execsigs(struct proc *p); void gsignal(int pgid, int sig); -int issignal(struct thread *p); void killproc(struct proc *p, char *why); void pgsigio(struct sigio **, int signum, int checkctty); void pgsignal(struct pgrp *pgrp, int sig, int checkctty); ==== //depot/projects/smpng/sys/sys/syscallsubr.h#7 (text+ko) ==== @@ -22,7 +22,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/syscallsubr.h,v 1.8 2003/05/05 09:22:58 mbr Exp $ + * $FreeBSD: src/sys/sys/syscallsubr.h,v 1.9 2003/05/05 20:33:38 dwmalone Exp $ */ #ifndef _SYS_SYSCALLSUBR_H_ @@ -32,6 +32,8 @@ #include struct sockaddr; +struct msghdr; +struct mbuf; int kern___getcwd(struct thread *td, u_char *buf, enum uio_seg bufseg, u_int buflen); @@ -70,6 +72,8 @@ int kern_rmdir(struct thread *td, char *path, enum uio_seg pathseg); int kern_select(struct thread *td, int nd, fd_set *fd_in, fd_set *fd_ou, fd_set *fd_ex, struct timeval *tvp); +int kern_sendit(struct thread *td, int s, struct msghdr *mp, int flags, + struct mbuf *control); int kern_shmat(struct thread *td, int shmid, const void *shmaddr, int shmflg, int wantrem); int kern_shmctl(struct thread *td, int shmid, int cmd, void *buf, ==== //depot/projects/smpng/sys/vm/swap_pager.c#26 (text+ko) ==== @@ -64,7 +64,7 @@ * * @(#)swap_pager.c 8.9 (Berkeley) 3/21/94 * - * $FreeBSD: src/sys/vm/swap_pager.c,v 1.194 2003/04/28 17:13:53 alc Exp $ + * $FreeBSD: src/sys/vm/swap_pager.c,v 1.195 2003/05/06 02:45:28 alc Exp $ */ #include @@ -428,9 +428,8 @@ } mtx_unlock(&sw_alloc_mtx); - VM_OBJECT_LOCK(object); + VM_OBJECT_LOCK_ASSERT(object, MA_OWNED); vm_object_pip_wait(object, "swpdea"); - VM_OBJECT_UNLOCK(object); /* * Free all remaining metadata. We only bother to free it from ==== //depot/projects/smpng/sys/vm/vm_object.c#34 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_object.c,v 1.285 2003/05/04 19:23:40 alc Exp $ + * $FreeBSD: src/sys/vm/vm_object.c,v 1.286 2003/05/06 02:45:28 alc Exp $ */ /* @@ -600,12 +600,12 @@ } vm_page_unlock_queues(); splx(s); - VM_OBJECT_UNLOCK(object); /* * Let the pager know object is dead. */ vm_pager_deallocate(object); + VM_OBJECT_UNLOCK(object); /* * Remove the object from the global object list. ==== //depot/projects/smpng/sys/vm/vm_pager.c#12 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_pager.c,v 1.85 2003/04/05 21:01:16 alc Exp $ + * $FreeBSD: src/sys/vm/vm_pager.c,v 1.86 2003/05/06 02:45:28 alc Exp $ */ /* @@ -256,10 +256,15 @@ return (ret); } +/* + * The object must be locked. + */ void vm_pager_deallocate(object) vm_object_t object; { + + VM_OBJECT_LOCK_ASSERT(object, MA_OWNED); (*pagertab[object->type]->pgo_dealloc) (object); } ==== //depot/projects/smpng/sys/vm/vnode_pager.c#30 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)vnode_pager.c 7.5 (Berkeley) 4/20/91 - * $FreeBSD: src/sys/vm/vnode_pager.c,v 1.172 2003/04/26 18:33:18 alc Exp $ + * $FreeBSD: src/sys/vm/vnode_pager.c,v 1.173 2003/05/06 02:45:28 alc Exp $ */ /* @@ -175,19 +175,20 @@ return (object); } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed May 7 11:07:14 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D8E037B401; Wed, 7 May 2003 11:07:14 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id ABDD037B405 for ; Wed, 7 May 2003 11:07:13 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 81F0543F85 for ; Wed, 7 May 2003 11:07:12 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h47I7C0U051279 for ; Wed, 7 May 2003 11:07:12 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h47I7B6g051276 for perforce@freebsd.org; Wed, 7 May 2003 11:07:11 -0700 (PDT) Date: Wed, 7 May 2003 11:07:11 -0700 (PDT) Message-Id: <200305071807.h47I7B6g051276@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 30709 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 May 2003 18:07:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=30709 Change 30709 by jhb@jhb_laptop on 2003/05/07 11:06:27 IFC @30707. Affected files ... .. //depot/projects/smpng/sys/kern/kern_mac.c#24 integrate Differences ... ==== //depot/projects/smpng/sys/kern/kern_mac.c#24 (text+ko) ==== @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_mac.c,v 1.88 2003/04/24 04:31:24 alc Exp $ + * $FreeBSD: src/sys/kern/kern_mac.c,v 1.89 2003/05/07 17:49:24 rwatson Exp $ */ /* * Developed by the TrustedBSD Project. @@ -246,38 +246,29 @@ MALLOC_DEFINE(M_MACTEMP, "mactemp", "MAC temporary label storage"); /* - * mac_policy_list stores the list of active policies. A busy count is + * mac_static_policy_list holds a list of policy modules that are not + * loaded while the system is "live", and cannot be unloaded. These + * policies can be invoked without holding the busy count. + * + * mac_policy_list stores the list of dynamic policies. A busy count is * maintained for the list, stored in mac_policy_busy. The busy count - * is protected by mac_policy_list_lock; the list may be modified only + * is protected by mac_policy_mtx; the list may be modified only * while the busy count is 0, requiring that the lock be held to * prevent new references to the list from being acquired. For almost * all operations, incrementing the busy count is sufficient to * guarantee consistency, as the list cannot be modified while the * busy count is elevated. For a few special operations involving a - * change to the list of active policies, the lock itself must be held. - * A condition variable, mac_policy_list_not_busy, is used to signal - * potential exclusive consumers that they should try to acquire the - * lock if a first attempt at exclusive access fails. + * change to the list of active policies, the mtx itself must be held. + * A condition variable, mac_policy_cv, is used to signal potential + * exclusive consumers that they should try to acquire the lock if a + * first attempt at exclusive access fails. */ -static struct mtx mac_policy_list_lock; -static struct cv mac_policy_list_not_busy; +static struct mtx mac_policy_mtx; +static struct cv mac_policy_cv; +static int mac_policy_count; static LIST_HEAD(, mac_policy_conf) mac_policy_list; -static int mac_policy_list_busy; +static LIST_HEAD(, mac_policy_conf) mac_static_policy_list; -#define MAC_POLICY_LIST_LOCKINIT() do { \ - mtx_init(&mac_policy_list_lock, "mac_policy_list_lock", NULL, \ - MTX_DEF); \ - cv_init(&mac_policy_list_not_busy, "mac_policy_list_not_busy"); \ -} while (0) - -#define MAC_POLICY_LIST_LOCK() do { \ - mtx_lock(&mac_policy_list_lock); \ -} while (0) - -#define MAC_POLICY_LIST_UNLOCK() do { \ - mtx_unlock(&mac_policy_list_lock); \ -} while (0) - /* * We manually invoke WITNESS_WARN() to allow Witness to generate * warnings even if we don't end up ever triggering the wait at @@ -287,35 +278,67 @@ * framework to become quiescent so that a policy list change may * be made. */ -#define MAC_POLICY_LIST_EXCLUSIVE() do { \ - WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, \ - "mac_policy_list_exclusive() at %s:%d", __FILE__, __LINE__);\ - mtx_lock(&mac_policy_list_lock); \ - while (mac_policy_list_busy != 0) \ - cv_wait(&mac_policy_list_not_busy, \ - &mac_policy_list_lock); \ -} while (0) +static __inline void +mac_policy_grab_exclusive(void) +{ + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, + "mac_policy_grab_exclusive() at %s:%d", __FILE__, __LINE__); + mtx_lock(&mac_policy_mtx); + while (mac_policy_count != 0) + cv_wait(&mac_policy_cv, &mac_policy_mtx); +} + +static __inline void +mac_policy_assert_exclusive(void) +{ + mtx_assert(&mac_policy_mtx, MA_OWNED); + KASSERT(mac_policy_count == 0, + ("mac_policy_assert_exclusive(): not exclusive")); +} + +static __inline void +mac_policy_release_exclusive(void) +{ + + KASSERT(mac_policy_count == 0, + ("mac_policy_release_exclusive(): not exclusive")); + mtx_unlock(&mac_policy_mtx); + cv_signal(&mac_policy_cv); +} + +static __inline void +mac_policy_list_busy(void) +{ + mtx_lock(&mac_policy_mtx); + mac_policy_count++; + mtx_unlock(&mac_policy_mtx); +} -#define MAC_POLICY_LIST_ASSERT_EXCLUSIVE() do { \ - mtx_assert(&mac_policy_list_lock, MA_OWNED); \ - KASSERT(mac_policy_list_busy == 0, \ - ("MAC_POLICY_LIST_ASSERT_EXCLUSIVE()")); \ -} while (0) +static __inline int +mac_policy_list_conditional_busy(void) +{ + int ret; -#define MAC_POLICY_LIST_BUSY() do { \ - MAC_POLICY_LIST_LOCK(); \ - mac_policy_list_busy++; \ - MAC_POLICY_LIST_UNLOCK(); \ -} while (0) + mtx_lock(&mac_policy_mtx); + if (!LIST_EMPTY(&mac_policy_list)) { + mac_policy_count++; + ret = 1; + } else + ret = 0; + mtx_unlock(&mac_policy_mtx); + return (ret); +} -#define MAC_POLICY_LIST_UNBUSY() do { \ - MAC_POLICY_LIST_LOCK(); \ - mac_policy_list_busy--; \ - KASSERT(mac_policy_list_busy >= 0, ("MAC_POLICY_LIST_LOCK")); \ - if (mac_policy_list_busy == 0) \ - cv_signal(&mac_policy_list_not_busy); \ - MAC_POLICY_LIST_UNLOCK(); \ -} while (0) +static __inline void +mac_policy_list_unbusy(void) +{ + mtx_lock(&mac_policy_mtx); + mac_policy_count--; + KASSERT(mac_policy_count >= 0, ("MAC_POLICY_LIST_LOCK")); + if (mac_policy_count == 0) + cv_signal(&mac_policy_cv); + mtx_unlock(&mac_policy_mtx); +} /* * MAC_CHECK performs the designated check by walking the policy @@ -325,16 +348,24 @@ */ #define MAC_CHECK(check, args...) do { \ struct mac_policy_conf *mpc; \ + int entrycount; \ \ error = 0; \ - MAC_POLICY_LIST_BUSY(); \ - LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ + LIST_FOREACH(mpc, &mac_static_policy_list, mpc_list) { \ if (mpc->mpc_ops->mpo_ ## check != NULL) \ error = error_select( \ mpc->mpc_ops->mpo_ ## check (args), \ error); \ } \ - MAC_POLICY_LIST_UNBUSY(); \ + if ((entrycount = mac_policy_list_conditional_busy()) != 0) { \ + LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ + if (mpc->mpc_ops->mpo_ ## check != NULL) \ + error = error_select( \ + mpc->mpc_ops->mpo_ ## check (args), \ + error); \ + } \ + mac_policy_list_unbusy(); \ + } \ } while (0) /* @@ -347,14 +378,22 @@ */ #define MAC_BOOLEAN(operation, composition, args...) do { \ struct mac_policy_conf *mpc; \ + int entrycount; \ \ - MAC_POLICY_LIST_BUSY(); \ - LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ + LIST_FOREACH(mpc, &mac_static_policy_list, mpc_list) { \ if (mpc->mpc_ops->mpo_ ## operation != NULL) \ result = result composition \ mpc->mpc_ops->mpo_ ## operation (args); \ } \ - MAC_POLICY_LIST_UNBUSY(); \ + if ((entrycount = mac_policy_list_conditional_busy()) != 0) { \ + LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ + if (mpc->mpc_ops->mpo_ ## operation != NULL) \ + result = result composition \ + mpc->mpc_ops->mpo_ ## operation \ + (args); \ + } \ + mac_policy_list_unbusy(); \ + } \ } while (0) #define MAC_EXTERNALIZE(type, label, elementlist, outbuf, \ @@ -452,13 +491,19 @@ */ #define MAC_PERFORM(operation, args...) do { \ struct mac_policy_conf *mpc; \ + int entrycount; \ \ - MAC_POLICY_LIST_BUSY(); \ - LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ + LIST_FOREACH(mpc, &mac_static_policy_list, mpc_list) { \ if (mpc->mpc_ops->mpo_ ## operation != NULL) \ mpc->mpc_ops->mpo_ ## operation (args); \ } \ - MAC_POLICY_LIST_UNBUSY(); \ + if ((entrycount = mac_policy_list_conditional_busy()) != 0) { \ + LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ + if (mpc->mpc_ops->mpo_ ## operation != NULL) \ + mpc->mpc_ops->mpo_ ## operation (args); \ + } \ + mac_policy_list_unbusy(); \ + } \ } while (0) /* @@ -468,8 +513,11 @@ mac_init(void) { + LIST_INIT(&mac_static_policy_list); LIST_INIT(&mac_policy_list); - MAC_POLICY_LIST_LOCKINIT(); + + mtx_init(&mac_policy_mtx, "mac_policy_mtx", NULL, MTX_DEF); + cv_init(&mac_policy_cv, "mac_policy_cv"); } /* @@ -496,11 +544,18 @@ int labelmbufs; #endif - MAC_POLICY_LIST_ASSERT_EXCLUSIVE(); + mac_policy_assert_exclusive(); #ifndef MAC_ALWAYS_LABEL_MBUF labelmbufs = 0; #endif + + LIST_FOREACH(tmpc, &mac_static_policy_list, mpc_list) { +#ifndef MAC_ALWAYS_LABEL_MBUF + if (tmpc->mpc_loadtime_flags & MPC_LOADTIME_FLAG_LABELMBUFS) + labelmbufs++; +#endif + } LIST_FOREACH(tmpc, &mac_policy_list, mpc_list) { #ifndef MAC_ALWAYS_LABEL_MBUF if (tmpc->mpc_loadtime_flags & MPC_LOADTIME_FLAG_LABELMBUFS) @@ -555,38 +610,75 @@ mac_policy_register(struct mac_policy_conf *mpc) { struct mac_policy_conf *tmpc; - int slot; + int error, slot, static_entry; + + error = 0; + + /* + * We don't technically need exclusive access while !mac_late, + * but hold it for assertion consistency. + */ + mac_policy_grab_exclusive(); + + /* + * If the module can potentially be unloaded, or we're loading + * late, we have to stick it in the non-static list and pay + * an extra performance overhead. Otherwise, we can pay a + * light locking cost and stick it in the static list. + */ + static_entry = (!mac_late && + !(mpc->mpc_loadtime_flags & MPC_LOADTIME_FLAG_UNLOADOK)); - MAC_POLICY_LIST_EXCLUSIVE(); - LIST_FOREACH(tmpc, &mac_policy_list, mpc_list) { - if (strcmp(tmpc->mpc_name, mpc->mpc_name) == 0) { - MAC_POLICY_LIST_UNLOCK(); - return (EEXIST); + if (static_entry) { + LIST_FOREACH(tmpc, &mac_static_policy_list, mpc_list) { + if (strcmp(tmpc->mpc_name, mpc->mpc_name) == 0) { + error = EEXIST; + goto out; + } + } + } else { + LIST_FOREACH(tmpc, &mac_policy_list, mpc_list) { + if (strcmp(tmpc->mpc_name, mpc->mpc_name) == 0) { + error = EEXIST; + goto out; + } } } if (mpc->mpc_field_off != NULL) { slot = ffs(mac_policy_offsets_free); if (slot == 0) { - MAC_POLICY_LIST_UNLOCK(); - return (ENOMEM); + error = ENOMEM; + goto out; } slot--; mac_policy_offsets_free &= ~(1 << slot); *mpc->mpc_field_off = slot; } mpc->mpc_runtime_flags |= MPC_RUNTIME_FLAG_REGISTERED; - LIST_INSERT_HEAD(&mac_policy_list, mpc, mpc_list); + + /* + * If we're loading a MAC module after the framework has + * initialized, it has to go into the dynamic list. If + * we're loading it before we've finished initializing, + * it can go into the static list with weaker locker + * requirements. + */ + if (static_entry) + LIST_INSERT_HEAD(&mac_static_policy_list, mpc, mpc_list); + else + LIST_INSERT_HEAD(&mac_policy_list, mpc, mpc_list); /* Per-policy initialization. */ if (mpc->mpc_ops->mpo_init != NULL) (*(mpc->mpc_ops->mpo_init))(mpc); mac_policy_updateflags(); - MAC_POLICY_LIST_UNLOCK(); printf("Security policy loaded: %s (%s)\n", mpc->mpc_fullname, mpc->mpc_name); - return (0); +out: + mac_policy_release_exclusive(); + return (error); } static int @@ -598,9 +690,9 @@ * to see if we did the run-time registration, and if not, * silently succeed. */ - MAC_POLICY_LIST_EXCLUSIVE(); + mac_policy_grab_exclusive(); if ((mpc->mpc_runtime_flags & MPC_RUNTIME_FLAG_REGISTERED) == 0) { - MAC_POLICY_LIST_UNLOCK(); + mac_policy_release_exclusive(); return (0); } #if 0 @@ -617,7 +709,7 @@ * by its own definition. */ if ((mpc->mpc_loadtime_flags & MPC_LOADTIME_FLAG_UNLOADOK) == 0) { - MAC_POLICY_LIST_UNLOCK(); + mac_policy_release_exclusive(); return (EBUSY); } if (mpc->mpc_ops->mpo_destroy != NULL) @@ -626,7 +718,8 @@ LIST_REMOVE(mpc, mpc_list); mpc->mpc_runtime_flags &= ~MPC_RUNTIME_FLAG_REGISTERED; mac_policy_updateflags(); - MAC_POLICY_LIST_UNLOCK(); + + mac_policy_release_exclusive(); printf("Security policy unload: %s (%s)\n", mpc->mpc_fullname, mpc->mpc_name); @@ -3773,14 +3866,13 @@ { struct mac_policy_conf *mpc; char target[MAC_MAX_POLICY_NAME]; - int error; + int entrycount, error; error = copyinstr(uap->policy, target, sizeof(target), NULL); if (error) return (error); error = ENOSYS; - MAC_POLICY_LIST_BUSY(); LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { if (strcmp(mpc->mpc_name, target) == 0 && mpc->mpc_ops->mpo_syscall != NULL) { @@ -3790,8 +3882,18 @@ } } + if ((entrycount = mac_policy_list_conditional_busy()) != 0) { + LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { + if (strcmp(mpc->mpc_name, target) == 0 && + mpc->mpc_ops->mpo_syscall != NULL) { + error = mpc->mpc_ops->mpo_syscall(td, + uap->call, uap->arg); + break; + } + } + mac_policy_list_unbusy(); + } out: - MAC_POLICY_LIST_UNBUSY(); return (error); } From owner-p4-projects@FreeBSD.ORG Wed May 7 12:30:59 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 368FC37B401; Wed, 7 May 2003 12:30:59 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C116E37B404 for ; Wed, 7 May 2003 12:30:58 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 524C443F93 for ; Wed, 7 May 2003 12:30:58 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h47JUw0U055295 for ; Wed, 7 May 2003 12:30:58 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h47JUvKw055292 for perforce@freebsd.org; Wed, 7 May 2003 12:30:57 -0700 (PDT) Date: Wed, 7 May 2003 12:30:57 -0700 (PDT) Message-Id: <200305071930.h47JUvKw055292@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30716 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 May 2003 19:31:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=30716 Change 30716 by peter@peter_daintree on 2003/05/07 12:30:10 Fix the context switch bug with a sledgehammer. Defer re-enabling interrupts till after we've retrieved the user stack pointer from PCPU area, otherwise if we preempt and another process makes a syscall before we resume saving, then all hell breaks loose. This defers the sti for too long and that needs to be fixed, but that can be fixed later. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/exception.S#2 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/exception.S#2 (text+ko) ==== @@ -202,7 +202,6 @@ #swapgs movq %rsp,PCPU(SCRATCH_RSP) movq common_tss+COMMON_TSS_RSP0,%rsp - sti /* Now emulate a trapframe. Ugh. */ subq $TF_SIZE,%rsp movq $KUDSEL,TF_SS(%rsp) @@ -226,6 +225,7 @@ movq %r15,TF_R15(%rsp) /* C preserved */ movq PCPU(SCRATCH_RSP),%r12 /* %r12 already saved */ movq %r12,TF_RSP(%rsp) /* user stack pointer */ + sti call syscall movq PCPU(CURPCB),%rax testq $PCB_FULLCTX,PCB_FLAGS(%rax) From owner-p4-projects@FreeBSD.ORG Wed May 7 13:28:09 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 25A2337B404; Wed, 7 May 2003 13:28:09 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CFC3B37B401 for ; Wed, 7 May 2003 13:28:08 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E9B143F75 for ; Wed, 7 May 2003 13:28:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h47KS80U063462 for ; Wed, 7 May 2003 13:28:08 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h47KS7Tm063457 for perforce@freebsd.org; Wed, 7 May 2003 13:28:07 -0700 (PDT) Date: Wed, 7 May 2003 13:28:07 -0700 (PDT) Message-Id: <200305072028.h47KS7Tm063457@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 30718 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 May 2003 20:28:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=30718 Change 30718 by rwatson@rwatson_tislabs on 2003/05/07 13:27:19 Fix a misspelling. Affected files ... .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#385 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#385 (text+ko) ==== @@ -103,7 +103,7 @@ #endif static unsigned int mac_max_slots = MAC_MAX_SLOTS; -static unsigned int mac_slots_offsets_free = (1 << MAC_MAX_SLOTS) - 1; +static unsigned int mac_slot_offsets_free = (1 << MAC_MAX_SLOTS) - 1; SYSCTL_UINT(_security_mac, OID_AUTO, max_slots, CTLFLAG_RD, &mac_max_slots, 0, ""); From owner-p4-projects@FreeBSD.ORG Wed May 7 13:32:17 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B889C37B401; Wed, 7 May 2003 13:32:16 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 66BE037B404 for ; Wed, 7 May 2003 13:32:16 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3476D43F93 for ; Wed, 7 May 2003 13:32:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h47KWF0U063705 for ; Wed, 7 May 2003 13:32:15 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h47KWEMB063702 for perforce@freebsd.org; Wed, 7 May 2003 13:32:14 -0700 (PDT) Date: Wed, 7 May 2003 13:32:14 -0700 (PDT) Message-Id: <200305072032.h47KWEMB063702@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 30720 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 May 2003 20:32:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=30720 Change 30720 by rwatson@rwatson_tislabs on 2003/05/07 13:31:24 Integ TrustedBSD base tree--various rc.d fixes, libthr bug fixes, and loop back of several MAC bits, including removing of a now unneeded mbuf header label copy (m_tags merged), locking optimizations for the framework, and TCP bug fix for timewait. Affected files ... .. //depot/projects/trustedbsd/base/UPDATING#31 integrate .. //depot/projects/trustedbsd/base/bin/df/df.1#4 integrate .. //depot/projects/trustedbsd/base/bin/ls/ls.1#17 integrate .. //depot/projects/trustedbsd/base/bin/mv/mv.c#9 integrate .. //depot/projects/trustedbsd/base/bin/mv/pathnames.h#3 delete .. //depot/projects/trustedbsd/base/bin/sh/var.c#6 integrate .. //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/clparse.c#5 integrate .. //depot/projects/trustedbsd/base/contrib/tar/src/buffer.c#5 integrate .. //depot/projects/trustedbsd/base/etc/Makefile#30 integrate .. //depot/projects/trustedbsd/base/etc/devd.conf#4 integrate .. //depot/projects/trustedbsd/base/etc/devfs.conf#1 branch .. //depot/projects/trustedbsd/base/etc/newsyslog.conf#9 integrate .. //depot/projects/trustedbsd/base/etc/pccard_ether#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/abi#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/apm#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/apmd#7 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/archdep#5 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/cron#3 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/devfs#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/jail#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/kpasswdd#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/localdaemons#2 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/network3#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/securelevel#6 integrate .. //depot/projects/trustedbsd/base/etc/remote#3 integrate .. //depot/projects/trustedbsd/base/etc/services#8 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/cvs/cvs/Makefile#6 integrate .. //depot/projects/trustedbsd/base/include/paths.h#7 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/gen/rfork_thread.S#4 integrate .. //depot/projects/trustedbsd/base/lib/libpam/libpam/Makefile#17 integrate .. //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_cancel.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libthr/arch/i386/i386/_setcurthread.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mutex.c#2 integrate .. //depot/projects/trustedbsd/base/lib/libthr/thread/thr_sig.c#2 integrate .. //depot/projects/trustedbsd/base/release/alpha/dokern.sh#9 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#18 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/readme/article.sgml#12 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#64 integrate .. //depot/projects/trustedbsd/base/release/doc/share/sgml/release.ent#6 integrate .. //depot/projects/trustedbsd/base/sbin/Makefile#13 integrate .. //depot/projects/trustedbsd/base/sbin/bsdlabel/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sbin/dump/main.c#17 integrate .. //depot/projects/trustedbsd/base/sbin/dump/traverse.c#13 integrate .. //depot/projects/trustedbsd/base/sbin/mdmfs/mdmfs.8#8 integrate .. //depot/projects/trustedbsd/base/sbin/shutdown/pathnames.h#3 delete .. //depot/projects/trustedbsd/base/sbin/shutdown/shutdown.c#4 integrate .. //depot/projects/trustedbsd/base/sbin/startslip/startslip.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/vinum/commands.c#9 integrate .. //depot/projects/trustedbsd/base/sbin/vinum/vinum.8#8 integrate .. //depot/projects/trustedbsd/base/share/examples/etc/make.conf#22 integrate .. //depot/projects/trustedbsd/base/share/man/man4/geom.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man9/malloc.9#8 integrate .. //depot/projects/trustedbsd/base/share/mk/bsd.sys.mk#9 integrate .. //depot/projects/trustedbsd/base/share/sendmail/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/trustedbsd/base/sys/conf/NOTES#34 integrate .. //depot/projects/trustedbsd/base/sys/conf/newvers.sh#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/trustedbsd/base/sys/dev/em/if_em.c#20 integrate .. //depot/projects/trustedbsd/base/sys/dev/en/midway.c#11 integrate .. //depot/projects/trustedbsd/base/sys/dev/en/midwayvar.h#5 integrate .. //depot/projects/trustedbsd/base/sys/dev/usb/uhci_pci.c#3 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumrequest.c#9 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumrevive.c#8 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_aes.c#11 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_bsd.c#22 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_io.c#15 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/intr_machdep.c#10 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#41 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#32 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_subr.c#17 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_synch.c#26 integrate .. //depot/projects/trustedbsd/base/sys/kern/uipc_syscalls.c#29 integrate .. //depot/projects/trustedbsd/base/sys/kern/vfs_default.c#18 integrate .. //depot/projects/trustedbsd/base/sys/net/if_atm.h#5 integrate .. //depot/projects/trustedbsd/base/sys/net/if_atmsubr.c#8 integrate .. //depot/projects/trustedbsd/base/sys/netinet/ip_input.c#25 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_input.c#36 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_subr.c#25 integrate .. //depot/projects/trustedbsd/base/sys/netinet/tcp_var.h#12 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_en_pci.c#4 integrate .. //depot/projects/trustedbsd/base/sys/pci/if_sis.c#21 integrate .. //depot/projects/trustedbsd/base/sys/sys/dkstat.h#3 integrate .. //depot/projects/trustedbsd/base/sys/sys/signalvar.h#12 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscallsubr.h#6 integrate .. //depot/projects/trustedbsd/base/sys/vm/swap_pager.c#18 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#32 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_pager.c#11 integrate .. //depot/projects/trustedbsd/base/sys/vm/vnode_pager.c#24 integrate .. //depot/projects/trustedbsd/base/tools/tools/tinderbox/tbmaster.pl#7 integrate .. //depot/projects/trustedbsd/base/usr.bin/calendar/calendars/calendar.freebsd#23 integrate .. //depot/projects/trustedbsd/base/usr.bin/vi/pathnames.h#2 integrate .. //depot/projects/trustedbsd/base/usr.sbin/newsyslog/newsyslog.c#15 integrate Differences ... ==== //depot/projects/trustedbsd/base/UPDATING#31 (text+ko) ==== @@ -17,6 +17,11 @@ developers choose to disable these features on build machines to maximize performance. +20030505: + Kerberos 5 (Heimdal) is now built by default. Setting + MAKE_KERBEROS5 no longer has any effect. If you do NOT + want the "base" Kerberos 5, you need to set NO_KERBEROS. + 20030502: groff has been updated. If you try to do a buildworld and get an infinite loop in troff, update to May 4th or newer. If you @@ -1273,4 +1278,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.250 2003/05/04 06:26:30 imp Exp $ +$FreeBSD: src/UPDATING,v 1.251 2003/05/05 20:05:37 markm Exp $ ==== //depot/projects/trustedbsd/base/bin/df/df.1#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)df.1 8.3 (Berkeley) 5/8/95 -.\" $FreeBSD: src/bin/df/df.1,v 1.28 2002/08/26 04:56:23 trhodes Exp $ +.\" $FreeBSD: src/bin/df/df.1,v 1.29 2003/05/06 21:54:46 trhodes Exp $ .\" .Dd May 8, 1995 .Dt DF 1 @@ -81,11 +81,11 @@ .It Fl H "Human-readable" output. Use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte and Petabyte in order to reduce the number of -digits to three or less using base 10 for sizes. +digits to four or fewer using base 10 for sizes. .It Fl h "Human-readable" output. Use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte and Petabyte in order to reduce the number of -digits to three or less using base 2 for sizes. +digits to four or fewer using base 2 for sizes. .It Fl i Include statistics on the number of free inodes. .It Fl k ==== //depot/projects/trustedbsd/base/bin/ls/ls.1#17 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.73 2003/01/20 21:25:00 chris Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.74 2003/05/06 21:54:46 trhodes Exp $ .\" .Dd May 19, 2002 .Dt LS 1 @@ -175,7 +175,7 @@ When used with the .Fl l option, use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte -and Petabyte in order to reduce the number of digits to three or less +and Petabyte in order to reduce the number of digits to four or fewer using base 2 for sizes. .It Fl i For each file, print the file's file serial number (inode number). ==== //depot/projects/trustedbsd/base/bin/mv/mv.c#9 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.40 2003/05/01 16:58:56 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.41 2003/05/05 22:49:22 obrien Exp $"); #include #include @@ -67,8 +67,6 @@ #include #include -#include "pathnames.h" - int fflg, iflg, nflg, vflg; int copy(char *, char *); ==== //depot/projects/trustedbsd/base/bin/sh/var.c#6 (text+ko) ==== @@ -40,10 +40,11 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.23 2002/10/01 00:54:14 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.24 2003/05/05 22:49:22 obrien Exp $"); #include #include +#include /* * Shell variables. @@ -105,7 +106,7 @@ NULL }, { &vmpath, VSTRFIXED|VTEXTFIXED|VUNSET, "MAILPATH=", NULL }, - { &vpath, VSTRFIXED|VTEXTFIXED, "PATH=/bin:/usr/bin", + { &vpath, VSTRFIXED|VTEXTFIXED, "PATH=" _PATH_DEFPATH, changepath }, { &vppid, VSTRFIXED|VTEXTFIXED|VUNSET, "PPID=", NULL }, ==== //depot/projects/trustedbsd/base/contrib/isc-dhcp/client/clparse.c#5 (text+ko) ==== @@ -44,7 +44,7 @@ #ifndef lint static char copyright[] = "$Id: clparse.c,v 1.62.2.3 2002/11/17 02:25:43 dhankins Exp $ Copyright (c) 1996-2002 The Internet Software Consortium. All rights reserved.\n" -"$FreeBSD: src/contrib/isc-dhcp/client/clparse.c,v 1.9 2003/01/16 07:22:32 obrien Exp $\n"; +"$FreeBSD: src/contrib/isc-dhcp/client/clparse.c,v 1.10 2003/05/05 22:49:22 obrien Exp $\n"; #endif /* not lint */ #include "dhcpd.h" @@ -53,7 +53,7 @@ struct client_config top_level_config; -char client_script_name [] = "/sbin/dhclient-script"; +char client_script_name [] = _PATH_DHCLIENT_SCRIPT; u_int32_t default_requested_options [] = { DHO_SUBNET_MASK, ==== //depot/projects/trustedbsd/base/contrib/tar/src/buffer.c#5 (text+ko) ==== @@ -19,12 +19,18 @@ with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/tar/src/buffer.c,v 1.5 2002/10/09 07:33:29 sobomax Exp $ */ +/* $FreeBSD: src/contrib/tar/src/buffer.c,v 1.6 2003/05/05 22:49:22 obrien Exp $ */ #include "system.h" #include +#if __FreeBSD__ +# include +#else +# define _PATH_BSHELL "/bin/sh" +#endif + #if MSDOS # include #endif @@ -1549,7 +1555,7 @@ pid_t child; const char *shell = getenv ("SHELL"); if (! shell) - shell = "/bin/sh"; + shell = _PATH_BSHELL; child = xfork (); if (child == 0) { ==== //depot/projects/trustedbsd/base/etc/Makefile#30 (text+ko) ==== @@ -1,13 +1,13 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.312 2003/05/02 22:27:31 dougb Exp $ +# $FreeBSD: src/etc/Makefile,v 1.313 2003/05/06 07:25:17 dougb Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail .endif BIN1= amd.map apmd.conf auth.conf \ - crontab csh.cshrc csh.login csh.logout \ - devd.conf dhclient.conf disktab fbtab ftpusers gettytab group \ + crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \ + dhclient.conf disktab fbtab ftpusers gettytab group \ hosts hosts.allow hosts.equiv hosts.lpd \ inetd.conf login.access login.conf \ mac.conf motd netconfig network.subr networks newsyslog.conf \ ==== //depot/projects/trustedbsd/base/etc/devd.conf#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.3 2003/05/03 10:16:55 akiyama Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.4 2003/05/07 15:48:20 imp Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -64,9 +64,10 @@ }; # Don't even try to second guess what to do about drivers that don't -# match here. Instead, pass it off to a smart script to deal. +# match here. Instead, pass it off to syslog. Commented out for the +# moment, as pnpinfo isn't set in devd yet nomatch 0 { - action "logger Unknown device: $pnpinfo $location $bus"; + // action "logger Unknown device: $pnpinfo $location $bus"; }; /* EXAMPLES TO END OF FILE ==== //depot/projects/trustedbsd/base/etc/newsyslog.conf#9 (text+ko) ==== @@ -1,5 +1,14 @@ # configuration file for newsyslog -# $FreeBSD: src/etc/newsyslog.conf,v 1.44 2003/04/08 16:14:02 des Exp $ +# $FreeBSD: src/etc/newsyslog.conf,v 1.46 2003/05/05 19:08:33 gad Exp $ +# +# Entries which do not specify the '/pid_file' field will cause the +# syslogd process to be signalled when that log file is rotated. This +# action is only appropriate for log files which are written to by the +# syslogd process (ie, files listed in /etc/syslogd.conf). If there +# is no process which needs to be signalled when a given log file is +# rotated, then the entry for that file should include the 'N' flag. +# +# The 'flags' field is one or more of the letters: BCGJNUWZ or a '-'. # # Note: some sites will want to select more restrictive protections than the # defaults. In particular, it may be desirable to switch many of the 644 @@ -7,23 +16,23 @@ # contents of maillog, messages, and lpd-errs to be confidential. In the # future, these defaults may change to more conservative ones. # -# logfilename [owner:group] mode count size when [ZJB] [/pid_file] [sig_num] +# logfilename [owner:group] mode count size when flags [/pid_file] [sig_num] /var/log/all.log 600 7 * @T00 J /var/log/amd.log 644 7 100 * J /var/log/auth.log 600 7 100 * J /var/log/console.log 600 5 100 * J /var/log/cron 600 3 100 * J -/var/log/daily.log 640 7 * @T00 J +/var/log/daily.log 640 7 * @T00 JN /var/log/debug.log 600 7 100 * J /var/log/kerberos.log 600 7 100 * J /var/log/lpd-errs 644 7 100 * J /var/log/maillog 640 7 * @T00 J /var/log/messages 644 5 100 * J -/var/log/monthly.log 640 12 * $M1D0 J +/var/log/monthly.log 640 12 * $M1D0 JN /var/log/ppp.log root:network 640 3 100 * J /var/log/security 600 10 100 * J /var/log/sendmail.st 640 10 * 168 B /var/log/slip.log root:network 640 3 100 * J -/var/log/weekly.log 640 5 1 $W6D0 J +/var/log/weekly.log 640 5 1 $W6D0 JN /var/log/wtmp 644 3 * @01T05 B /var/log/xferlog 600 7 100 * J ==== //depot/projects/trustedbsd/base/etc/pccard_ether#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/etc/pccard_ether,v 1.28 2002/12/12 09:31:09 imp Exp $ +# $FreeBSD: src/etc/pccard_ether,v 1.29 2003/05/05 19:06:46 ume Exp $ # # pccard_ether interfacename [start|stop] [ifconfig option] # @@ -134,8 +134,8 @@ # IPv6 setup case ${ipv6_enable} in [Yy][Ee][Ss]) - if [ -r /etc/rc.network6 ]; then - . /etc/rc.network6 + if [ -r /etc/rc.d/network_ipv6 ]; then + . /etc/rc.d/network_ipv6 network6_interface_setup ${interface} fi ;; ==== //depot/projects/trustedbsd/base/etc/rc.d/abi#2 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/abi,v 1.1 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/abi,v 1.2 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: abi # REQUIRE: LOGIN +# BEFORE: securelevel # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/trustedbsd/base/etc/rc.d/apm#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/apm,v 1.2 2003/05/02 08:35:17 mtm Exp $ +# $FreeBSD: src/etc/rc.d/apm,v 1.3 2003/05/05 23:55:43 obrien Exp $ # # PROVIDE: apm @@ -19,7 +19,7 @@ apm_precmd() { case `${SYSCTL_N} hw.machine_arch` in - i386|amd64) + i386) return 0 ;; esac ==== //depot/projects/trustedbsd/base/etc/rc.d/apmd#7 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: apmd,v 1.5 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/apmd,v 1.6 2003/05/02 08:35:17 mtm Exp $ +# $FreeBSD: src/etc/rc.d/apmd,v 1.7 2003/05/06 00:09:51 obrien Exp $ # # PROVIDE: apmd @@ -24,7 +24,7 @@ apmd_prestart() { case `${SYSCTL_N} hw.machine_arch` in - i386|amd64) + i386) # Start apm if it is not already running /etc/rc.d/apm forcestatus > /dev/null || /etc/rc.d/apm forcestart ;; ==== //depot/projects/trustedbsd/base/etc/rc.d/archdep#5 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/archdep,v 1.4 2003/05/02 08:35:17 mtm Exp $ +# $FreeBSD: src/etc/rc.d/archdep,v 1.5 2003/05/06 00:09:51 obrien Exp $ # # PROVIDE: archdep @@ -56,7 +56,7 @@ _arch=`${SYSCTL_N} hw.machine` echo -n "Initial $_arch initialization:" case $_arch in -i386|amd64) +i386) ibcs2_compat ;; alpha) ==== //depot/projects/trustedbsd/base/etc/rc.d/cron#3 (text+ko) ==== @@ -1,11 +1,12 @@ #!/bin/sh # # $NetBSD: cron,v 1.5 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/cron,v 1.2 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/cron,v 1.3 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: cron # REQUIRE: LOGIN +# BEFORE: securelevel # KEYWORD: FreeBSD NetBSD shutdown . /etc/rc.subr ==== //depot/projects/trustedbsd/base/etc/rc.d/devfs#4 (text+ko) ==== @@ -1,27 +1,41 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/devfs,v 1.3 2003/05/02 08:10:58 mtm Exp $ +# $FreeBSD: src/etc/rc.d/devfs,v 1.5 2003/05/06 01:10:33 dougb Exp $ # # PROVIDE: devfs # REQUIRE: LOGIN +# BEFORE: securelevel # KEYWORD: FreeBSD . /etc/rc.subr name="devfs" +start_cmd='read_devfs_conf' +stop_cmd=':' + +read_devfs_conf() +{ + if [ -r /etc/devfs.conf ]; then + cd /dev + while read action device parameter; do + case "${action}" in + l*) if [ -c ${device} -a ! -e ${parameter} ]; then + ln -fs ${device} ${parameter} + fi + ;; + o*) if [ -c ${device} ]; then + chown ${parameter} ${device} + fi + ;; + p*) if [ -c ${device} ]; then + chmod ${parameter} ${device} + fi + ;; + esac + done < /etc/devfs.conf + fi +} load_rc_config $name - -# Setup DEVFS, ie permissions, links etc. -# -if [ -c /dev/ttyv0 -a ! -e /dev/vga ];then - ln -fs /dev/ttyv0 /dev/vga -fi - -# XXX - in case the user has a customized /etc/rc.devfs we need to keep -# pulling it in until we have a better way of doing this in rc.d. -# -if [ -r /etc/rc.devfs ]; then - sh /etc/rc.devfs -fi +run_rc_command "$1" ==== //depot/projects/trustedbsd/base/etc/rc.d/jail#2 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.3 2003/04/19 07:50:32 mtm Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.4 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: jail # REQUIRE: LOGIN +# BEFORE: securelevel # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/trustedbsd/base/etc/rc.d/kpasswdd#2 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/kpasswdd,v 1.1 2003/04/30 20:58:49 markm Exp $ +# $FreeBSD: src/etc/rc.d/kpasswdd,v 1.2 2003/05/06 02:28:03 mtm Exp $ # # PROVIDE: kpasswdd -# REQUIRE: kadmind5 +# REQUIRE: kadmin # BEFORE: DAEMON # KEYWORD: FreeBSD ==== //depot/projects/trustedbsd/base/etc/rc.d/localdaemons#2 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/localdaemons,v 1.1 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/localdaemons,v 1.2 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: localdaemons # REQUIRE: abi +# BEFORE: securelevel # KEYWORD: FreeBSD shutdown . /etc/rc.subr ==== //depot/projects/trustedbsd/base/etc/rc.d/network3#4 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/network3,v 1.136 2002/10/12 10:31:31 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/network3,v 1.137 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: network3 # REQUIRE: localdaemons +# BEFORE: securelevel # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/trustedbsd/base/etc/rc.d/securelevel#6 (text+ko) ==== @@ -1,12 +1,10 @@ #!/bin/sh # # $NetBSD: securelevel,v 1.4 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/securelevel,v 1.5 2003/04/24 08:27:29 mtm Exp $ +# $FreeBSD: src/etc/rc.d/securelevel,v 1.6 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: securelevel -# REQUIRE: aftermountlkm ipnat mountd -# BEFORE: DAEMON # KEYWORD: FreeBSD NetBSD . /etc/rc.subr ==== //depot/projects/trustedbsd/base/etc/remote#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/remote,v 1.11 2001/02/21 19:45:47 nik Exp $ +# $FreeBSD: src/etc/remote,v 1.12 2003/05/05 21:37:43 dougb Exp $ # # @(#)remote 5.2 (Berkeley) 6/30/90 # @@ -52,7 +52,7 @@ cuaa0c|cua0c:dv=/dev/cuaa0:br#9600:pa=none: # Finger friendly shortcuts -com1:dv=/dev/cuaa0:br#9600:pa=none: -com2:dv=/dev/cuaa1:br#9600:pa=none: -com3:dv=/dev/cuaa2:br#9600:pa=none: -com4:dv=/dev/cuaa3:br#9600:pa=none: +sio0|com1:dv=/dev/cuaa0:br#9600:pa=none: +sio1|com2:dv=/dev/cuaa1:br#9600:pa=none: +sio2|com3:dv=/dev/cuaa2:br#9600:pa=none: +sio3|com4:dv=/dev/cuaa3:br#9600:pa=none: ==== //depot/projects/trustedbsd/base/etc/services#8 (text+ko) ==== @@ -16,7 +16,7 @@ # Kerberos services are for Kerberos v4, and are unofficial. Sites running # v5 should uncomment v5 entries and comment v4 entries. # -# $FreeBSD: src/etc/services,v 1.92 2003/04/29 09:54:06 mdodd Exp $ +# $FreeBSD: src/etc/services,v 1.93 2003/05/05 22:10:14 dougb Exp $ # From: @(#)services 5.8 (Berkeley) 5/9/91 # # WELL KNOWN PORT NUMBERS @@ -1198,6 +1198,7 @@ accessbuilder 888/tcp accessbuilder 888/udp swat 901/tcp # samba web configuration tool +rndc 953/tcp # named's rndc control socket ftps-data 989/tcp # ftp protocol, data, over TLS/SSL ftps-data 989/udp ftps 990/tcp # ftp protocol, control, over TLS/SSL @@ -1922,6 +1923,8 @@ dec-notes 3333/tcp #DEC Notes dec-notes 3333/udp #DEC Notes rsvp-encap 3455/udp #RSVP encapsulated in UDP +nut 3493/tcp #Network UPS Tools +nut 3493/udp #Network UPS Tools mapper-nodemgr 3984/tcp #MAPPER network node manager mapper-nodemgr 3984/udp #MAPPER network node manager mapper-mapethd 3985/tcp #MAPPER TCP/IP server ==== //depot/projects/trustedbsd/base/gnu/usr.bin/cvs/cvs/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cvs/cvs/Makefile,v 1.40 2003/01/21 23:00:35 peter Exp $ +# $FreeBSD: src/gnu/usr.bin/cvs/cvs/Makefile,v 1.41 2003/05/05 16:50:42 nectar Exp $ MAINTAINER= peter@FreeBSD.org @@ -30,15 +30,12 @@ DPADD+= ${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ} LDADD+= ${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz -.if defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) && !defined(NOCRYPT) -CFLAGS+=-DHAVE_KERBEROS -DHAVE_KRB_GET_ERR_TEXT -LDADD+= -lkrb -lcrypto -lcom_err -DPADD+= ${LIBKRB} ${LIBCRYPTO} ${LIBCOM_ERR} -DISTRIBUTION= krb4 -# XXX do we want to mess with this? It's probably not really worth it for -# the public freebsd stuff, but others might want it. It's an optional -# feature anyway, the -x switch is needed to activate it. -CFLAGS+= -DENCRYPTION +.if !defined(NO_KERBEROS) && !defined(NO_OPENSSL) && !defined(NOCRYPT) +CFLAGS+= -DHAVE_GSSAPI -DHAVE_GSSAPI_H -DENCRYPTION +LDADD+= -lgssapi -lkrb5 -lasn1 -lcrypto -lroken -lcrypt -lcom_err +DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBROKEN} +DPADD+= ${LIBCRYPT} ${LIBCOM_ERR} +DISTRIBUTION= crypto .endif # ==== //depot/projects/trustedbsd/base/include/paths.h#7 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)paths.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/paths.h,v 1.18 2003/04/07 16:21:25 mdodd Exp $ + * $FreeBSD: src/include/paths.h,v 1.19 2003/05/05 22:49:22 obrien Exp $ */ #ifndef _PATHS_H_ @@ -59,6 +59,8 @@ #define _PATH_DRUM "/dev/drum" #define _PATH_ETC "/etc" #define _PATH_FTPUSERS "/etc/ftpusers" +#define _PATH_HALT "/sbin/halt" +#define _PATH_IFCONFIG "/sbin/ifconfig" #define _PATH_KMEM "/dev/kmem" #define _PATH_LIBMAP_CONF "/etc/libmap.conf" #define _PATH_LOGIN "/usr/bin/login" @@ -67,7 +69,9 @@ #define _PATH_MEM "/dev/mem" #define _PATH_NOLOGIN "/var/run/nologin" #define _PATH_RCP "/bin/rcp" +#define _PATH_REBOOT "/sbin/reboot" #define _PATH_RLOGIN "/usr/bin/rlogin" +#define _PATH_RM "/bin/rm" #define _PATH_RSH "/usr/bin/rsh" #define _PATH_SENDMAIL "/usr/sbin/sendmail" #define _PATH_SHELLS "/etc/shells" ==== //depot/projects/trustedbsd/base/lib/libc/i386/gen/rfork_thread.S#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/rfork_thread.S,v 1.4 2002/03/23 02:44:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/rfork_thread.S,v 1.5 2003/05/07 17:23:25 jhb Exp $"); /* * With thanks to John Dyson for the original version of this. @@ -109,5 +109,9 @@ * Branch here if the thread creation fails: */ 2: + addl $8, %esp + popl %esi + movl %ebp, %esp + popl %ebp PIC_PROLOGUE jmp PIC_PLT(HIDENAME(cerror)) ==== //depot/projects/trustedbsd/base/lib/libpam/libpam/Makefile#17 (text+ko) ==== @@ -33,7 +33,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/libpam/Makefile,v 1.43 2003/05/01 14:55:06 des Exp $ +# $FreeBSD: src/lib/libpam/libpam/Makefile,v 1.44 2003/05/05 21:15:35 des Exp $ OPENPAM= ${.CURDIR}/../../../contrib/openpam .PATH: ${OPENPAM}/include ${OPENPAM}/lib ${OPENPAM}/doc/man @@ -127,7 +127,7 @@ pam_vprompt.3 CSTD?= c99 -WARNS?= 5 +WARNS?= 6 CFLAGS+= -I${.CURDIR} -I${OPENPAM}/include CFLAGS+= -DLIB_MAJ=${SHLIB_MAJOR} ==== //depot/projects/trustedbsd/base/lib/libpthread/thread/thr_cancel.c#4 (text+ko) ==== @@ -1,6 +1,6 @@ /* * David Leonard , 1999. Public domain. - * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.19 2003/04/28 23:56:11 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.20 2003/05/06 00:02:54 deischen Exp $ */ #include #include @@ -64,16 +64,7 @@ break; case PS_JOIN: - /* - * Disconnect the thread from the joinee: - */ - if (pthread->join_status.thread != NULL) { - pthread->join_status.thread->joiner - = NULL; - pthread->join_status.thread = NULL; - } pthread->cancelflags |= THR_CANCELLING; - _thr_setrunnable_unlocked(pthread); break; case PS_SUSPENDED: ==== //depot/projects/trustedbsd/base/lib/libthr/arch/i386/i386/_setcurthread.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (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: src/lib/libthr/arch/i386/i386/_setcurthread.c,v 1.3 2003/04/03 03:34:49 jake Exp $ + * $FreeBSD: src/lib/libthr/arch/i386/i386/_setcurthread.c,v 1.4 2003/05/06 02:33:49 mtm Exp $ */ #include @@ -62,7 +62,10 @@ void _retire_thread(void *entry) { - *(void **)entry = *ldt_free; + if (ldt_free == NULL) + *(void **)entry = NULL; + else + *(void **)entry = *ldt_free; ldt_free = entry; } ==== //depot/projects/trustedbsd/base/lib/libthr/thread/thr_mutex.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.3 2003/04/02 03:05:39 jeff Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.4 2003/05/06 02:30:52 mtm Exp $ */ #include #include @@ -471,7 +471,7 @@ int ret = 0; PTHREAD_ASSERT((mutex != NULL) && (*mutex != NULL), - "Uninitialized mutex in pthread_mutex_trylock_basic"); + "Uninitialized mutex in mutex_lock_common"); /* * Enter a loop waiting to become the mutex owner. We need a ==== //depot/projects/trustedbsd/base/lib/libthr/thread/thr_sig.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * (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: src/lib/libthr/thread/thr_sig.c,v 1.2 2003/04/02 03:05:39 jeff Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_sig.c,v 1.3 2003/05/06 02:30:52 mtm Exp $ */ #include @@ -124,28 +124,25 @@ curthread->state = psd.psd_state; curthread->flags = psd.psd_flags; - /* Check the threads previous state: */ - if (psd.psd_state != PS_RUNNING) { - /* - * Do a little cleanup handling for those threads in - * queues before calling the signal handler. Signals - * for these threads are temporarily blocked until - * after cleanup handling. - */ - switch (psd.psd_state) { - case PS_COND_WAIT: - _cond_wait_backout(curthread); - psd.psd_state = PS_RUNNING; - break; + /* + * Do a little cleanup handling for those threads in + * queues before calling the signal handler. Signals + * for these threads are temporarily blocked until + * after cleanup handling. + */ + switch (psd.psd_state) { + case PS_COND_WAIT: + _cond_wait_backout(curthread); + psd.psd_state = PS_RUNNING; + break; - case PS_MUTEX_WAIT: - /* _mutex_lock_backout(curthread); XXXTHR */ - psd.psd_state = PS_RUNNING; - break; + case PS_MUTEX_WAIT: + /* _mutex_lock_backout(curthread); XXXTHR */ + psd.psd_state = PS_RUNNING; + break; - default: - break; - } + default: + break; } if (_thread_sigact[sig -1].sa_handler != NULL) { ==== //depot/projects/trustedbsd/base/release/alpha/dokern.sh#9 (text+ko) ==== @@ -1,60 +1,64 @@ #!/bin/sh # -# $FreeBSD: src/release/alpha/dokern.sh,v 1.66 2003/03/22 14:23:23 ru Exp $ +# $FreeBSD: src/release/alpha/dokern.sh,v 1.68 2003/05/07 18:14:00 obrien Exp $ # +# XXX sort by order in GENERIC, not alphabetical + sed \ - -e '/DDB/d' \ + -e 's/ident.*GENERIC/ident BOOTMFS/g' -e '/DEBUG/d' \ -e '/DEC_KN8AE/d' \ - -e '/INVARIANTS/d' \ - -e '/INVARIANT_SUPPORT/d' \ - -e '/KTRACE/d' \ - -e '/MSDOSFS/d' \ + -e '/SOFTUPDATES/d' \ + -e '/UFS_ACL/d' \ + -e '/UFS_DIRHASH/d' \ -e '/NFSSERVER/d' \ -e '/NFS_ROOT/d' \ + -e '/MSDOSFS/d' \ -e '/PROCFS/d' \ -e '/PSEUDOFS/d' \ - -e '/SMP/d' \ - -e '/SOFTUPDATES/d' \ + -e '/KTRACE/d' \ -e '/SYSV/d' \ - -e '/UFS_ACL/d' \ - -e '/UFS_DIRHASH/d' \ -e '/_KPOSIX_PRIORITY_SCHEDULING/d' \ + -e '/DDB/d' \ + -e '/INVARIANTS/d' \ + -e '/INVARIANT_SUPPORT/d' \ + -e '/WITNESS/d' \ + -e '/SMP/d' \ -e '/ atapifd /d' \ -e '/ atapist /d' \ - -e '/ aue /d' \ -e '/ ch /d' \ - -e '/ cue /d' \ - -e '/ faith /d' \ - -e '/ gif /d' \ - -e '/ kue /d' \ - -e '/ lpt /d' \ - -e '/ ohci /d' \ -e '/ pass /d' \ + -e '/ sa /d' \ + -e '/ ses /d' \ + -e '/ splash /d' \ + -e '/ ppc$/d' \ -e '/ ppbus /d' \ - -e '/ ppc$/d' \ + -e '/ lpt /d' \ -e '/ ppi /d' \ - -e '/ ppp /d' \ - -e '/ pty /d' \ - -e '/ random /d' \ - -e '/ sa /d' \ - -e '/ ses /d' \ -e '/ sf /d' \ -e '/ sis /d' \ + -e '/ ste /d' \ + -e '/ wb /d' \ + -e '/ random /d' \ -e '/ sl /d' \ - -e '/ splash /d' \ - -e '/ ste /d' \ + -e '/ ppp /d' \ + -e '/ pty /d' \ + -e '/ gif /d' \ + -e '/ faith /d' \ + -e '/ uhci /d' \ + -e '/ ohci /d' \ + -e '/ usb /d' \ -e '/ ugen /d' \ - -e '/ uhci /d' \ -e '/ uhid /d' \ -e '/ ukbd /d' \ -e '/ ulpt /d' \ -e '/ umass /d' \ -e '/ ums /d' \ - -e '/ usb /d' \ - -e '/ wb /d' \ - -e 's/ident.*GENERIC/ident BOOTMFS/g' + -e '/ aue /d' \ + -e '/ axe /d' \ + -e '/ cue /d' \ + -e '/ kue /d' \ echo "options SCSI_NO_OP_STRINGS" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed May 7 16:02:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 857C437B404; Wed, 7 May 2003 16:02:18 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3080337B401 for ; Wed, 7 May 2003 16:02:18 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BCD5543F93 for ; Wed, 7 May 2003 16:02:17 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h47N2H0U072197 for ; Wed, 7 May 2003 16:02:17 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h47N2HQx072194 for perforce@freebsd.org; Wed, 7 May 2003 16:02:17 -0700 (PDT) Date: Wed, 7 May 2003 16:02:17 -0700 (PDT) Message-Id: <200305072302.h47N2HQx072194@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30723 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 May 2003 23:02:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=30723 Change 30723 by peter@peter_daintree on 2003/05/07 16:01:33 GRRR. Fix gdtoa() by configuring it correctly. Affected files ... .. //depot/projects/hammer/lib/libc/amd64/arith.h#5 edit Differences ... ==== //depot/projects/hammer/lib/libc/amd64/arith.h#5 (text+ko) ==== @@ -6,3 +6,7 @@ #define IEEE_8087 #define Arith_Kind_ASL 1 +#define Long int +#define Intcast (int)(long) +#define Double_Align +#define X64_bit_pointers From owner-p4-projects@FreeBSD.ORG Wed May 7 16:53:22 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 76FD837B404; Wed, 7 May 2003 16:53:21 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2EF3337B401 for ; Wed, 7 May 2003 16:53:21 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B9F7743FAF for ; Wed, 7 May 2003 16:53:20 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h47NrK0U080324 for ; Wed, 7 May 2003 16:53:20 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h47NrK5g080321 for perforce@freebsd.org; Wed, 7 May 2003 16:53:20 -0700 (PDT) Date: Wed, 7 May 2003 16:53:20 -0700 (PDT) Message-Id: <200305072353.h47NrK5g080321@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30725 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 May 2003 23:53:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=30725 Change 30725 by peter@peter_daintree on 2003/05/07 16:53:00 add #include of metadata.h Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#9 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#9 (text+ko) ==== @@ -99,6 +99,7 @@ #include #include #include +#include #include #ifdef PERFMON #include From owner-p4-projects@FreeBSD.ORG Wed May 7 16:54:24 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2429437B405; Wed, 7 May 2003 16:54:24 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 193D637B401 for ; Wed, 7 May 2003 16:54:23 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A2F3B43FD7 for ; Wed, 7 May 2003 16:54:22 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h47NsM0U080356 for ; Wed, 7 May 2003 16:54:22 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h47NsMAu080353 for perforce@freebsd.org; Wed, 7 May 2003 16:54:22 -0700 (PDT) Date: Wed, 7 May 2003 16:54:22 -0700 (PDT) Message-Id: <200305072354.h47NsMAu080353@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30726 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 May 2003 23:54:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=30726 Change 30726 by peter@peter_daintree on 2003/05/07 16:53:38 skip over 128 byte redzone for signals. oops. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#10 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#10 (text+ko) ==== @@ -259,7 +259,7 @@ p->p_sigstk.ss_flags |= SS_ONSTACK; #endif } else - sp = (char *)regs->tf_rsp - sizeof(struct sigframe); + sp = (char *)regs->tf_rsp - sizeof(struct sigframe) - 128; /* Align to 16 bytes. */ sfp = (struct sigframe *)((unsigned long)sp & ~0xF); PROC_UNLOCK(p); From owner-p4-projects@FreeBSD.ORG Wed May 7 16:59:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7563237B404; Wed, 7 May 2003 16:59:31 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 127CE37B401 for ; Wed, 7 May 2003 16:59:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DD61243F3F for ; Wed, 7 May 2003 16:59:29 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h47NxT0U080629 for ; Wed, 7 May 2003 16:59:29 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h47NxTEG080626 for perforce@freebsd.org; Wed, 7 May 2003 16:59:29 -0700 (PDT) Date: Wed, 7 May 2003 16:59:29 -0700 (PDT) Message-Id: <200305072359.h47NxTEG080626@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30727 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 May 2003 23:59:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=30727 Change 30727 by peter@peter_overcee on 2003/05/07 16:58:32 IFC @30722 Affected files ... .. //depot/projects/hammer/bin/df/df.1#3 integrate .. //depot/projects/hammer/bin/ls/ls.1#6 integrate .. //depot/projects/hammer/bin/mv/mv.c#3 integrate .. //depot/projects/hammer/bin/mv/pathnames.h#2 delete .. //depot/projects/hammer/bin/sh/var.c#3 integrate .. //depot/projects/hammer/contrib/isc-dhcp/client/clparse.c#3 integrate .. //depot/projects/hammer/contrib/tar/src/buffer.c#5 integrate .. //depot/projects/hammer/etc/Makefile#12 integrate .. //depot/projects/hammer/etc/devd.conf#3 integrate .. //depot/projects/hammer/etc/devfs.conf#1 branch .. //depot/projects/hammer/etc/rc.d/apm#3 integrate .. //depot/projects/hammer/etc/rc.d/apmd#5 integrate .. //depot/projects/hammer/etc/rc.d/archdep#5 integrate .. //depot/projects/hammer/etc/rc.d/devfs#5 integrate .. //depot/projects/hammer/etc/rc.d/kpasswdd#2 integrate .. //depot/projects/hammer/include/paths.h#3 integrate .. //depot/projects/hammer/lib/libc/i386/gen/rfork_thread.S#2 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_cancel.c#5 integrate .. //depot/projects/hammer/lib/libthr/arch/i386/i386/_setcurthread.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#2 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_sig.c#2 integrate .. //depot/projects/hammer/release/alpha/dokern.sh#5 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/readme/article.sgml#5 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#21 integrate .. //depot/projects/hammer/release/doc/share/sgml/release.ent#3 integrate .. //depot/projects/hammer/sbin/dump/main.c#8 integrate .. //depot/projects/hammer/sbin/dump/traverse.c#5 integrate .. //depot/projects/hammer/sbin/dumpon/dumpon.8#3 integrate .. //depot/projects/hammer/sbin/mdmfs/mdmfs.8#6 integrate .. //depot/projects/hammer/sbin/shutdown/pathnames.h#2 delete .. //depot/projects/hammer/sbin/shutdown/shutdown.c#3 integrate .. //depot/projects/hammer/sbin/startslip/startslip.c#2 integrate .. //depot/projects/hammer/sbin/vinum/commands.c#6 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#9 integrate .. //depot/projects/hammer/share/man/man9/malloc.9#4 integrate .. //depot/projects/hammer/share/sendmail/Makefile#2 integrate .. //depot/projects/hammer/sys/conf/newvers.sh#3 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#6 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#13 integrate .. //depot/projects/hammer/sys/dev/bge/if_bgereg.h#9 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#11 integrate .. //depot/projects/hammer/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/hammer/sys/geom/geom_bsd.c#16 integrate .. //depot/projects/hammer/sys/geom/geom_io.c#12 integrate .. //depot/projects/hammer/sys/i386/isa/intr_machdep.c#4 integrate .. //depot/projects/hammer/sys/kern/kern_mac.c#15 integrate .. //depot/projects/hammer/sys/kern/vfs_default.c#12 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#11 integrate .. //depot/projects/hammer/sys/netinet/tcp_input.c#11 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#7 integrate .. //depot/projects/hammer/sys/netinet/tcp_var.h#5 integrate .. //depot/projects/hammer/sys/pci/if_sis.c#8 integrate .. //depot/projects/hammer/sys/sys/dkstat.h#3 integrate .. //depot/projects/hammer/sys/vm/swap_pager.c#10 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#18 integrate .. //depot/projects/hammer/sys/vm/vm_pager.c#5 integrate .. //depot/projects/hammer/sys/vm/vnode_pager.c#11 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.pl#5 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#7 integrate .. //depot/projects/hammer/usr.bin/vi/pathnames.h#2 integrate .. //depot/projects/hammer/usr.sbin/newsyslog/newsyslog.c#8 integrate Differences ... ==== //depot/projects/hammer/bin/df/df.1#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)df.1 8.3 (Berkeley) 5/8/95 -.\" $FreeBSD: src/bin/df/df.1,v 1.28 2002/08/26 04:56:23 trhodes Exp $ +.\" $FreeBSD: src/bin/df/df.1,v 1.29 2003/05/06 21:54:46 trhodes Exp $ .\" .Dd May 8, 1995 .Dt DF 1 @@ -81,11 +81,11 @@ .It Fl H "Human-readable" output. Use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte and Petabyte in order to reduce the number of -digits to three or less using base 10 for sizes. +digits to four or fewer using base 10 for sizes. .It Fl h "Human-readable" output. Use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte and Petabyte in order to reduce the number of -digits to three or less using base 2 for sizes. +digits to four or fewer using base 2 for sizes. .It Fl i Include statistics on the number of free inodes. .It Fl k ==== //depot/projects/hammer/bin/ls/ls.1#6 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.73 2003/01/20 21:25:00 chris Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.74 2003/05/06 21:54:46 trhodes Exp $ .\" .Dd May 19, 2002 .Dt LS 1 @@ -175,7 +175,7 @@ When used with the .Fl l option, use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte -and Petabyte in order to reduce the number of digits to three or less +and Petabyte in order to reduce the number of digits to four or fewer using base 2 for sizes. .It Fl i For each file, print the file's file serial number (inode number). ==== //depot/projects/hammer/bin/mv/mv.c#3 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.40 2003/05/01 16:58:56 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.41 2003/05/05 22:49:22 obrien Exp $"); #include #include @@ -67,8 +67,6 @@ #include #include -#include "pathnames.h" - int fflg, iflg, nflg, vflg; int copy(char *, char *); ==== //depot/projects/hammer/bin/sh/var.c#3 (text+ko) ==== @@ -40,10 +40,11 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.23 2002/10/01 00:54:14 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.24 2003/05/05 22:49:22 obrien Exp $"); #include #include +#include /* * Shell variables. @@ -105,7 +106,7 @@ NULL }, { &vmpath, VSTRFIXED|VTEXTFIXED|VUNSET, "MAILPATH=", NULL }, - { &vpath, VSTRFIXED|VTEXTFIXED, "PATH=/bin:/usr/bin", + { &vpath, VSTRFIXED|VTEXTFIXED, "PATH=" _PATH_DEFPATH, changepath }, { &vppid, VSTRFIXED|VTEXTFIXED|VUNSET, "PPID=", NULL }, ==== //depot/projects/hammer/contrib/isc-dhcp/client/clparse.c#3 (text+ko) ==== @@ -44,7 +44,7 @@ #ifndef lint static char copyright[] = "$Id: clparse.c,v 1.62.2.3 2002/11/17 02:25:43 dhankins Exp $ Copyright (c) 1996-2002 The Internet Software Consortium. All rights reserved.\n" -"$FreeBSD: src/contrib/isc-dhcp/client/clparse.c,v 1.9 2003/01/16 07:22:32 obrien Exp $\n"; +"$FreeBSD: src/contrib/isc-dhcp/client/clparse.c,v 1.10 2003/05/05 22:49:22 obrien Exp $\n"; #endif /* not lint */ #include "dhcpd.h" @@ -53,7 +53,7 @@ struct client_config top_level_config; -char client_script_name [] = "/sbin/dhclient-script"; +char client_script_name [] = _PATH_DHCLIENT_SCRIPT; u_int32_t default_requested_options [] = { DHO_SUBNET_MASK, ==== //depot/projects/hammer/contrib/tar/src/buffer.c#5 (text+ko) ==== @@ -19,12 +19,18 @@ with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/tar/src/buffer.c,v 1.5 2002/10/09 07:33:29 sobomax Exp $ */ +/* $FreeBSD: src/contrib/tar/src/buffer.c,v 1.6 2003/05/05 22:49:22 obrien Exp $ */ #include "system.h" #include +#if __FreeBSD__ +# include +#else +# define _PATH_BSHELL "/bin/sh" +#endif + #if MSDOS # include #endif @@ -1549,7 +1555,7 @@ pid_t child; const char *shell = getenv ("SHELL"); if (! shell) - shell = "/bin/sh"; + shell = _PATH_BSHELL; child = xfork (); if (child == 0) { ==== //depot/projects/hammer/etc/Makefile#12 (text+ko) ==== @@ -1,13 +1,13 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.312 2003/05/02 22:27:31 dougb Exp $ +# $FreeBSD: src/etc/Makefile,v 1.313 2003/05/06 07:25:17 dougb Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail .endif BIN1= amd.map apmd.conf auth.conf \ - crontab csh.cshrc csh.login csh.logout \ - devd.conf dhclient.conf disktab fbtab ftpusers gettytab group \ + crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \ + dhclient.conf disktab fbtab ftpusers gettytab group \ hosts hosts.allow hosts.equiv hosts.lpd \ inetd.conf login.access login.conf \ mac.conf motd netconfig network.subr networks newsyslog.conf \ ==== //depot/projects/hammer/etc/devd.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.3 2003/05/03 10:16:55 akiyama Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.4 2003/05/07 15:48:20 imp Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -64,9 +64,10 @@ }; # Don't even try to second guess what to do about drivers that don't -# match here. Instead, pass it off to a smart script to deal. +# match here. Instead, pass it off to syslog. Commented out for the +# moment, as pnpinfo isn't set in devd yet nomatch 0 { - action "logger Unknown device: $pnpinfo $location $bus"; + // action "logger Unknown device: $pnpinfo $location $bus"; }; /* EXAMPLES TO END OF FILE ==== //depot/projects/hammer/etc/rc.d/apm#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/apm,v 1.2 2003/05/02 08:35:17 mtm Exp $ +# $FreeBSD: src/etc/rc.d/apm,v 1.3 2003/05/05 23:55:43 obrien Exp $ # # PROVIDE: apm @@ -19,7 +19,7 @@ apm_precmd() { case `${SYSCTL_N} hw.machine_arch` in - i386|amd64) + i386) return 0 ;; esac ==== //depot/projects/hammer/etc/rc.d/apmd#5 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: apmd,v 1.5 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/apmd,v 1.6 2003/05/02 08:35:17 mtm Exp $ +# $FreeBSD: src/etc/rc.d/apmd,v 1.7 2003/05/06 00:09:51 obrien Exp $ # # PROVIDE: apmd @@ -24,7 +24,7 @@ apmd_prestart() { case `${SYSCTL_N} hw.machine_arch` in - i386|amd64) + i386) # Start apm if it is not already running /etc/rc.d/apm forcestatus > /dev/null || /etc/rc.d/apm forcestart ;; ==== //depot/projects/hammer/etc/rc.d/archdep#5 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/archdep,v 1.4 2003/05/02 08:35:17 mtm Exp $ +# $FreeBSD: src/etc/rc.d/archdep,v 1.5 2003/05/06 00:09:51 obrien Exp $ # # PROVIDE: archdep @@ -56,7 +56,7 @@ _arch=`${SYSCTL_N} hw.machine` echo -n "Initial $_arch initialization:" case $_arch in -i386|amd64) +i386) ibcs2_compat ;; alpha) ==== //depot/projects/hammer/etc/rc.d/devfs#5 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/devfs,v 1.4 2003/05/05 15:38:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/devfs,v 1.5 2003/05/06 01:10:33 dougb Exp $ # # PROVIDE: devfs @@ -11,18 +11,31 @@ . /etc/rc.subr name="devfs" +start_cmd='read_devfs_conf' +stop_cmd=':' +read_devfs_conf() +{ + if [ -r /etc/devfs.conf ]; then + cd /dev + while read action device parameter; do + case "${action}" in + l*) if [ -c ${device} -a ! -e ${parameter} ]; then + ln -fs ${device} ${parameter} + fi + ;; + o*) if [ -c ${device} ]; then + chown ${parameter} ${device} + fi + ;; + p*) if [ -c ${device} ]; then + chmod ${parameter} ${device} + fi + ;; + esac + done < /etc/devfs.conf + fi +} + load_rc_config $name - -# Setup DEVFS, ie permissions, links etc. -# -if [ -c /dev/ttyv0 -a ! -e /dev/vga ];then - ln -fs /dev/ttyv0 /dev/vga -fi - -# XXX - in case the user has a customized /etc/rc.devfs we need to keep -# pulling it in until we have a better way of doing this in rc.d. -# -if [ -r /etc/rc.devfs ]; then - sh /etc/rc.devfs -fi +run_rc_command "$1" ==== //depot/projects/hammer/etc/rc.d/kpasswdd#2 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/kpasswdd,v 1.1 2003/04/30 20:58:49 markm Exp $ +# $FreeBSD: src/etc/rc.d/kpasswdd,v 1.2 2003/05/06 02:28:03 mtm Exp $ # # PROVIDE: kpasswdd -# REQUIRE: kadmind5 +# REQUIRE: kadmin # BEFORE: DAEMON # KEYWORD: FreeBSD ==== //depot/projects/hammer/include/paths.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)paths.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/paths.h,v 1.18 2003/04/07 16:21:25 mdodd Exp $ + * $FreeBSD: src/include/paths.h,v 1.19 2003/05/05 22:49:22 obrien Exp $ */ #ifndef _PATHS_H_ @@ -59,6 +59,8 @@ #define _PATH_DRUM "/dev/drum" #define _PATH_ETC "/etc" #define _PATH_FTPUSERS "/etc/ftpusers" +#define _PATH_HALT "/sbin/halt" +#define _PATH_IFCONFIG "/sbin/ifconfig" #define _PATH_KMEM "/dev/kmem" #define _PATH_LIBMAP_CONF "/etc/libmap.conf" #define _PATH_LOGIN "/usr/bin/login" @@ -67,7 +69,9 @@ #define _PATH_MEM "/dev/mem" #define _PATH_NOLOGIN "/var/run/nologin" #define _PATH_RCP "/bin/rcp" +#define _PATH_REBOOT "/sbin/reboot" #define _PATH_RLOGIN "/usr/bin/rlogin" +#define _PATH_RM "/bin/rm" #define _PATH_RSH "/usr/bin/rsh" #define _PATH_SENDMAIL "/usr/sbin/sendmail" #define _PATH_SHELLS "/etc/shells" ==== //depot/projects/hammer/lib/libc/i386/gen/rfork_thread.S#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/rfork_thread.S,v 1.4 2002/03/23 02:44:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/rfork_thread.S,v 1.5 2003/05/07 17:23:25 jhb Exp $"); /* * With thanks to John Dyson for the original version of this. @@ -109,5 +109,9 @@ * Branch here if the thread creation fails: */ 2: + addl $8, %esp + popl %esi + movl %ebp, %esp + popl %ebp PIC_PROLOGUE jmp PIC_PLT(HIDENAME(cerror)) ==== //depot/projects/hammer/lib/libpthread/thread/thr_cancel.c#5 (text+ko) ==== @@ -1,6 +1,6 @@ /* * David Leonard , 1999. Public domain. - * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.19 2003/04/28 23:56:11 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.20 2003/05/06 00:02:54 deischen Exp $ */ #include #include @@ -64,16 +64,7 @@ break; case PS_JOIN: - /* - * Disconnect the thread from the joinee: - */ - if (pthread->join_status.thread != NULL) { - pthread->join_status.thread->joiner - = NULL; - pthread->join_status.thread = NULL; - } pthread->cancelflags |= THR_CANCELLING; - _thr_setrunnable_unlocked(pthread); break; case PS_SUSPENDED: ==== //depot/projects/hammer/lib/libthr/arch/i386/i386/_setcurthread.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (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: src/lib/libthr/arch/i386/i386/_setcurthread.c,v 1.3 2003/04/03 03:34:49 jake Exp $ + * $FreeBSD: src/lib/libthr/arch/i386/i386/_setcurthread.c,v 1.4 2003/05/06 02:33:49 mtm Exp $ */ #include @@ -62,7 +62,10 @@ void _retire_thread(void *entry) { - *(void **)entry = *ldt_free; + if (ldt_free == NULL) + *(void **)entry = NULL; + else + *(void **)entry = *ldt_free; ldt_free = entry; } ==== //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.3 2003/04/02 03:05:39 jeff Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.4 2003/05/06 02:30:52 mtm Exp $ */ #include #include @@ -471,7 +471,7 @@ int ret = 0; PTHREAD_ASSERT((mutex != NULL) && (*mutex != NULL), - "Uninitialized mutex in pthread_mutex_trylock_basic"); + "Uninitialized mutex in mutex_lock_common"); /* * Enter a loop waiting to become the mutex owner. We need a ==== //depot/projects/hammer/lib/libthr/thread/thr_sig.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * (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: src/lib/libthr/thread/thr_sig.c,v 1.2 2003/04/02 03:05:39 jeff Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_sig.c,v 1.3 2003/05/06 02:30:52 mtm Exp $ */ #include @@ -124,28 +124,25 @@ curthread->state = psd.psd_state; curthread->flags = psd.psd_flags; - /* Check the threads previous state: */ - if (psd.psd_state != PS_RUNNING) { - /* - * Do a little cleanup handling for those threads in - * queues before calling the signal handler. Signals - * for these threads are temporarily blocked until - * after cleanup handling. - */ - switch (psd.psd_state) { - case PS_COND_WAIT: - _cond_wait_backout(curthread); - psd.psd_state = PS_RUNNING; - break; + /* + * Do a little cleanup handling for those threads in + * queues before calling the signal handler. Signals + * for these threads are temporarily blocked until + * after cleanup handling. + */ + switch (psd.psd_state) { + case PS_COND_WAIT: + _cond_wait_backout(curthread); + psd.psd_state = PS_RUNNING; + break; - case PS_MUTEX_WAIT: - /* _mutex_lock_backout(curthread); XXXTHR */ - psd.psd_state = PS_RUNNING; - break; + case PS_MUTEX_WAIT: + /* _mutex_lock_backout(curthread); XXXTHR */ + psd.psd_state = PS_RUNNING; + break; - default: - break; - } + default: + break; } if (_thread_sigact[sig -1].sa_handler != NULL) { ==== //depot/projects/hammer/release/alpha/dokern.sh#5 (text+ko) ==== @@ -1,60 +1,64 @@ #!/bin/sh # -# $FreeBSD: src/release/alpha/dokern.sh,v 1.66 2003/03/22 14:23:23 ru Exp $ +# $FreeBSD: src/release/alpha/dokern.sh,v 1.68 2003/05/07 18:14:00 obrien Exp $ # +# XXX sort by order in GENERIC, not alphabetical + sed \ - -e '/DDB/d' \ + -e 's/ident.*GENERIC/ident BOOTMFS/g' -e '/DEBUG/d' \ -e '/DEC_KN8AE/d' \ - -e '/INVARIANTS/d' \ - -e '/INVARIANT_SUPPORT/d' \ - -e '/KTRACE/d' \ - -e '/MSDOSFS/d' \ + -e '/SOFTUPDATES/d' \ + -e '/UFS_ACL/d' \ + -e '/UFS_DIRHASH/d' \ -e '/NFSSERVER/d' \ -e '/NFS_ROOT/d' \ + -e '/MSDOSFS/d' \ -e '/PROCFS/d' \ -e '/PSEUDOFS/d' \ - -e '/SMP/d' \ - -e '/SOFTUPDATES/d' \ + -e '/KTRACE/d' \ -e '/SYSV/d' \ - -e '/UFS_ACL/d' \ - -e '/UFS_DIRHASH/d' \ -e '/_KPOSIX_PRIORITY_SCHEDULING/d' \ + -e '/DDB/d' \ + -e '/INVARIANTS/d' \ + -e '/INVARIANT_SUPPORT/d' \ + -e '/WITNESS/d' \ + -e '/SMP/d' \ -e '/ atapifd /d' \ -e '/ atapist /d' \ - -e '/ aue /d' \ -e '/ ch /d' \ - -e '/ cue /d' \ - -e '/ faith /d' \ - -e '/ gif /d' \ - -e '/ kue /d' \ - -e '/ lpt /d' \ - -e '/ ohci /d' \ -e '/ pass /d' \ + -e '/ sa /d' \ + -e '/ ses /d' \ + -e '/ splash /d' \ + -e '/ ppc$/d' \ -e '/ ppbus /d' \ - -e '/ ppc$/d' \ + -e '/ lpt /d' \ -e '/ ppi /d' \ - -e '/ ppp /d' \ - -e '/ pty /d' \ - -e '/ random /d' \ - -e '/ sa /d' \ - -e '/ ses /d' \ -e '/ sf /d' \ -e '/ sis /d' \ + -e '/ ste /d' \ + -e '/ wb /d' \ + -e '/ random /d' \ -e '/ sl /d' \ - -e '/ splash /d' \ - -e '/ ste /d' \ + -e '/ ppp /d' \ + -e '/ pty /d' \ + -e '/ gif /d' \ + -e '/ faith /d' \ + -e '/ uhci /d' \ + -e '/ ohci /d' \ + -e '/ usb /d' \ -e '/ ugen /d' \ - -e '/ uhci /d' \ -e '/ uhid /d' \ -e '/ ukbd /d' \ -e '/ ulpt /d' \ -e '/ umass /d' \ -e '/ ums /d' \ - -e '/ usb /d' \ - -e '/ wb /d' \ - -e 's/ident.*GENERIC/ident BOOTMFS/g' + -e '/ aue /d' \ + -e '/ axe /d' \ + -e '/ cue /d' \ + -e '/ kue /d' \ echo "options SCSI_NO_OP_STRINGS" echo "options SCSI_NO_SENSE_STRINGS" ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/readme/article.sgml#5 (text+ko) ==== @@ -17,7 +17,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/readme/article.sgml,v 1.25 2003/04/29 18:27:38 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/readme/article.sgml,v 1.26 2003/05/06 20:01:07 bmah Exp $ 2000 @@ -47,8 +47,11 @@ &os; is an operating system based on 4.4 BSD Lite for Intel, AMD, Cyrix or NexGen x86 based PC - hardware, Compaq (formerly DEC) Alpha computers, and UltraSPARC machines. Versions - for the IA64 and PowerPC architectures are currently under + hardware (i386), NEC PC-9801/9821 series PCs and compatibles + (pc98), DEC/Compaq/HP Alpha computers (alpha), + and UltraSPARC machines (sparc64). Versions + for the IA64 (ia64), PowerPC (powerpc), and AMD + Hammer (amd64) architectures are currently under development as well. &os; works with a wide variety of peripherals and configurations and can be used for everything from software development to games to Internet Service @@ -64,14 +67,14 @@ A large collection of third-party ported software (the Ports Collection) is also provided to make it - easy to obtain and install all your favorite traditional UNIX + easy to obtain and install all your favorite traditional &unix; utilities for &os;. Each port consists of a set of scripts to retrieve, configure, build, and install a piece of software, with a single command. Over &os.numports; ports, from editors to programming languages to graphical applications, make &os; a powerful and comprehensive operating environment that extends far beyond what's provided by many - commercial versions of UNIX. Most ports are also available as + commercial versions of &unix;. Most ports are also available as pre-compiled packages, which can be quickly installed from the installation program. @@ -198,18 +201,18 @@ preferable to subscribe instead to the &a.announce;. All of the mailing lists can be freely joined by anyone - wishing to do so. Visit + wishing to do so. Visit the FreeBSD Mailman Info Page. This will give you more information on joining the various lists, accessing archives, etc. There are a number of mailing lists targeted at special interest groups not mentioned here; more information can be - obtained either through majordomo or the mailing lists section of the &os; Web site. Do not send email to the lists - asking to be subscribed. Use the &a.majordomo; address + asking to be subscribed. Use the Mailman interface instead. @@ -224,8 +227,7 @@ The preferred method to submit bug reports from a machine with Internet mail connectivity is to use the &man.send-pr.1; - command or use the Web form at http://www.FreeBSD.org/send-pr.html. + command. Problem Reports (PRs) submitted in this way will be filed and their progress tracked; the &os; developers will do their best to respond to all reported bugs as soon as @@ -278,7 +280,7 @@ EARLY.TXT: A guide for early - adopters of &os; 5.0-RELEASE. Highly recommended + adopters of &os; &release.current;. Highly recommended reading for users new to &os; &release.branch; and/or the 5.X series of releases. @@ -329,7 +331,7 @@ On platforms that support &man.sysinstall.8; (currently - the i386 and alpha), these documents are generally available via the + alpha, i386, ia64, pc98, and sparc64), these documents are generally available via the Documentation menu during installation. Once the system is installed, you can revisit this menu by re-running the &man.sysinstall.8; utility. @@ -352,7 +354,7 @@ Manual Pages - As with almost all UNIX-like operating systems, &os; comes + As with almost all &unix;-like operating systems, &os; comes with a set of on-line manual pages, accessed through the &man.man.1; command or through the hypertext manual @@ -395,8 +397,8 @@ A listing of other books and documents about &os; can be found in the bibliography - of the &os; Handbook. Because of &os;'s strong UNIX heritage, - many other articles and books written for UNIX systems are + of the &os; Handbook. Because of &os;'s strong &unix; heritage, + many other articles and books written for &unix; systems are applicable as well, some of which are also listed in the bibliography. ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#21 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.562 2003/05/04 02:02:48 nyan Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.563 2003/05/07 04:15:57 bmah Exp $ 2000 @@ -886,6 +886,13 @@ utilities have been renamed to kprogram. + Kerberos 5 is now built by + default in buildworld operations. Setting + MAKE_KERBEROS5 no longer has any effect. + Disabling the base system Kerberos 5 now requires the + NO_KERBEROS Makefile variable to be + set. + libpcap now has support for selecting among multiple data link types on an interface. @@ -966,6 +973,11 @@ The supported release of KDE has been updated to 3.1.1a. &merged; + There is no longer a separate krb5 + distribution. The Kerberos 5 libraries and utilities have been + incorporated into the crypto + distribution. + &man.sysinstall.8; once again supports installing individual components of XFree86. Supporting changes (not user-visible) generalize the concept of installing ==== //depot/projects/hammer/release/doc/share/sgml/release.ent#3 (text+ko) ==== @@ -1,12 +1,12 @@ - + - + ==== //depot/projects/hammer/sbin/dump/main.c#8 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)main.c 8.6 (Berkeley) 5/1/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/dump/main.c,v 1.52 2003/05/01 21:18:35 ru Exp $"; + "$FreeBSD: src/sbin/dump/main.c,v 1.53 2003/05/07 18:27:09 mckusick Exp $"; #endif /* not lint */ #include @@ -388,6 +388,7 @@ sync(); sblock = (struct fs *)sblock_buf; for (i = 0; sblock_try[i] != -1; i++) { + sblock->fs_fsize = SBLOCKSIZE; /* needed in bread */ bread(sblock_try[i] >> dev_bshift, (char *) sblock, SBLOCKSIZE); if ((sblock->fs_magic == FS_UFS1_MAGIC || (sblock->fs_magic == FS_UFS2_MAGIC && ==== //depot/projects/hammer/sbin/dump/traverse.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)traverse.c 8.7 (Berkeley) 6/15/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/dump/traverse.c,v 1.31 2003/01/13 19:42:41 dillon Exp $"; + "$FreeBSD: src/sbin/dump/traverse.c,v 1.32 2003/05/07 18:27:09 mckusick Exp $"; #endif /* not lint */ #include @@ -736,12 +736,55 @@ void bread(ufs2_daddr_t blkno, char *buf, int size) { - int cnt, i; + int secsize, bytes, resid, xfer, base, cnt, i; + static char *tmpbuf; + off_t offset; loop: - cnt = cread(diskfd, buf, size, ((off_t)blkno << dev_bshift)); - if (cnt == size) - return; + offset = blkno << dev_bshift; + secsize = sblock->fs_fsize; + base = offset % secsize; + resid = size % secsize; + /* + * If the transfer request starts or ends on a non-sector + * boundary, we must read the entire sector and copy out + * just the part that we need. + */ + if (base == 0 && resid == 0) { + cnt = cread(diskfd, buf, size, offset); + if (cnt == size) + return; + } else { + if (tmpbuf == NULL && (tmpbuf = malloc(secsize)) == 0) + quit("buffer malloc failed\n"); + xfer = 0; + bytes = size; + if (base != 0) { + cnt = cread(diskfd, tmpbuf, secsize, offset - base); + if (cnt != secsize) + goto bad; + xfer = secsize - base; + offset += xfer; + bytes -= xfer; + resid = bytes % secsize; + memcpy(buf, &tmpbuf[base], xfer); + } + if (bytes >= secsize) { + cnt = cread(diskfd, &buf[xfer], bytes - resid, offset); + if (cnt != bytes - resid) + goto bad; + xfer += cnt; + offset += cnt; + } + if (resid == 0) + return; + cnt = cread(diskfd, tmpbuf, secsize, offset); + if (cnt == secsize) { + memcpy(&buf[xfer], tmpbuf, resid); + return; + } + } +bad: if (blkno + (size / dev_bsize) > fsbtodb(sblock, sblock->fs_size)) { /* * Trying to read the final fragment. ==== //depot/projects/hammer/sbin/dumpon/dumpon.8#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" From: @(#)swapon.8 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/sbin/dumpon/dumpon.8,v 1.27 2002/08/21 18:10:01 trhodes Exp $ +.\" $FreeBSD: src/sbin/dumpon/dumpon.8,v 1.28 2003/05/07 19:37:51 hmp Exp $ .\" .Dd May 12, 1995 .Dt DUMPON 8 @@ -72,7 +72,7 @@ flag causes .Nm to be verbose about its activity. -.Sh NOTES +.Sh IMPLEMENTATION NOTES Since a .Xr panic 9 condition may occur in a situation @@ -86,18 +86,23 @@ .Pp The .Nm -utility operates by setting the -.Xr sysctl 3 -MIB variable -.Dq kern.dumpdev -to the device number of the designated +utility operates by opening .Ar special_file -or to -.Dv NODEV -(meaning that no dumps are to be taken) if +and making a +.Dv DIOCSKERNELDUMP +.Xr ioctl 2 +request on it to save kernel crash dumps. +If .Ar special_file is the text string: -.Dq Li off . +.Dq Li off , +.Nm +performs a +.Dv DIOCSKERNELDUMP +.Xr ioctl 2 +on +.Pa /dev/null +and thus instructs the kernel not to save crash dumps. .Pp Since .Nm @@ -108,7 +113,6 @@ must be used to enable dumps for system panics which occur during kernel initialization. .Sh SEE ALSO >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed May 7 17:11:48 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 45C6A37B404; Wed, 7 May 2003 17:11:48 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CEC8137B401 for ; Wed, 7 May 2003 17:11:47 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 576CE43FA3 for ; Wed, 7 May 2003 17:11:47 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h480Bl0U082297 for ; Wed, 7 May 2003 17:11:47 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h480Bk52082294 for perforce@freebsd.org; Wed, 7 May 2003 17:11:46 -0700 (PDT) Date: Wed, 7 May 2003 17:11:46 -0700 (PDT) Message-Id: <200305080011.h480Bk52082294@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30730 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 00:11:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=30730 Change 30730 by peter@peter_overcee on 2003/05/07 17:11:04 IFC @30729 Affected files ... .. //depot/projects/hammer/lib/libc/amd64/_fpmath.h#7 integrate .. //depot/projects/hammer/lib/libc/amd64/arith.h#6 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#7 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/alloca.S#11 integrate .. //depot/projects/hammer/sys/amd64/amd64/exception.S#3 integrate Differences ... ==== //depot/projects/hammer/lib/libc/amd64/_fpmath.h#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/amd64/_fpmath.h,v 1.2 2003/04/05 22:10:13 das Exp $ + * $FreeBSD: src/lib/libc/amd64/_fpmath.h,v 1.3 2003/05/08 00:02:03 peter Exp $ */ union IEEEl2bits { ==== //depot/projects/hammer/lib/libc/amd64/arith.h#6 (text+ko) ==== @@ -1,7 +1,7 @@ /* * MD header for contrib/gdtoa * - * $FreeBSD: src/lib/libc/amd64/arith.h,v 1.1 2003/03/12 20:29:59 das Exp $ + * $FreeBSD: src/lib/libc/amd64/arith.h,v 1.2 2003/05/07 23:48:05 peter Exp $ */ #define IEEE_8087 ==== //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#7 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.19 2003/04/30 18:08:01 peter Exp $ +# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.20 2003/05/07 23:49:24 peter Exp $ SRCS+= _setjmp.S setjmp.S sigsetjmp.S \ fabs.S modf.S \ ==== //depot/projects/hammer/lib/libc/amd64/gen/alloca.S#11 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)alloca.s 5.2 (Berkeley) 5/14/90" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/alloca.S,v 1.1 2003/05/01 16:04:38 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/alloca.S,v 1.2 2003/05/08 00:02:47 peter Exp $"); /* like alloc, but automatic automatic free in return */ ==== //depot/projects/hammer/sys/amd64/amd64/exception.S#3 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.105 2003/05/03 00:21:43 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.106 2003/05/08 00:05:00 peter Exp $ */ #include From owner-p4-projects@FreeBSD.ORG Wed May 7 17:21:01 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8ECDD37B404; Wed, 7 May 2003 17:21:00 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2F5F537B401 for ; Wed, 7 May 2003 17:21:00 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B875E43FA3 for ; Wed, 7 May 2003 17:20:59 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h480Kx0U082762 for ; Wed, 7 May 2003 17:20:59 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h480KxnV082759 for perforce@freebsd.org; Wed, 7 May 2003 17:20:59 -0700 (PDT) Date: Wed, 7 May 2003 17:20:59 -0700 (PDT) Message-Id: <200305080020.h480KxnV082759@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30732 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 00:21:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=30732 Change 30732 by peter@peter_overcee on 2003/05/07 17:20:08 IFC @30731 Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#11 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#11 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.565 2003/05/01 04:18:02 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.567 2003/05/08 00:13:24 peter Exp $ */ #include "opt_atalk.h" From owner-p4-projects@FreeBSD.ORG Wed May 7 17:32:15 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C4E637B404; Wed, 7 May 2003 17:32:14 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3CEB337B401 for ; Wed, 7 May 2003 17:32:14 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DCA4143F3F for ; Wed, 7 May 2003 17:32:13 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h480WD0U083345 for ; Wed, 7 May 2003 17:32:13 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h480WDZb083342 for perforce@freebsd.org; Wed, 7 May 2003 17:32:13 -0700 (PDT) Date: Wed, 7 May 2003 17:32:13 -0700 (PDT) Message-Id: <200305080032.h480WDZb083342@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30733 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 00:32:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=30733 Change 30733 by peter@peter_daintree on 2003/05/07 17:31:36 I dont know when this started happening, but gcc is now spewing out stacks of 'failed to inline call to XXX' after gcc-3.3-20030505. Affected files ... .. //depot/projects/hammer/sys/conf/Makefile.amd64#7 edit Differences ... ==== //depot/projects/hammer/sys/conf/Makefile.amd64#7 (text+ko) ==== @@ -19,7 +19,7 @@ # The FSF cross tools don't understand -fformat-extensions CWARNFLAGS= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ - -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ + -Wmissing-prototypes -Wpointer-arith -Wcast-qual \ -ffreestanding -Wno-format -Wno-sign-compare CC= x86_64-unknown-freebsd5.0-gcc -D__amd64__ LD= x86_64-unknown-freebsd5.0-ld From owner-p4-projects@FreeBSD.ORG Wed May 7 18:36:36 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B851137B404; Wed, 7 May 2003 18:36:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5988537B401 for ; Wed, 7 May 2003 18:36:35 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E61B743FBD for ; Wed, 7 May 2003 18:36:34 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h481aY0U087001 for ; Wed, 7 May 2003 18:36:34 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h481aYBk086998 for perforce@freebsd.org; Wed, 7 May 2003 18:36:34 -0700 (PDT) Date: Wed, 7 May 2003 18:36:34 -0700 (PDT) Message-Id: <200305080136.h481aYBk086998@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30738 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 01:36:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=30738 Change 30738 by peter@peter_daintree on 2003/05/07 18:36:14 add default MXCSR values from docs Affected files ... .. //depot/projects/hammer/sys/amd64/include/npx.h#6 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/npx.h#6 (text+ko) ==== @@ -95,6 +95,8 @@ * intermediate values are stored in memory or in FPU registers. */ #define __INITIAL_NPXCW__ 0x127F +#define __INITIAL_MXCSR__ 0x1F80 +#define __INITIAL_MXCSR_MASK__ 0xFFBF #ifdef _KERNEL int npxdna(void); From owner-p4-projects@FreeBSD.ORG Wed May 7 20:18:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B46137B404; Wed, 7 May 2003 20:18:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0602F37B401 for ; Wed, 7 May 2003 20:18:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A5B5843FCB for ; Wed, 7 May 2003 20:18:39 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h483Id0U092508 for ; Wed, 7 May 2003 20:18:39 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h483Idic092505 for perforce@freebsd.org; Wed, 7 May 2003 20:18:39 -0700 (PDT) Date: Wed, 7 May 2003 20:18:39 -0700 (PDT) Message-Id: <200305080318.h483Idic092505@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30741 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 03:18:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=30741 Change 30741 by peter@peter_daintree on 2003/05/07 20:18:29 really do the last submit. doh! Affected files ... .. //depot/projects/hammer/lib/libc/amd64/gen/modf.S#5 edit Differences ... ==== //depot/projects/hammer/lib/libc/amd64/gen/modf.S#5 (text+ko) ==== @@ -52,44 +52,41 @@ /* With CHOP mode on, frndint behaves as TRUNC does. Useful. */ ENTRY(modf) - pushq %rbp - movq %rsp,%rbp - subq $24,%rsp /* * Set chop mode. */ - fnstcw -12(%rbp) - movw -12(%rbp),%dx + fnstcw -12(%rsp) + movw -12(%rsp),%dx orw $3072,%dx - movw %dx,-16(%rbp) - fldcw -16(%rbp) + movw %dx,-16(%rsp) + fldcw -16(%rsp) /* * Get integral part. */ - movsd %xmm0,-24(%rbp) - fldl -24(%rbp) + movsd %xmm0,-24(%rsp) + fldl -24(%rsp) frndint - fstpl -8(%rbp) + fstpl -8(%rsp) /* * Restore control word. */ - fldcw -12(%rbp) + fldcw -12(%rsp) /* * Store integral part. */ - movsd -8(%rbp),%xmm0 + movsd -8(%rsp),%xmm0 movsd %xmm0,(%rdi) /* * Get fractional part and return it. */ - fldl -24(%rbp) - fsubl -8(%rbp) - movsd -8(%rbp),%xmm0 + fldl -24(%rsp) + fsubl -8(%rsp) + fstpl -8(%rsp) + movsd -8(%rsp),%xmm0 - leave ret From owner-p4-projects@FreeBSD.ORG Wed May 7 22:56:56 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C76E37B404; Wed, 7 May 2003 22:56:55 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1E8C837B401 for ; Wed, 7 May 2003 22:56:55 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9AF4D43F3F for ; Wed, 7 May 2003 22:56:54 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h485us0U005880 for ; Wed, 7 May 2003 22:56:54 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h485usVX005877 for perforce@freebsd.org; Wed, 7 May 2003 22:56:54 -0700 (PDT) Date: Wed, 7 May 2003 22:56:54 -0700 (PDT) Message-Id: <200305080556.h485usVX005877@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30748 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 05:56:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=30748 Change 30748 by marcel@marcel_nfs on 2003/05/07 22:56:19 Re-implement db_get_rse_reg() and db_register_value(). Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia64/db_interface.c#6 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia64/db_interface.c#6 (text+ko) ==== @@ -228,33 +228,28 @@ static int db_get_rse_reg(struct db_variable *vp, db_expr_t *valuep, int op) { - int sof = ddb_regs.tf_special.cfm & 0x7f; - int regno = (db_expr_t) vp->valuep; -#if 0 - u_int64_t *bsp; u_int64_t *reg; -#endif + uint64_t bsp; + int nats, regno, sof; + + bsp = ddb_regs.tf_special.bspstore + ddb_regs.tf_special.ndirty; + regno = (db_expr_t)vp->valuep - 32; + sof = ddb_regs.tf_special.cfm & 0x7f; + nats = (sof - regno + 62 - ((bsp >> 3) & 0x3f)) / 63; + + reg = (void*)(bsp - ((sof - regno + nats) << 3)); - if (regno - 32 >= sof) { - if (op == DB_VAR_GET) - *valuep = 0xdeadbeefdeadbeef; - } else { -#if 0 - bsp = (u_int64_t *)(ddb_regs.tf_special.bspstore + - ddb_regs.tf_special.ndirty); - bsp = ia64_rse_previous_frame(bsp, sof); - reg = ia64_rse_register_address(bsp, regno); + if (regno < sof) { if (op == DB_VAR_GET) *valuep = *reg; else *reg = *valuep; -#else + } else { if (op == DB_VAR_GET) *valuep = 0xdeadbeefdeadbeef; -#endif } - return 0; + return (0); } static int @@ -451,36 +446,38 @@ db_regs_t *regs; int regno; { - - if (regno > 127 || regno < 0) { - db_printf(" **** STRANGE REGISTER NUMBER %d **** ", regno); - return (0); - } + uint64_t *rsp; + uint64_t bsp; + int nats, sof; if (regno == 0) return (0); + if (regno == 1) + return (regs->tf_special.gp); + if (regno >= 2 && regno <= 3) + return ((®s->tf_scratch.gr2)[regno - 2]); + if (regno >= 8 && regno <= 11) + return ((®s->tf_scratch.gr8)[regno - 8]); + if (regno == 12) + return (regs->tf_special.sp); + if (regno == 13) + return (regs->tf_special.tp); + if (regno >= 14 && regno <= 31) + return ((®s->tf_scratch.gr14)[regno - 14]); - if (regno < 32) { + if (regno > 0 && regno < 128) { + bsp = regs->tf_special.bspstore + regs->tf_special.ndirty; + regno -= 32; + sof = regs->tf_special.cfm & 0x7f; + nats = (sof - regno + 62 - ((bsp >> 3) & 0x3f)) / 63; + rsp = (void*)(bsp - ((sof - regno + nats) << 3)); + if (regno < sof) + return (*rsp); return (0xdeadbeefdeadbeef); - /* return (regs->tf_r[regno - 1]); */ - } else { -#if 0 - int sof = ddb_regs.tf_special.cfm & 0x7f; - u_int64_t *bsp = (u_int64_t *)(ddb_regs.tf_special.bspstore + - ddb_regs.tf_special.ndirty); - u_int64_t *reg; + } - if (regno - 32 >= sof) { - return 0xdeadbeefdeadbeef; - } else { - bsp = ia64_rse_previous_frame(bsp, sof); - reg = ia64_rse_register_address(bsp, regno); - return *reg; - } -#else - return 0xdeadbeefdeadbeef; -#endif - } + db_printf(" **** STRANGE REGISTER NUMBER %d **** ", regno + 32); + return (0); } void From owner-p4-projects@FreeBSD.ORG Wed May 7 23:30:38 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 89D7037B404; Wed, 7 May 2003 23:30:37 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2525F37B401 for ; Wed, 7 May 2003 23:30:37 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5F1FA43FA3 for ; Wed, 7 May 2003 23:30:36 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h486Ua0U008172 for ; Wed, 7 May 2003 23:30:36 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h486UZnN008169 for perforce@freebsd.org; Wed, 7 May 2003 23:30:35 -0700 (PDT) Date: Wed, 7 May 2003 23:30:35 -0700 (PDT) Message-Id: <200305080630.h486UZnN008169@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30750 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 06:30:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=30750 Change 30750 by peter@peter_daintree on 2003/05/07 23:30:21 IFC @30749 Affected files ... .. //depot/projects/hammer/lib/libc/amd64/gen/modf.S#6 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/setjmp.S#5 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/sigsetjmp.S#5 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.c#7 integrate .. //depot/projects/hammer/release/Makefile#17 integrate .. //depot/projects/hammer/sbin/vinum/commands.c#7 integrate .. //depot/projects/hammer/share/man/man5/disktab.5#3 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumioctl.c#7 integrate .. //depot/projects/hammer/usr.sbin/pw/pw.8#3 integrate Differences ... ==== //depot/projects/hammer/lib/libc/amd64/gen/modf.S#6 (text+ko) ==== @@ -40,7 +40,7 @@ #if defined(LIBC_SCCS) RCSID("$NetBSD: modf.S,v 1.5 1997/07/16 14:37:18 christos Exp $") #endif -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/modf.S,v 1.1 2003/04/30 16:21:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/modf.S,v 1.2 2003/05/08 03:19:37 peter Exp $"); /* * modf(value, iptr): return fractional part of value, and stores the ==== //depot/projects/hammer/lib/libc/amd64/gen/setjmp.S#5 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)setjmp.s 5.1 (Berkeley) 4/23/90" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.23 2003/04/30 18:09:33 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.24 2003/05/08 06:25:03 peter Exp $"); /* * C library -- _setjmp, _longjmp @@ -55,9 +55,9 @@ ENTRY(setjmp) pushq %rdi movq %rdi,%rcx - leaq 72(%rcx),%rdi /* (sigset_t*)oset */ + movq $1,%rdi /* SIG_BLOCK */ movq $0,%rsi /* (sigset_t*)set */ - movq $1,%rdx /* SIG_BLOCK */ + leaq 72(%rcx),%rdx /* (sigset_t*)oset */ call PIC_PLT(CNAME(_sigprocmask)) popq %rdi movq %rdi,%rcx @@ -80,9 +80,9 @@ pushq %rdi pushq %rsi movq %rdi,%rdx - movq $0,%rdi /* (sigset_t*)oset */ + movq $1,%rdi /* SIG_SETMASK */ leaq 72(%rdx),%rsi /* (sigset_t*)set */ - movq $3,%rdx /* SIG_SETMASK */ + movq $0,%rdx /* (sigset_t*)oset */ call PIC_PLT(CNAME(_sigprocmask)) popq %rsi popq %rdi /* jmpbuf */ ==== //depot/projects/hammer/lib/libc/amd64/gen/sigsetjmp.S#5 (text+ko) ==== @@ -41,7 +41,7 @@ .asciz "$Id: sigsetjmp.S,v 1.1 1993/12/05 13:01:05 ats Exp $" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/sigsetjmp.S,v 1.25 2003/04/30 18:09:33 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/sigsetjmp.S,v 1.26 2003/05/08 06:25:03 peter Exp $"); #include "SYS.h" @@ -58,18 +58,17 @@ */ ENTRY(sigsetjmp) - pushq %rdi - movq %rdi,%rcx - movl %esi,88(%rcx) + movl %esi,88(%rdi) testl %esi,%esi jz 2f - leaq 72(%rcx),%rdi /* (sigset_t*)oset */ + pushq %rdi + movq $1,%rdi /* SIG_BLOCK */ movq $0,%rsi /* (sigset_t*)set */ - movq $1,%rdx /* SIG_BLOCK */ + leaq 72(%rcx),%rdx /* (sigset_t*)oset */ call PIC_PLT(CNAME(_sigprocmask)) popq %rdi - movq %rdi,%rcx -2: movq 0(%rsp),%rdx /* retval */ +2: movq %rdi,%rcx + movq 0(%rsp),%rdx /* retval */ movq %rdx, 0(%rcx) /* retval */ movq %rbx, 8(%rcx) movq %rsp,16(%rcx) @@ -90,9 +89,9 @@ movq %rdi,%rdx pushq %rdi pushq %rsi - movq $0,%rdi /* (sigset_t*)oset */ + movq $3,%rdi /* SIG_SETMASK */ leaq 72(%rdx),%rsi /* (sigset_t*)set */ - movq $3,%rdx /* SIG_SETMASK */ + movq $0,%rdx /* (sigset_t*)oset */ call PIC_PLT(CNAME(_sigprocmask)) popq %rsi popq %rdi /* jmpbuf */ ==== //depot/projects/hammer/libexec/rtld-elf/rtld.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ * (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: src/libexec/rtld-elf/rtld.c,v 1.78 2003/05/04 00:56:00 obrien Exp $ + * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.79 2003/05/08 01:31:36 kan Exp $ */ /* @@ -126,6 +126,7 @@ static void unlink_object(Obj_Entry *); static void unload_object(Obj_Entry *); static void unref_dag(Obj_Entry *); +static void ref_dag(Obj_Entry *); void r_debug_state(struct r_debug*, struct link_map*); @@ -361,7 +362,6 @@ *obj_tail = obj_main; obj_tail = &obj_main->next; obj_count++; - obj_main->refcount++; /* Make sure we don't call the main program's init and fini functions. */ obj_main->init = obj_main->fini = NULL; @@ -383,8 +383,10 @@ die(); /* Make a list of all objects loaded at startup. */ - for (obj = obj_list; obj != NULL; obj = obj->next) + for (obj = obj_list; obj != NULL; obj = obj->next) { objlist_push_tail(&list_main, obj); + obj->refcount++; + } if (ld_tracing) { /* We're done */ trace_loaded_objects(obj_main); @@ -970,6 +972,8 @@ if (donelist_check(dlp, obj)) return; + + obj->refcount++; objlist_push_tail(&obj->dldags, root); objlist_push_tail(&root->dagmembers, obj); for (needed = obj->needed; needed != NULL; needed = needed->next) @@ -1223,7 +1227,6 @@ } else free(path); - obj->refcount++; return obj; } @@ -1579,6 +1582,7 @@ /* Unreference the object and its dependencies. */ root->dl_refcount--; + unref_dag(root); if (root->refcount == 0) { @@ -1682,8 +1686,14 @@ /* Make list of init functions to call. */ initlist_add_objects(obj, &obj->next, &initlist); } - } else if (ld_tracing) - goto trace; + } else { + + /* Bump the reference counts for objects on this DAG. */ + ref_dag(obj); + + if (ld_tracing) + goto trace; + } } GDB_STATE(RT_CONSISTENT,obj ? &obj->linkmap : NULL); @@ -2405,7 +2415,6 @@ static void unlink_object(Obj_Entry *root) { - const Needed_Entry *needed; Objlist_Entry *elm; if (root->refcount == 0) { @@ -2413,25 +2422,28 @@ objlist_remove(&list_global, root); /* Remove the object from all objects' DAG lists. */ - STAILQ_FOREACH(elm, &root->dagmembers , link) + STAILQ_FOREACH(elm, &root->dagmembers , link) { objlist_remove(&elm->obj->dldags, root); + if (elm->obj != root) + unlink_object(elm->obj); + } } +} - for (needed = root->needed; needed != NULL; needed = needed->next) - if (needed->obj != NULL) - unlink_object(needed->obj); +static void +ref_dag(Obj_Entry *root) +{ + Objlist_Entry *elm; + + STAILQ_FOREACH(elm, &root->dagmembers , link) + elm->obj->refcount++; } static void unref_dag(Obj_Entry *root) { - const Needed_Entry *needed; + Objlist_Entry *elm; - if (root->refcount == 0) - return; - root->refcount--; - if (root->refcount == 0) - for (needed = root->needed; needed != NULL; needed = needed->next) - if (needed->obj != NULL) - unref_dag(needed->obj); + STAILQ_FOREACH(elm, &root->dagmembers , link) + elm->obj->refcount--; } ==== //depot/projects/hammer/release/Makefile#17 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.774 2003/05/05 07:58:42 markm Exp $ +# $FreeBSD: src/release/Makefile,v 1.775 2003/05/08 03:25:17 obrien Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -756,6 +756,117 @@ .endif touch release.9 +release.9.alpha: +.if ${TARGET_ARCH} != "ia64" || ${TARGET_ARCH} == ${MACHINE_ARCH} + cp ${RD}/trees/base/etc/disktab /etc + rm -rf ${RD}/mfsfd + mkdir ${RD}/mfsfd + cd ${RD}/mfsfd && \ + mkdir -p etc/defaults dev mnt stand/etc/defaults stand/help + @cd ${.CURDIR} && $(MAKE) installCRUNCH CRUNCH=boot \ + DIR=${RD}/mfsfd/stand ZIP=false + ( cd ${RD}/mfsfd && \ + for dir in bin sbin ; do \ + ln -sf /stand $$dir; \ + done ) + cp ${RD}/trees/base/sbin/dhclient-script ${RD}/mfsfd/stand +.if ${TARGET} == "pc98" + cp ${.CURDIR}/../etc/defaults/pccard.conf ${RD}/mfsfd/etc/defaults/pccard.conf +.endif + cp ${.CURDIR}/../etc/usbd.conf ${RD}/mfsfd/etc/usbd.conf + ( for F in defaults/rc.conf netconfig protocols ; do \ + sed -e '/^#.*$$/d' -e 's/[:space:]*#.*$$//g' \ + ${RD}/trees/base/etc/$$F > ${RD}/mfsfd/stand/etc/$$F ; \ + done ) + grep -E '^(ftp|nameserver|domain|sunrpc|cmd|nfsd)[^-\w]' \ + ${RD}/trees/base/etc/services | \ + sed -e '/^#.*$$/d' -e 's/[:space:]*#.*$$//g' \ + > ${RD}/mfsfd/stand/etc/services + ln ${RD}/mfsfd/stand/etc/services ${RD}/mfsfd/etc/services + ln ${RD}/mfsfd/stand/etc/netconfig ${RD}/mfsfd/etc/netconfig + cp ${RD}/trees/base/COPYRIGHT ${RD}/mfsfd/stand/help/COPYRIGHT.hlp +.if !defined(NODOC) + @for i in ${DIST_DOCS_ARCH_INDEP}; do \ + cp ${RND}/${RELNOTES_LANG}/$$i/article.txt ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \ + done + @for i in ${DIST_DOCS_ARCH_DEP}; do \ + cp ${RND}/${RELNOTES_LANG}/$$i/${TARGET}/article.txt ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \ + done + @mv ${RD}/mfsfd/stand/help/INSTALLATION.TXT ${RD}/mfsfd/stand/help/INSTALL.TXT + @mv ${RD}/mfsfd/stand/help/EARLY-ADOPTER.TXT ${RD}/mfsfd/stand/help/EARLY.TXT +.endif + -test -f ${.CURDIR}/install.cfg && cp ${.CURDIR}/install.cfg ${RD}/mfsfd + @mkdir -p ${RD}/mfsfd/boot +.if ${TARGET_ARCH} != "ia64" + @cp ${RD}/trees/base/boot/boot* ${RD}/mfsfd/boot +.endif +.if ${TARGET} == "i386" + @cp ${RD}/trees/base/boot/mbr ${RD}/mfsfd/boot +.endif + @echo "Making the regular boot floppy." + @tar --exclude CVS -cf - -C ${.CURDIR}/../usr.sbin/sysinstall help | \ + tar xf - -C ${RD}/mfsfd/stand +.if ${TARGET_ARCH} == "alpha" && !defined(NO_FLOPPIES) + rm -rf ${RD}/mfsfd/stand/help/* +.endif +.if defined(SMALLBOOTSIZE) +.if exists(${.CURDIR}/${TARGET}/drivers-small.conf) + @rm -rf ${RD}/mfsfd/modules + @mkdir -p ${RD}/mfsfd/modules + @awk -f ${.CURDIR}/scripts/driver-copy2.awk 2 \ + ${.CURDIR}/${TARGET}/drivers-small.conf \ + ${RD}/trees/base/boot/kernel ${RD}/mfsfd/modules +.endif + sh -e ${DOFS_SH} mfsroot ${RD} ${MNT} \ + ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL} + @gzip -9vc mfsroot > mfsroot.gz + @sh -e ${DOFS_SH} ${RD}/floppies/mfsroot-small.flp \ + ${RD} ${MNT} ${SMALLBOOTSIZE} mfsroot.gz \ + ${BOOTINODE} ${SMALLBOOTLABEL} +.endif +.if exists(${.CURDIR}/${TARGET}/drivers.conf) + @rm -rf ${RD}/mfsfd/modules + @mkdir -p ${RD}/mfsfd/modules + @awk -f ${.CURDIR}/scripts/driver-copy2.awk 2 \ + ${.CURDIR}/${TARGET}/drivers.conf \ + ${RD}/trees/base/boot/kernel ${RD}/mfsfd/modules + @rm -rf ${RD}/driversfd + @mkdir ${RD}/driversfd + @awk -f ${.CURDIR}/scripts/driver-copy2.awk 3 \ + ${.CURDIR}/${TARGET}/drivers.conf \ + ${RD}/trees/base/boot/kernel ${RD}/driversfd + -@rmdir ${RD}/driversfd + if [ -d ${RD}/driversfd ]; then \ + sh -e ${DOFS_SH} \ + ${RD}/floppies/drivers.flp ${RD} ${MNT} ${DRIVERSIZE} \ + ${RD}/driversfd ${DRIVERINODE} ${DRIVERLABEL}; \ + cd ${RD}/driversfd && awk -f ${.CURDIR}/scripts/driver-desc.awk \ + *.dsc >> ${RD}/floppies/DRIVERS.TXT; \ + fi +.endif + sh -e ${DOFS_SH} mfsroot ${RD} ${MNT} \ + ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL} + @gzip -9vc mfsroot > mfsroot.gz + @mkdir -p ${RD}/mfsroot + @cp mfsroot.gz ${RD}/mfsroot +.if !defined(NO_FLOPPIES) +.if defined(BOOTSIZE) + @sh -e ${DOFS_SH} ${RD}/floppies/mfsroot.flp \ + ${RD} ${MNT} ${BOOTSIZE} mfsroot.gz ${BOOTINODE} ${BOOTLABEL} + @cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern +.endif +.if defined(SMALLBOOTSIZE) + @cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern-small FDSIZE=SMALL +.endif +.if defined(BIGBOOTSIZE) + @cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=boot FDSIZE=BIG +.endif +.endif + @rm mfsroot mfsroot.gz + @echo "Regular and MFS boot floppies made." +.endif + touch release.9.alpha + # # --==## Create a fixit floppy ##==-- # @@ -972,8 +1083,14 @@ md5 * > CHECKSUM.MD5) \ ) +.if ${TARGET_ARCH} == "alpha" +RELEASE9=release.9.${TARGET_ARCH} +.else +RELEASE9=release.9 +.endif + doRELEASE: release.1 release.2 release.3 ${DOCREL} release.4 release.5 \ - release.6 release.7 release.8 release.9 ${FIXIT_TARGET} + release.6 release.7 release.8 ${RELEASE9} ${FIXIT_TARGET} @cd ${.CURDIR} && ${MAKE} ${EXTRAS} @echo "Release done" ==== //depot/projects/hammer/sbin/vinum/commands.c#7 (text+ko) ==== @@ -36,8 +36,8 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: commands.c,v 1.23 2003/05/04 05:23:59 grog Exp grog $ - * $FreeBSD: src/sbin/vinum/commands.c,v 1.51 2003/05/05 22:49:23 obrien Exp $ + * $Id: commands.c,v 1.24 2003/05/07 03:17:43 grog Exp grog $ + * $FreeBSD: src/sbin/vinum/commands.c,v 1.52 2003/05/08 00:33:57 grog Exp $ */ #include "vext.h" @@ -160,18 +160,12 @@ strcat(buffer, " "); } } - if (ioctl(superdev, VINUM_STARTCONFIG, &force)) { /* can't get config? */ - fprintf(stderr, "Can't configure: %s (%d)\n", strerror(errno), errno); - return; - } ioctl(superdev, VINUM_READCONFIG, &buffer); if (reply->error != 0) { /* error in config */ fprintf(stdout, "** %s: %s\n", reply->msg, strerror(reply->error)); - error = ioctl(superdev, VINUM_RELEASECONFIG, NULL); /* save the config to disk */ if (error != 0) perror("Can't save Vinum config"); } else { - error = ioctl(superdev, VINUM_RELEASECONFIG, NULL); /* save the config to disk */ if (error != 0) perror("Can't save Vinum config"); if (no_devfs) ==== //depot/projects/hammer/share/man/man5/disktab.5#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)disktab.5 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man5/disktab.5,v 1.11 2002/12/12 17:25:57 ru Exp $ +.\" $FreeBSD: src/share/man/man5/disktab.5,v 1.12 2003/05/08 00:14:48 trhodes Exp $ .\" .Dd June 5, 1993 .Dt DISKTAB 5 @@ -54,16 +54,15 @@ .Xr termcap 5 terminal data base. Entries in .Nm -consist of a number of `:' separated fields. The -first entry for each disk gives the names which are -known for the disk, separated by `|' characters. The +consist of a number of `:'-separated fields. The +first field for each entry gives the names by which a +disk's entry may be selected, separated by `|' characters. The last name given should be a long name fully identifying the disk. .Pp -The following list indicates the normal values -stored for each disk entry. +The optional fields for each entry are: .Bl -column "indent" "boolx" -.It Sy "Name Type Description" +.It Sy "ID Type Description" .It "\&ty str Type of disk (e.g. removable, winchester)" .It "\&dt str Type of controller (e.g." .Tn SMD , ESDI , @@ -86,6 +85,8 @@ .It "\&d[0-4] num Drive-type-dependent parameters" .It "\&bs num Boot block size, default" .Dv BBSIZE +.It "\&b[0-1] num Boot block filenames; see" +.Xr bsdlabel 8 .It "\&sb num Superblock size, default" .Dv SBSIZE .It "\&ba num Block size for partition `a' (bytes)" ==== //depot/projects/hammer/sys/dev/vinum/vinumioctl.c#7 (text+ko) ==== @@ -41,8 +41,8 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: vinumioctl.c,v 1.21 2003/05/04 05:23:09 grog Exp grog $ - * $FreeBSD: src/sys/dev/vinum/vinumioctl.c,v 1.45 2003/05/05 08:41:53 grog Exp $ + * $Id: vinumioctl.c,v 1.22 2003/05/07 03:31:45 grog Exp grog $ + * $FreeBSD: src/sys/dev/vinum/vinumioctl.c,v 1.46 2003/05/08 00:36:20 grog Exp $ */ #include @@ -303,9 +303,6 @@ return error; case VINUM_READCONFIG: - error = lock_config(); /* get the config for us alone */ - if (error) /* can't do it, */ - return error; /* give up */ if (((char *) data)[0] == '\0') ioctl_reply->error = vinum_scandisk(NULL); /* built your own list */ else @@ -317,7 +314,6 @@ strcpy(ioctl_reply->msg, "no drives found"); } else if (ioctl_reply->error) strcpy(ioctl_reply->msg, "can't read configuration information, see log file"); - unlock_config(); return 0; /* must be 0 to return the real error info */ case VINUM_INIT: ==== //depot/projects/hammer/usr.sbin/pw/pw.8#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/usr.sbin/pw/pw.8,v 1.32 2002/12/12 17:26:03 ru Exp $ +.\" $FreeBSD: src/usr.sbin/pw/pw.8,v 1.33 2003/05/08 00:28:36 trhodes Exp $ .\" .Dd December 9, 1996 .Dt PW 8 @@ -912,6 +912,14 @@ .Xr fingerd 8 , and a small number of TCP/IP clients, such as IRC, where full names specified in the passwd file may be used by default. +.Pp +The +.Nm +utility writes a log to the +.Pa /var/log/userlog +file when actions such as user or group additions or deletions occur. +The location of this logfile can be changed in +.Xr pw.conf 5 . .Sh FILES .Bl -tag -width /etc/master.passwd.new -compact .It Pa /etc/master.passwd @@ -930,6 +938,8 @@ Temporary copy of the group file .It Pa /etc/pw.conf Pw default options file +.It Pa /var/log/userlog +User/group modification logfile .El .Sh SEE ALSO .Xr chpass 1 , From owner-p4-projects@FreeBSD.ORG Wed May 7 23:42:56 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7DA1337B404; Wed, 7 May 2003 23:42:56 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9F24537B401 for ; Wed, 7 May 2003 23:42:55 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2B36943FBF for ; Wed, 7 May 2003 23:42:55 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h486gt0U008864 for ; Wed, 7 May 2003 23:42:55 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h486gsF1008861 for perforce@freebsd.org; Wed, 7 May 2003 23:42:54 -0700 (PDT) Date: Wed, 7 May 2003 23:42:54 -0700 (PDT) Message-Id: <200305080642.h486gsF1008861@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30756 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 06:42:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=30756 Change 30756 by peter@peter_daintree on 2003/05/07 23:42:15 IFC @30754 Affected files ... .. //depot/projects/hammer/gnu/usr.bin/binutils/libbinutils/Makefile#5 integrate .. //depot/projects/hammer/libexec/Makefile#12 integrate .. //depot/projects/hammer/sys/Makefile#3 integrate .. //depot/projects/hammer/usr.bin/Makefile#13 integrate .. //depot/projects/hammer/usr.bin/xlint/lint1/param.h#4 integrate Differences ... ==== //depot/projects/hammer/gnu/usr.bin/binutils/libbinutils/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbinutils/Makefile,v 1.18 2002/10/11 06:28:05 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbinutils/Makefile,v 1.19 2003/05/08 06:39:31 peter Exp $ .include "../Makefile.inc0" ==== //depot/projects/hammer/libexec/Makefile#12 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/libexec/Makefile,v 1.58 2003/05/05 07:58:42 markm Exp $ +# $FreeBSD: src/libexec/Makefile,v 1.59 2003/05/08 06:37:12 peter Exp $ # Present but disabled: kpasswdd SUBDIR= atrun \ ==== //depot/projects/hammer/sys/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.26 2002/04/26 17:55:21 ru Exp $ +# $FreeBSD: src/sys/Makefile,v 1.27 2003/05/08 06:35:39 peter Exp $ SUBDIR= # The boot loader ==== //depot/projects/hammer/usr.bin/Makefile#13 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.3 (Berkeley) 1/7/94 -# $FreeBSD: src/usr.bin/Makefile,v 1.237 2003/05/05 07:58:43 markm Exp $ +# $FreeBSD: src/usr.bin/Makefile,v 1.238 2003/05/08 06:33:07 peter Exp $ # XXX MISSING: deroff diction graph learn plot # spell spline struct xsend ==== //depot/projects/hammer/usr.bin/xlint/lint1/param.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ * (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: src/usr.bin/xlint/lint1/param.h,v 1.7 2002/12/09 23:27:47 benno Exp $ + * $FreeBSD: src/usr.bin/xlint/lint1/param.h,v 1.8 2003/05/08 06:33:49 peter Exp $ */ /* From owner-p4-projects@FreeBSD.ORG Wed May 7 23:49:04 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE83A37B404; Wed, 7 May 2003 23:49:03 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 908E437B401 for ; Wed, 7 May 2003 23:49:03 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A80D43F85 for ; Wed, 7 May 2003 23:49:03 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h486n30U009076 for ; Wed, 7 May 2003 23:49:03 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h486n258009073 for perforce@freebsd.org; Wed, 7 May 2003 23:49:02 -0700 (PDT) Date: Wed, 7 May 2003 23:49:02 -0700 (PDT) Message-Id: <200305080649.h486n258009073@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30757 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 06:49:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=30757 Change 30757 by peter@peter_daintree on 2003/05/07 23:48:51 make the debug variable static. Will the real telnetd please stand up? Affected files ... .. //depot/projects/hammer/crypto/heimdal/appl/telnet/telnetd/telnetd.c#3 edit .. //depot/projects/hammer/crypto/telnet/telnetd/telnetd.c#3 edit .. //depot/projects/hammer/libexec/telnetd/telnetd.c#2 edit Differences ... ==== //depot/projects/hammer/crypto/heimdal/appl/telnet/telnetd/telnetd.c#3 (text+ko) ==== @@ -116,7 +116,7 @@ int lowpty = 0, highpty; /* low, high pty numbers */ #endif /* CRAY */ -int debug = 0; +static int debug = 0; int keepalive = 1; char *progname; ==== //depot/projects/hammer/crypto/telnet/telnetd/telnetd.c#3 (text+ko) ==== @@ -78,7 +78,7 @@ int hostinfo = 1; /* do we print login banner? */ -int debug = 0; +static int debug = 0; int keepalive = 1; const char *altlogin; ==== //depot/projects/hammer/libexec/telnetd/telnetd.c#2 (text+ko) ==== @@ -71,7 +71,7 @@ int hostinfo = 1; /* do we print login banner? */ -int debug = 0; +debug int debug = 0; int keepalive = 1; const char *altlogin; From owner-p4-projects@FreeBSD.ORG Thu May 8 00:39:08 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3E78037B404; Thu, 8 May 2003 00:39:08 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EA2CF37B401 for ; Thu, 8 May 2003 00:39:07 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7F25843F3F for ; Thu, 8 May 2003 00:39:07 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h487d70U012385 for ; Thu, 8 May 2003 00:39:07 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h487d7OO012382 for perforce@freebsd.org; Thu, 8 May 2003 00:39:07 -0700 (PDT) Date: Thu, 8 May 2003 00:39:07 -0700 (PDT) Message-Id: <200305080739.h487d7OO012382@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30763 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 07:39:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=30763 Change 30763 by marcel@marcel_nfs on 2003/05/08 00:38:36 Add minimal unwind information. This mostly tells the unwinder that an ABI specific bottom has been reached. Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia64/syscall.s#17 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia64/syscall.s#17 (text+ko) ==== @@ -224,6 +224,10 @@ .section .text.syscall, "ax" ENTRY(epc_syscall, 8) + .prologue + .unwabi @svr4, 'E' + .save rp, r0 + rsm psr.i ;; { .mmi From owner-p4-projects@FreeBSD.ORG Thu May 8 00:45:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC31737B404; Thu, 8 May 2003 00:45:20 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6AB7C37B401 for ; Thu, 8 May 2003 00:45:20 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 43CDA43FAF for ; Thu, 8 May 2003 00:45:19 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h487jJ0U012810 for ; Thu, 8 May 2003 00:45:19 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h487jG64012807 for perforce@freebsd.org; Thu, 8 May 2003 00:45:16 -0700 (PDT) Date: Thu, 8 May 2003 00:45:16 -0700 (PDT) Message-Id: <200305080745.h487jG64012807@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30765 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 07:45:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=30765 Change 30765 by marcel@marcel_pluto1 on 2003/05/08 00:45:15 IFC @30760 Affected files ... .. //depot/projects/ia64/UPDATING#41 integrate .. //depot/projects/ia64/bin/df/df.1#5 integrate .. //depot/projects/ia64/bin/ls/ls.1#16 integrate .. //depot/projects/ia64/bin/mv/mv.c#8 integrate .. //depot/projects/ia64/bin/mv/pathnames.h#3 delete .. //depot/projects/ia64/bin/sh/var.c#8 integrate .. //depot/projects/ia64/contrib/isc-dhcp/client/clparse.c#5 integrate .. //depot/projects/ia64/contrib/tar/src/buffer.c#5 integrate .. //depot/projects/ia64/etc/Makefile#29 integrate .. //depot/projects/ia64/etc/devd.conf#4 integrate .. //depot/projects/ia64/etc/devfs.conf#1 branch .. //depot/projects/ia64/etc/newsyslog.conf#9 integrate .. //depot/projects/ia64/etc/pccard_ether#5 integrate .. //depot/projects/ia64/etc/rc.d/apm#3 integrate .. //depot/projects/ia64/etc/rc.d/apmd#7 integrate .. //depot/projects/ia64/etc/rc.d/archdep#5 integrate .. //depot/projects/ia64/etc/rc.d/devfs#5 integrate .. //depot/projects/ia64/etc/rc.d/kpasswdd#2 integrate .. //depot/projects/ia64/etc/remote#3 integrate .. //depot/projects/ia64/etc/services#8 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/libbinutils/Makefile#6 integrate .. //depot/projects/ia64/gnu/usr.bin/binutils/libopcodes/Makefile.amd64#1 branch .. //depot/projects/ia64/include/paths.h#8 integrate .. //depot/projects/ia64/lib/libc/amd64/_fpmath.h#2 integrate .. //depot/projects/ia64/lib/libc/amd64/arith.h#2 integrate .. //depot/projects/ia64/lib/libc/amd64/gen/Makefile.inc#2 integrate .. //depot/projects/ia64/lib/libc/amd64/gen/alloca.S#2 integrate .. //depot/projects/ia64/lib/libc/amd64/gen/modf.S#2 integrate .. //depot/projects/ia64/lib/libc/amd64/gen/setjmp.S#2 integrate .. //depot/projects/ia64/lib/libc/amd64/gen/sigsetjmp.S#2 integrate .. //depot/projects/ia64/lib/libc/i386/gen/rfork_thread.S#4 integrate .. //depot/projects/ia64/lib/libpam/libpam/Makefile#19 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_cancel.c#5 integrate .. //depot/projects/ia64/lib/libthr/arch/i386/i386/_setcurthread.c#2 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_mutex.c#2 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_sig.c#2 integrate .. //depot/projects/ia64/libexec/Makefile#14 integrate .. //depot/projects/ia64/libexec/rtld-elf/rtld.c#14 integrate .. //depot/projects/ia64/release/Makefile#50 integrate .. //depot/projects/ia64/release/alpha/dokern.sh#7 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/readme/article.sgml#12 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#89 integrate .. //depot/projects/ia64/release/doc/share/sgml/release.ent#7 integrate .. //depot/projects/ia64/sbin/Makefile#24 integrate .. //depot/projects/ia64/sbin/bsdlabel/Makefile#4 integrate .. //depot/projects/ia64/sbin/dump/main.c#18 integrate .. //depot/projects/ia64/sbin/dump/traverse.c#15 integrate .. //depot/projects/ia64/sbin/dumpon/dumpon.8#7 integrate .. //depot/projects/ia64/sbin/mdmfs/mdmfs.8#8 integrate .. //depot/projects/ia64/sbin/shutdown/pathnames.h#3 delete .. //depot/projects/ia64/sbin/shutdown/shutdown.c#4 integrate .. //depot/projects/ia64/sbin/startslip/startslip.c#4 integrate .. //depot/projects/ia64/sbin/vinum/commands.c#8 integrate .. //depot/projects/ia64/share/examples/etc/make.conf#30 integrate .. //depot/projects/ia64/share/man/man5/disktab.5#4 integrate .. //depot/projects/ia64/share/man/man9/malloc.9#10 integrate .. //depot/projects/ia64/share/mk/bsd.sys.mk#13 integrate .. //depot/projects/ia64/share/sendmail/Makefile#4 integrate .. //depot/projects/ia64/sys/Makefile#3 integrate .. //depot/projects/ia64/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/ia64/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/ia64/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/ia64/sys/conf/NOTES#49 integrate .. //depot/projects/ia64/sys/conf/newvers.sh#4 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#13 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.h#8 integrate .. //depot/projects/ia64/sys/dev/bge/if_bge.c#30 integrate .. //depot/projects/ia64/sys/dev/bge/if_bgereg.h#15 integrate .. //depot/projects/ia64/sys/dev/em/if_em.c#22 integrate .. //depot/projects/ia64/sys/dev/usb/uhci_pci.c#4 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumioctl.c#13 integrate .. //depot/projects/ia64/sys/geom/geom_bsd.c#34 integrate .. //depot/projects/ia64/sys/geom/geom_io.c#25 integrate .. //depot/projects/ia64/sys/i386/isa/intr_machdep.c#8 integrate .. //depot/projects/ia64/sys/kern/kern_mac.c#25 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#48 integrate .. //depot/projects/ia64/sys/kern/kern_subr.c#21 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#34 integrate .. //depot/projects/ia64/sys/kern/uipc_syscalls.c#31 integrate .. //depot/projects/ia64/sys/kern/vfs_default.c#24 integrate .. //depot/projects/ia64/sys/netinet/ip_input.c#29 integrate .. //depot/projects/ia64/sys/netinet/tcp_input.c#40 integrate .. //depot/projects/ia64/sys/netinet/tcp_subr.c#31 integrate .. //depot/projects/ia64/sys/netinet/tcp_var.h#12 integrate .. //depot/projects/ia64/sys/pci/if_sis.c#21 integrate .. //depot/projects/ia64/sys/sys/dkstat.h#3 integrate .. //depot/projects/ia64/sys/sys/signalvar.h#12 integrate .. //depot/projects/ia64/sys/sys/syscallsubr.h#7 integrate .. //depot/projects/ia64/sys/vm/swap_pager.c#25 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#52 integrate .. //depot/projects/ia64/sys/vm/vm_pager.c#11 integrate .. //depot/projects/ia64/sys/vm/vnode_pager.c#31 integrate .. //depot/projects/ia64/tools/tools/tinderbox/tbmaster.pl#7 integrate .. //depot/projects/ia64/usr.bin/Makefile#46 integrate .. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#27 integrate .. //depot/projects/ia64/usr.bin/vi/pathnames.h#2 integrate .. //depot/projects/ia64/usr.bin/xlint/lint1/param.h#4 integrate .. //depot/projects/ia64/usr.sbin/newsyslog/newsyslog.c#19 integrate .. //depot/projects/ia64/usr.sbin/pw/pw.8#7 integrate Differences ... ==== //depot/projects/ia64/UPDATING#41 (text+ko) ==== @@ -17,6 +17,11 @@ developers choose to disable these features on build machines to maximize performance. +20030505: + Kerberos 5 (Heimdal) is now built by default. Setting + MAKE_KERBEROS5 no longer has any effect. If you do NOT + want the "base" Kerberos 5, you need to set NO_KERBEROS. + 20030502: groff has been updated. If you try to do a buildworld and get an infinite loop in troff, update to May 4th or newer. If you @@ -1273,4 +1278,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.250 2003/05/04 06:26:30 imp Exp $ +$FreeBSD: src/UPDATING,v 1.251 2003/05/05 20:05:37 markm Exp $ ==== //depot/projects/ia64/bin/df/df.1#5 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)df.1 8.3 (Berkeley) 5/8/95 -.\" $FreeBSD: src/bin/df/df.1,v 1.28 2002/08/26 04:56:23 trhodes Exp $ +.\" $FreeBSD: src/bin/df/df.1,v 1.29 2003/05/06 21:54:46 trhodes Exp $ .\" .Dd May 8, 1995 .Dt DF 1 @@ -81,11 +81,11 @@ .It Fl H "Human-readable" output. Use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte and Petabyte in order to reduce the number of -digits to three or less using base 10 for sizes. +digits to four or fewer using base 10 for sizes. .It Fl h "Human-readable" output. Use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte and Petabyte in order to reduce the number of -digits to three or less using base 2 for sizes. +digits to four or fewer using base 2 for sizes. .It Fl i Include statistics on the number of free inodes. .It Fl k ==== //depot/projects/ia64/bin/ls/ls.1#16 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.73 2003/01/20 21:25:00 chris Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.74 2003/05/06 21:54:46 trhodes Exp $ .\" .Dd May 19, 2002 .Dt LS 1 @@ -175,7 +175,7 @@ When used with the .Fl l option, use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte -and Petabyte in order to reduce the number of digits to three or less +and Petabyte in order to reduce the number of digits to four or fewer using base 2 for sizes. .It Fl i For each file, print the file's file serial number (inode number). ==== //depot/projects/ia64/bin/mv/mv.c#8 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.40 2003/05/01 16:58:56 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.41 2003/05/05 22:49:22 obrien Exp $"); #include #include @@ -67,8 +67,6 @@ #include #include -#include "pathnames.h" - int fflg, iflg, nflg, vflg; int copy(char *, char *); ==== //depot/projects/ia64/bin/sh/var.c#8 (text+ko) ==== @@ -40,10 +40,11 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.23 2002/10/01 00:54:14 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.24 2003/05/05 22:49:22 obrien Exp $"); #include #include +#include /* * Shell variables. @@ -105,7 +106,7 @@ NULL }, { &vmpath, VSTRFIXED|VTEXTFIXED|VUNSET, "MAILPATH=", NULL }, - { &vpath, VSTRFIXED|VTEXTFIXED, "PATH=/bin:/usr/bin", + { &vpath, VSTRFIXED|VTEXTFIXED, "PATH=" _PATH_DEFPATH, changepath }, { &vppid, VSTRFIXED|VTEXTFIXED|VUNSET, "PPID=", NULL }, ==== //depot/projects/ia64/contrib/isc-dhcp/client/clparse.c#5 (text+ko) ==== @@ -44,7 +44,7 @@ #ifndef lint static char copyright[] = "$Id: clparse.c,v 1.62.2.3 2002/11/17 02:25:43 dhankins Exp $ Copyright (c) 1996-2002 The Internet Software Consortium. All rights reserved.\n" -"$FreeBSD: src/contrib/isc-dhcp/client/clparse.c,v 1.9 2003/01/16 07:22:32 obrien Exp $\n"; +"$FreeBSD: src/contrib/isc-dhcp/client/clparse.c,v 1.10 2003/05/05 22:49:22 obrien Exp $\n"; #endif /* not lint */ #include "dhcpd.h" @@ -53,7 +53,7 @@ struct client_config top_level_config; -char client_script_name [] = "/sbin/dhclient-script"; +char client_script_name [] = _PATH_DHCLIENT_SCRIPT; u_int32_t default_requested_options [] = { DHO_SUBNET_MASK, ==== //depot/projects/ia64/contrib/tar/src/buffer.c#5 (text+ko) ==== @@ -19,12 +19,18 @@ with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/tar/src/buffer.c,v 1.5 2002/10/09 07:33:29 sobomax Exp $ */ +/* $FreeBSD: src/contrib/tar/src/buffer.c,v 1.6 2003/05/05 22:49:22 obrien Exp $ */ #include "system.h" #include +#if __FreeBSD__ +# include +#else +# define _PATH_BSHELL "/bin/sh" +#endif + #if MSDOS # include #endif @@ -1549,7 +1555,7 @@ pid_t child; const char *shell = getenv ("SHELL"); if (! shell) - shell = "/bin/sh"; + shell = _PATH_BSHELL; child = xfork (); if (child == 0) { ==== //depot/projects/ia64/etc/Makefile#29 (text+ko) ==== @@ -1,13 +1,13 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.312 2003/05/02 22:27:31 dougb Exp $ +# $FreeBSD: src/etc/Makefile,v 1.313 2003/05/06 07:25:17 dougb Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail .endif BIN1= amd.map apmd.conf auth.conf \ - crontab csh.cshrc csh.login csh.logout \ - devd.conf dhclient.conf disktab fbtab ftpusers gettytab group \ + crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \ + dhclient.conf disktab fbtab ftpusers gettytab group \ hosts hosts.allow hosts.equiv hosts.lpd \ inetd.conf login.access login.conf \ mac.conf motd netconfig network.subr networks newsyslog.conf \ ==== //depot/projects/ia64/etc/devd.conf#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.3 2003/05/03 10:16:55 akiyama Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.4 2003/05/07 15:48:20 imp Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -64,9 +64,10 @@ }; # Don't even try to second guess what to do about drivers that don't -# match here. Instead, pass it off to a smart script to deal. +# match here. Instead, pass it off to syslog. Commented out for the +# moment, as pnpinfo isn't set in devd yet nomatch 0 { - action "logger Unknown device: $pnpinfo $location $bus"; + // action "logger Unknown device: $pnpinfo $location $bus"; }; /* EXAMPLES TO END OF FILE ==== //depot/projects/ia64/etc/newsyslog.conf#9 (text+ko) ==== @@ -1,5 +1,14 @@ # configuration file for newsyslog -# $FreeBSD: src/etc/newsyslog.conf,v 1.44 2003/04/08 16:14:02 des Exp $ +# $FreeBSD: src/etc/newsyslog.conf,v 1.46 2003/05/05 19:08:33 gad Exp $ +# +# Entries which do not specify the '/pid_file' field will cause the +# syslogd process to be signalled when that log file is rotated. This +# action is only appropriate for log files which are written to by the +# syslogd process (ie, files listed in /etc/syslogd.conf). If there +# is no process which needs to be signalled when a given log file is +# rotated, then the entry for that file should include the 'N' flag. +# +# The 'flags' field is one or more of the letters: BCGJNUWZ or a '-'. # # Note: some sites will want to select more restrictive protections than the # defaults. In particular, it may be desirable to switch many of the 644 @@ -7,23 +16,23 @@ # contents of maillog, messages, and lpd-errs to be confidential. In the # future, these defaults may change to more conservative ones. # -# logfilename [owner:group] mode count size when [ZJB] [/pid_file] [sig_num] +# logfilename [owner:group] mode count size when flags [/pid_file] [sig_num] /var/log/all.log 600 7 * @T00 J /var/log/amd.log 644 7 100 * J /var/log/auth.log 600 7 100 * J /var/log/console.log 600 5 100 * J /var/log/cron 600 3 100 * J -/var/log/daily.log 640 7 * @T00 J +/var/log/daily.log 640 7 * @T00 JN /var/log/debug.log 600 7 100 * J /var/log/kerberos.log 600 7 100 * J /var/log/lpd-errs 644 7 100 * J /var/log/maillog 640 7 * @T00 J /var/log/messages 644 5 100 * J -/var/log/monthly.log 640 12 * $M1D0 J +/var/log/monthly.log 640 12 * $M1D0 JN /var/log/ppp.log root:network 640 3 100 * J /var/log/security 600 10 100 * J /var/log/sendmail.st 640 10 * 168 B /var/log/slip.log root:network 640 3 100 * J -/var/log/weekly.log 640 5 1 $W6D0 J +/var/log/weekly.log 640 5 1 $W6D0 JN /var/log/wtmp 644 3 * @01T05 B /var/log/xferlog 600 7 100 * J ==== //depot/projects/ia64/etc/pccard_ether#5 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/etc/pccard_ether,v 1.28 2002/12/12 09:31:09 imp Exp $ +# $FreeBSD: src/etc/pccard_ether,v 1.29 2003/05/05 19:06:46 ume Exp $ # # pccard_ether interfacename [start|stop] [ifconfig option] # @@ -134,8 +134,8 @@ # IPv6 setup case ${ipv6_enable} in [Yy][Ee][Ss]) - if [ -r /etc/rc.network6 ]; then - . /etc/rc.network6 + if [ -r /etc/rc.d/network_ipv6 ]; then + . /etc/rc.d/network_ipv6 network6_interface_setup ${interface} fi ;; ==== //depot/projects/ia64/etc/rc.d/apm#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/apm,v 1.2 2003/05/02 08:35:17 mtm Exp $ +# $FreeBSD: src/etc/rc.d/apm,v 1.3 2003/05/05 23:55:43 obrien Exp $ # # PROVIDE: apm @@ -19,7 +19,7 @@ apm_precmd() { case `${SYSCTL_N} hw.machine_arch` in - i386|amd64) + i386) return 0 ;; esac ==== //depot/projects/ia64/etc/rc.d/apmd#7 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: apmd,v 1.5 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/apmd,v 1.6 2003/05/02 08:35:17 mtm Exp $ +# $FreeBSD: src/etc/rc.d/apmd,v 1.7 2003/05/06 00:09:51 obrien Exp $ # # PROVIDE: apmd @@ -24,7 +24,7 @@ apmd_prestart() { case `${SYSCTL_N} hw.machine_arch` in - i386|amd64) + i386) # Start apm if it is not already running /etc/rc.d/apm forcestatus > /dev/null || /etc/rc.d/apm forcestart ;; ==== //depot/projects/ia64/etc/rc.d/archdep#5 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/archdep,v 1.4 2003/05/02 08:35:17 mtm Exp $ +# $FreeBSD: src/etc/rc.d/archdep,v 1.5 2003/05/06 00:09:51 obrien Exp $ # # PROVIDE: archdep @@ -56,7 +56,7 @@ _arch=`${SYSCTL_N} hw.machine` echo -n "Initial $_arch initialization:" case $_arch in -i386|amd64) +i386) ibcs2_compat ;; alpha) ==== //depot/projects/ia64/etc/rc.d/devfs#5 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/devfs,v 1.4 2003/05/05 15:38:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/devfs,v 1.5 2003/05/06 01:10:33 dougb Exp $ # # PROVIDE: devfs @@ -11,18 +11,31 @@ . /etc/rc.subr name="devfs" +start_cmd='read_devfs_conf' +stop_cmd=':' +read_devfs_conf() +{ + if [ -r /etc/devfs.conf ]; then + cd /dev + while read action device parameter; do + case "${action}" in + l*) if [ -c ${device} -a ! -e ${parameter} ]; then + ln -fs ${device} ${parameter} + fi + ;; + o*) if [ -c ${device} ]; then + chown ${parameter} ${device} + fi + ;; + p*) if [ -c ${device} ]; then + chmod ${parameter} ${device} + fi + ;; + esac + done < /etc/devfs.conf + fi +} + load_rc_config $name - -# Setup DEVFS, ie permissions, links etc. -# -if [ -c /dev/ttyv0 -a ! -e /dev/vga ];then - ln -fs /dev/ttyv0 /dev/vga -fi - -# XXX - in case the user has a customized /etc/rc.devfs we need to keep -# pulling it in until we have a better way of doing this in rc.d. -# -if [ -r /etc/rc.devfs ]; then - sh /etc/rc.devfs -fi +run_rc_command "$1" ==== //depot/projects/ia64/etc/rc.d/kpasswdd#2 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/kpasswdd,v 1.1 2003/04/30 20:58:49 markm Exp $ +# $FreeBSD: src/etc/rc.d/kpasswdd,v 1.2 2003/05/06 02:28:03 mtm Exp $ # # PROVIDE: kpasswdd -# REQUIRE: kadmind5 +# REQUIRE: kadmin # BEFORE: DAEMON # KEYWORD: FreeBSD ==== //depot/projects/ia64/etc/remote#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/remote,v 1.11 2001/02/21 19:45:47 nik Exp $ +# $FreeBSD: src/etc/remote,v 1.12 2003/05/05 21:37:43 dougb Exp $ # # @(#)remote 5.2 (Berkeley) 6/30/90 # @@ -52,7 +52,7 @@ cuaa0c|cua0c:dv=/dev/cuaa0:br#9600:pa=none: # Finger friendly shortcuts -com1:dv=/dev/cuaa0:br#9600:pa=none: -com2:dv=/dev/cuaa1:br#9600:pa=none: -com3:dv=/dev/cuaa2:br#9600:pa=none: -com4:dv=/dev/cuaa3:br#9600:pa=none: +sio0|com1:dv=/dev/cuaa0:br#9600:pa=none: +sio1|com2:dv=/dev/cuaa1:br#9600:pa=none: +sio2|com3:dv=/dev/cuaa2:br#9600:pa=none: +sio3|com4:dv=/dev/cuaa3:br#9600:pa=none: ==== //depot/projects/ia64/etc/services#8 (text+ko) ==== @@ -16,7 +16,7 @@ # Kerberos services are for Kerberos v4, and are unofficial. Sites running # v5 should uncomment v5 entries and comment v4 entries. # -# $FreeBSD: src/etc/services,v 1.92 2003/04/29 09:54:06 mdodd Exp $ +# $FreeBSD: src/etc/services,v 1.93 2003/05/05 22:10:14 dougb Exp $ # From: @(#)services 5.8 (Berkeley) 5/9/91 # # WELL KNOWN PORT NUMBERS @@ -1198,6 +1198,7 @@ accessbuilder 888/tcp accessbuilder 888/udp swat 901/tcp # samba web configuration tool +rndc 953/tcp # named's rndc control socket ftps-data 989/tcp # ftp protocol, data, over TLS/SSL ftps-data 989/udp ftps 990/tcp # ftp protocol, control, over TLS/SSL @@ -1922,6 +1923,8 @@ dec-notes 3333/tcp #DEC Notes dec-notes 3333/udp #DEC Notes rsvp-encap 3455/udp #RSVP encapsulated in UDP +nut 3493/tcp #Network UPS Tools +nut 3493/udp #Network UPS Tools mapper-nodemgr 3984/tcp #MAPPER network node manager mapper-nodemgr 3984/udp #MAPPER network node manager mapper-mapethd 3985/tcp #MAPPER TCP/IP server ==== //depot/projects/ia64/gnu/usr.bin/binutils/libbinutils/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbinutils/Makefile,v 1.18 2002/10/11 06:28:05 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbinutils/Makefile,v 1.19 2003/05/08 06:39:31 peter Exp $ .include "../Makefile.inc0" @@ -9,7 +9,12 @@ ieee.c rdcoff.c rddbg.c rename.c stabs.c unwind-ia64.c \ wrstabs.c version.c binemul.c budemang.c emul_vanilla.c WARNS= 0 -CFLAGS+= -DTARGET=\"${TARGET_ARCH}-unknown-freebsd\" +.if ${TARGET_ARCH} == "amd64" +BINUTILS_ARCH=x86_64 +.else +BINUTILS_ARCH=${TARGET_ARCH} +.endif +CFLAGS+= -DTARGET=\"${BINUTILS_ARCH}-unknown-freebsd\" CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\" CFLAGS+= -I${SRCDIR}/binutils CFLAGS+= -I${SRCDIR}/bfd ==== //depot/projects/ia64/include/paths.h#8 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)paths.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/paths.h,v 1.18 2003/04/07 16:21:25 mdodd Exp $ + * $FreeBSD: src/include/paths.h,v 1.19 2003/05/05 22:49:22 obrien Exp $ */ #ifndef _PATHS_H_ @@ -59,6 +59,8 @@ #define _PATH_DRUM "/dev/drum" #define _PATH_ETC "/etc" #define _PATH_FTPUSERS "/etc/ftpusers" +#define _PATH_HALT "/sbin/halt" +#define _PATH_IFCONFIG "/sbin/ifconfig" #define _PATH_KMEM "/dev/kmem" #define _PATH_LIBMAP_CONF "/etc/libmap.conf" #define _PATH_LOGIN "/usr/bin/login" @@ -67,7 +69,9 @@ #define _PATH_MEM "/dev/mem" #define _PATH_NOLOGIN "/var/run/nologin" #define _PATH_RCP "/bin/rcp" +#define _PATH_REBOOT "/sbin/reboot" #define _PATH_RLOGIN "/usr/bin/rlogin" +#define _PATH_RM "/bin/rm" #define _PATH_RSH "/usr/bin/rsh" #define _PATH_SENDMAIL "/usr/sbin/sendmail" #define _PATH_SHELLS "/etc/shells" ==== //depot/projects/ia64/lib/libc/amd64/_fpmath.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/amd64/_fpmath.h,v 1.2 2003/04/05 22:10:13 das Exp $ + * $FreeBSD: src/lib/libc/amd64/_fpmath.h,v 1.3 2003/05/08 00:02:03 peter Exp $ */ union IEEEl2bits { @@ -33,7 +33,8 @@ unsigned int manh :32; unsigned int exp :15; unsigned int sign :1; - unsigned int junk :16; + unsigned int junkl :16; + unsigned int junkh :32; } bits; }; ==== //depot/projects/ia64/lib/libc/amd64/arith.h#2 (text+ko) ==== @@ -1,8 +1,12 @@ /* * MD header for contrib/gdtoa * - * $FreeBSD: src/lib/libc/amd64/arith.h,v 1.1 2003/03/12 20:29:59 das Exp $ + * $FreeBSD: src/lib/libc/amd64/arith.h,v 1.2 2003/05/07 23:48:05 peter Exp $ */ #define IEEE_8087 #define Arith_Kind_ASL 1 +#define Long int +#define Intcast (int)(long) +#define Double_Align +#define X64_bit_pointers ==== //depot/projects/ia64/lib/libc/amd64/gen/Makefile.inc#2 (text+ko) ==== @@ -1,6 +1,6 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.19 2003/04/30 18:08:01 peter Exp $ +# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.20 2003/05/07 23:49:24 peter Exp $ -SRCS+= _setjmp.S setjmp.S sigsetjmp.S alloca.S \ +SRCS+= _setjmp.S setjmp.S sigsetjmp.S \ fabs.S modf.S \ frexp.c infinity.c isinf.c ==== //depot/projects/ia64/lib/libc/amd64/gen/alloca.S#2 (text+ko) ==== @@ -38,14 +38,14 @@ .asciz "@(#)alloca.s 5.2 (Berkeley) 5/14/90" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/alloca.S,v 1.1 2003/05/01 16:04:38 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/alloca.S,v 1.2 2003/05/08 00:02:47 peter Exp $"); /* like alloc, but automatic automatic free in return */ ENTRY(alloca) popq %rdx /* pop return addr */ - movl %rsp,%rcx + movq %rsp,%rcx addq $15,%rdi /* round amount to allocate up to 16 bytes */ andq $~15,%rdi subq %rdi,%rsp ==== //depot/projects/ia64/lib/libc/amd64/gen/modf.S#2 (text+ko) ==== @@ -40,7 +40,7 @@ #if defined(LIBC_SCCS) RCSID("$NetBSD: modf.S,v 1.5 1997/07/16 14:37:18 christos Exp $") #endif -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/modf.S,v 1.1 2003/04/30 16:21:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/modf.S,v 1.2 2003/05/08 03:19:37 peter Exp $"); /* * modf(value, iptr): return fractional part of value, and stores the @@ -52,44 +52,41 @@ /* With CHOP mode on, frndint behaves as TRUNC does. Useful. */ ENTRY(modf) - pushq %rbp - movq %rsp,%rbp - subq $24,%rsp /* * Set chop mode. */ - fnstcw -12(%rbp) - movw -12(%rbp),%dx + fnstcw -12(%rsp) + movw -12(%rsp),%dx orw $3072,%dx - movw %dx,-16(%rbp) - fldcw -16(%rbp) + movw %dx,-16(%rsp) + fldcw -16(%rsp) /* * Get integral part. */ - movsd %xmm0,-24(%rbp) - fldl -24(%rbp) + movsd %xmm0,-24(%rsp) + fldl -24(%rsp) frndint - fstpl -8(%rbp) + fstpl -8(%rsp) /* * Restore control word. */ - fldcw -12(%rbp) + fldcw -12(%rsp) /* * Store integral part. */ - movsd -8(%rbp),%xmm0 + movsd -8(%rsp),%xmm0 movsd %xmm0,(%rdi) /* * Get fractional part and return it. */ - fldl -24(%rbp) - fsubl -8(%rbp) - movsd -8(%rbp),%xmm0 + fldl -24(%rsp) + fsubl -8(%rsp) + fstpl -8(%rsp) + movsd -8(%rsp),%xmm0 - leave ret ==== //depot/projects/ia64/lib/libc/amd64/gen/setjmp.S#2 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)setjmp.s 5.1 (Berkeley) 4/23/90" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.23 2003/04/30 18:09:33 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.24 2003/05/08 06:25:03 peter Exp $"); /* * C library -- _setjmp, _longjmp @@ -55,9 +55,9 @@ ENTRY(setjmp) pushq %rdi movq %rdi,%rcx - leaq 72(%rcx),%rdi /* (sigset_t*)oset */ + movq $1,%rdi /* SIG_BLOCK */ movq $0,%rsi /* (sigset_t*)set */ - movq $1,%rdx /* SIG_BLOCK */ + leaq 72(%rcx),%rdx /* (sigset_t*)oset */ call PIC_PLT(CNAME(_sigprocmask)) popq %rdi movq %rdi,%rcx @@ -80,9 +80,9 @@ pushq %rdi pushq %rsi movq %rdi,%rdx - movq $0,%rdi /* (sigset_t*)oset */ + movq $1,%rdi /* SIG_SETMASK */ leaq 72(%rdx),%rsi /* (sigset_t*)set */ - movq $3,%rdx /* SIG_SETMASK */ + movq $0,%rdx /* (sigset_t*)oset */ call PIC_PLT(CNAME(_sigprocmask)) popq %rsi popq %rdi /* jmpbuf */ ==== //depot/projects/ia64/lib/libc/amd64/gen/sigsetjmp.S#2 (text+ko) ==== @@ -41,7 +41,7 @@ .asciz "$Id: sigsetjmp.S,v 1.1 1993/12/05 13:01:05 ats Exp $" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/sigsetjmp.S,v 1.25 2003/04/30 18:09:33 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/sigsetjmp.S,v 1.26 2003/05/08 06:25:03 peter Exp $"); #include "SYS.h" @@ -58,18 +58,17 @@ */ ENTRY(sigsetjmp) - pushq %rdi - movq %rdi,%rcx - movl %esi,88(%rcx) + movl %esi,88(%rdi) testl %esi,%esi jz 2f - leaq 72(%rcx),%rdi /* (sigset_t*)oset */ + pushq %rdi + movq $1,%rdi /* SIG_BLOCK */ movq $0,%rsi /* (sigset_t*)set */ - movq $1,%rdx /* SIG_BLOCK */ + leaq 72(%rcx),%rdx /* (sigset_t*)oset */ call PIC_PLT(CNAME(_sigprocmask)) popq %rdi - movq %rdi,%rcx -2: movq 0(%rsp),%rdx /* retval */ +2: movq %rdi,%rcx + movq 0(%rsp),%rdx /* retval */ movq %rdx, 0(%rcx) /* retval */ movq %rbx, 8(%rcx) movq %rsp,16(%rcx) @@ -90,9 +89,9 @@ movq %rdi,%rdx pushq %rdi pushq %rsi - movq $0,%rdi /* (sigset_t*)oset */ + movq $3,%rdi /* SIG_SETMASK */ leaq 72(%rdx),%rsi /* (sigset_t*)set */ - movq $3,%rdx /* SIG_SETMASK */ + movq $0,%rdx /* (sigset_t*)oset */ call PIC_PLT(CNAME(_sigprocmask)) popq %rsi popq %rdi /* jmpbuf */ ==== //depot/projects/ia64/lib/libc/i386/gen/rfork_thread.S#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/rfork_thread.S,v 1.4 2002/03/23 02:44:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/rfork_thread.S,v 1.5 2003/05/07 17:23:25 jhb Exp $"); /* * With thanks to John Dyson for the original version of this. @@ -109,5 +109,9 @@ * Branch here if the thread creation fails: */ 2: + addl $8, %esp + popl %esi + movl %ebp, %esp + popl %ebp PIC_PROLOGUE jmp PIC_PLT(HIDENAME(cerror)) ==== //depot/projects/ia64/lib/libpam/libpam/Makefile#19 (text+ko) ==== @@ -33,7 +33,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/libpam/Makefile,v 1.43 2003/05/01 14:55:06 des Exp $ +# $FreeBSD: src/lib/libpam/libpam/Makefile,v 1.44 2003/05/05 21:15:35 des Exp $ OPENPAM= ${.CURDIR}/../../../contrib/openpam .PATH: ${OPENPAM}/include ${OPENPAM}/lib ${OPENPAM}/doc/man @@ -127,7 +127,7 @@ pam_vprompt.3 CSTD?= c99 -WARNS?= 5 +WARNS?= 6 CFLAGS+= -I${.CURDIR} -I${OPENPAM}/include CFLAGS+= -DLIB_MAJ=${SHLIB_MAJOR} ==== //depot/projects/ia64/lib/libpthread/thread/thr_cancel.c#5 (text+ko) ==== @@ -1,6 +1,6 @@ /* * David Leonard , 1999. Public domain. - * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.19 2003/04/28 23:56:11 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.20 2003/05/06 00:02:54 deischen Exp $ */ #include #include @@ -64,16 +64,7 @@ break; case PS_JOIN: - /* - * Disconnect the thread from the joinee: - */ - if (pthread->join_status.thread != NULL) { - pthread->join_status.thread->joiner - = NULL; - pthread->join_status.thread = NULL; - } pthread->cancelflags |= THR_CANCELLING; - _thr_setrunnable_unlocked(pthread); break; case PS_SUSPENDED: ==== //depot/projects/ia64/lib/libthr/arch/i386/i386/_setcurthread.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (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: src/lib/libthr/arch/i386/i386/_setcurthread.c,v 1.3 2003/04/03 03:34:49 jake Exp $ + * $FreeBSD: src/lib/libthr/arch/i386/i386/_setcurthread.c,v 1.4 2003/05/06 02:33:49 mtm Exp $ */ #include @@ -62,7 +62,10 @@ void _retire_thread(void *entry) { - *(void **)entry = *ldt_free; + if (ldt_free == NULL) + *(void **)entry = NULL; + else + *(void **)entry = *ldt_free; ldt_free = entry; } ==== //depot/projects/ia64/lib/libthr/thread/thr_mutex.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.3 2003/04/02 03:05:39 jeff Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.4 2003/05/06 02:30:52 mtm Exp $ */ #include #include @@ -471,7 +471,7 @@ int ret = 0; PTHREAD_ASSERT((mutex != NULL) && (*mutex != NULL), - "Uninitialized mutex in pthread_mutex_trylock_basic"); + "Uninitialized mutex in mutex_lock_common"); /* * Enter a loop waiting to become the mutex owner. We need a ==== //depot/projects/ia64/lib/libthr/thread/thr_sig.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * (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: src/lib/libthr/thread/thr_sig.c,v 1.2 2003/04/02 03:05:39 jeff Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_sig.c,v 1.3 2003/05/06 02:30:52 mtm Exp $ */ #include @@ -124,28 +124,25 @@ curthread->state = psd.psd_state; curthread->flags = psd.psd_flags; - /* Check the threads previous state: */ - if (psd.psd_state != PS_RUNNING) { - /* - * Do a little cleanup handling for those threads in - * queues before calling the signal handler. Signals - * for these threads are temporarily blocked until - * after cleanup handling. - */ - switch (psd.psd_state) { - case PS_COND_WAIT: - _cond_wait_backout(curthread); - psd.psd_state = PS_RUNNING; - break; + /* + * Do a little cleanup handling for those threads in + * queues before calling the signal handler. Signals + * for these threads are temporarily blocked until + * after cleanup handling. + */ + switch (psd.psd_state) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 8 00:47:27 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF59937B414; Thu, 8 May 2003 00:47:26 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 839F337B40C for ; Thu, 8 May 2003 00:47:25 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id ABE1A43FAF for ; Thu, 8 May 2003 00:47:23 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h487lN0U018416 for ; Thu, 8 May 2003 00:47:23 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h487lM03018398 for perforce@freebsd.org; Thu, 8 May 2003 00:47:22 -0700 (PDT) Date: Thu, 8 May 2003 00:47:22 -0700 (PDT) Message-Id: <200305080747.h487lM03018398@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30767 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 07:47:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=30767 Change 30767 by marcel@marcel_pluto1 on 2003/05/08 00:46:33 IFia64 Affected files ... .. //depot/projects/ia64_epc/UPDATING#9 integrate .. //depot/projects/ia64_epc/bin/df/df.1#2 integrate .. //depot/projects/ia64_epc/bin/ls/ls.1#2 integrate .. //depot/projects/ia64_epc/bin/mv/mv.c#3 integrate .. //depot/projects/ia64_epc/bin/mv/pathnames.h#2 delete .. //depot/projects/ia64_epc/bin/sh/var.c#2 integrate .. //depot/projects/ia64_epc/contrib/isc-dhcp/client/clparse.c#2 integrate .. //depot/projects/ia64_epc/contrib/tar/src/buffer.c#2 integrate .. //depot/projects/ia64_epc/etc/Makefile#8 integrate .. //depot/projects/ia64_epc/etc/devd.conf#4 integrate .. //depot/projects/ia64_epc/etc/devfs.conf#1 branch .. //depot/projects/ia64_epc/etc/newsyslog.conf#4 integrate .. //depot/projects/ia64_epc/etc/pccard_ether#2 integrate .. //depot/projects/ia64_epc/etc/rc.d/apm#3 integrate .. //depot/projects/ia64_epc/etc/rc.d/apmd#3 integrate .. //depot/projects/ia64_epc/etc/rc.d/archdep#4 integrate .. //depot/projects/ia64_epc/etc/rc.d/devfs#4 integrate .. //depot/projects/ia64_epc/etc/rc.d/kpasswdd#2 integrate .. //depot/projects/ia64_epc/etc/remote#2 integrate .. //depot/projects/ia64_epc/etc/services#3 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/binutils/libbinutils/Makefile#2 integrate .. //depot/projects/ia64_epc/gnu/usr.bin/binutils/libopcodes/Makefile.amd64#1 branch .. //depot/projects/ia64_epc/include/paths.h#3 integrate .. //depot/projects/ia64_epc/lib/libc/amd64/_fpmath.h#2 integrate .. //depot/projects/ia64_epc/lib/libc/amd64/arith.h#2 integrate .. //depot/projects/ia64_epc/lib/libc/amd64/gen/Makefile.inc#2 integrate .. //depot/projects/ia64_epc/lib/libc/amd64/gen/alloca.S#2 integrate .. //depot/projects/ia64_epc/lib/libc/amd64/gen/modf.S#2 integrate .. //depot/projects/ia64_epc/lib/libc/amd64/gen/setjmp.S#2 integrate .. //depot/projects/ia64_epc/lib/libc/amd64/gen/sigsetjmp.S#2 integrate .. //depot/projects/ia64_epc/lib/libc/i386/gen/rfork_thread.S#2 integrate .. //depot/projects/ia64_epc/lib/libpam/libpam/Makefile#4 integrate .. //depot/projects/ia64_epc/lib/libpthread/thread/thr_cancel.c#5 integrate .. //depot/projects/ia64_epc/lib/libthr/arch/i386/i386/_setcurthread.c#2 integrate .. //depot/projects/ia64_epc/lib/libthr/thread/thr_mutex.c#2 integrate .. //depot/projects/ia64_epc/lib/libthr/thread/thr_sig.c#2 integrate .. //depot/projects/ia64_epc/libexec/Makefile#6 integrate .. //depot/projects/ia64_epc/libexec/rtld-elf/rtld.c#6 integrate .. //depot/projects/ia64_epc/release/Makefile#12 integrate .. //depot/projects/ia64_epc/release/alpha/dokern.sh#3 integrate .. //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/readme/article.sgml#3 integrate .. //depot/projects/ia64_epc/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#20 integrate .. //depot/projects/ia64_epc/release/doc/share/sgml/release.ent#2 integrate .. //depot/projects/ia64_epc/sbin/Makefile#4 integrate .. //depot/projects/ia64_epc/sbin/bsdlabel/Makefile#4 integrate .. //depot/projects/ia64_epc/sbin/dump/main.c#5 integrate .. //depot/projects/ia64_epc/sbin/dump/traverse.c#2 integrate .. //depot/projects/ia64_epc/sbin/dumpon/dumpon.8#2 integrate .. //depot/projects/ia64_epc/sbin/mdmfs/mdmfs.8#3 integrate .. //depot/projects/ia64_epc/sbin/shutdown/pathnames.h#2 delete .. //depot/projects/ia64_epc/sbin/shutdown/shutdown.c#3 integrate .. //depot/projects/ia64_epc/sbin/startslip/startslip.c#2 integrate .. //depot/projects/ia64_epc/sbin/vinum/commands.c#6 integrate .. //depot/projects/ia64_epc/share/examples/etc/make.conf#5 integrate .. //depot/projects/ia64_epc/share/man/man5/disktab.5#2 integrate .. //depot/projects/ia64_epc/share/man/man9/malloc.9#4 integrate .. //depot/projects/ia64_epc/share/mk/bsd.sys.mk#5 integrate .. //depot/projects/ia64_epc/share/sendmail/Makefile#2 integrate .. //depot/projects/ia64_epc/sys/Makefile#2 integrate .. //depot/projects/ia64_epc/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/ia64_epc/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/ia64_epc/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/ia64_epc/sys/conf/NOTES#11 integrate .. //depot/projects/ia64_epc/sys/conf/newvers.sh#2 integrate .. //depot/projects/ia64_epc/sys/dev/ata/ata-chipset.c#10 integrate .. //depot/projects/ia64_epc/sys/dev/ata/ata-pci.h#7 integrate .. //depot/projects/ia64_epc/sys/dev/bge/if_bge.c#10 integrate .. //depot/projects/ia64_epc/sys/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/ia64_epc/sys/dev/em/if_em.c#7 integrate .. //depot/projects/ia64_epc/sys/dev/usb/uhci_pci.c#4 integrate .. //depot/projects/ia64_epc/sys/dev/vinum/vinumioctl.c#5 integrate .. //depot/projects/ia64_epc/sys/geom/geom_bsd.c#10 integrate .. //depot/projects/ia64_epc/sys/geom/geom_io.c#8 integrate .. //depot/projects/ia64_epc/sys/i386/isa/intr_machdep.c#3 integrate .. //depot/projects/ia64_epc/sys/kern/kern_mac.c#9 integrate .. //depot/projects/ia64_epc/sys/kern/kern_sig.c#13 integrate .. //depot/projects/ia64_epc/sys/kern/kern_subr.c#6 integrate .. //depot/projects/ia64_epc/sys/kern/kern_synch.c#12 integrate .. //depot/projects/ia64_epc/sys/kern/uipc_syscalls.c#6 integrate .. //depot/projects/ia64_epc/sys/kern/vfs_default.c#10 integrate .. //depot/projects/ia64_epc/sys/netinet/ip_input.c#7 integrate .. //depot/projects/ia64_epc/sys/netinet/tcp_input.c#8 integrate .. //depot/projects/ia64_epc/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/ia64_epc/sys/netinet/tcp_var.h#5 integrate .. //depot/projects/ia64_epc/sys/pci/if_sis.c#7 integrate .. //depot/projects/ia64_epc/sys/sys/dkstat.h#3 integrate .. //depot/projects/ia64_epc/sys/sys/signalvar.h#4 integrate .. //depot/projects/ia64_epc/sys/sys/syscallsubr.h#4 integrate .. //depot/projects/ia64_epc/sys/vm/swap_pager.c#7 integrate .. //depot/projects/ia64_epc/sys/vm/vm_object.c#16 integrate .. //depot/projects/ia64_epc/sys/vm/vm_pager.c#4 integrate .. //depot/projects/ia64_epc/sys/vm/vnode_pager.c#6 integrate .. //depot/projects/ia64_epc/tools/tools/tinderbox/tbmaster.pl#6 integrate .. //depot/projects/ia64_epc/usr.bin/Makefile#8 integrate .. //depot/projects/ia64_epc/usr.bin/calendar/calendars/calendar.freebsd#4 integrate .. //depot/projects/ia64_epc/usr.bin/vi/pathnames.h#2 integrate .. //depot/projects/ia64_epc/usr.bin/xlint/lint1/param.h#2 integrate .. //depot/projects/ia64_epc/usr.sbin/newsyslog/newsyslog.c#7 integrate .. //depot/projects/ia64_epc/usr.sbin/pw/pw.8#2 integrate Differences ... ==== //depot/projects/ia64_epc/UPDATING#9 (text+ko) ==== @@ -17,6 +17,11 @@ developers choose to disable these features on build machines to maximize performance. +20030505: + Kerberos 5 (Heimdal) is now built by default. Setting + MAKE_KERBEROS5 no longer has any effect. If you do NOT + want the "base" Kerberos 5, you need to set NO_KERBEROS. + 20030502: groff has been updated. If you try to do a buildworld and get an infinite loop in troff, update to May 4th or newer. If you @@ -1273,4 +1278,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.250 2003/05/04 06:26:30 imp Exp $ +$FreeBSD: src/UPDATING,v 1.251 2003/05/05 20:05:37 markm Exp $ ==== //depot/projects/ia64_epc/bin/df/df.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)df.1 8.3 (Berkeley) 5/8/95 -.\" $FreeBSD: src/bin/df/df.1,v 1.28 2002/08/26 04:56:23 trhodes Exp $ +.\" $FreeBSD: src/bin/df/df.1,v 1.29 2003/05/06 21:54:46 trhodes Exp $ .\" .Dd May 8, 1995 .Dt DF 1 @@ -81,11 +81,11 @@ .It Fl H "Human-readable" output. Use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte and Petabyte in order to reduce the number of -digits to three or less using base 10 for sizes. +digits to four or fewer using base 10 for sizes. .It Fl h "Human-readable" output. Use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte and Petabyte in order to reduce the number of -digits to three or less using base 2 for sizes. +digits to four or fewer using base 2 for sizes. .It Fl i Include statistics on the number of free inodes. .It Fl k ==== //depot/projects/ia64_epc/bin/ls/ls.1#2 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.73 2003/01/20 21:25:00 chris Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.74 2003/05/06 21:54:46 trhodes Exp $ .\" .Dd May 19, 2002 .Dt LS 1 @@ -175,7 +175,7 @@ When used with the .Fl l option, use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte -and Petabyte in order to reduce the number of digits to three or less +and Petabyte in order to reduce the number of digits to four or fewer using base 2 for sizes. .It Fl i For each file, print the file's file serial number (inode number). ==== //depot/projects/ia64_epc/bin/mv/mv.c#3 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.40 2003/05/01 16:58:56 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.41 2003/05/05 22:49:22 obrien Exp $"); #include #include @@ -67,8 +67,6 @@ #include #include -#include "pathnames.h" - int fflg, iflg, nflg, vflg; int copy(char *, char *); ==== //depot/projects/ia64_epc/bin/sh/var.c#2 (text+ko) ==== @@ -40,10 +40,11 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.23 2002/10/01 00:54:14 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.24 2003/05/05 22:49:22 obrien Exp $"); #include #include +#include /* * Shell variables. @@ -105,7 +106,7 @@ NULL }, { &vmpath, VSTRFIXED|VTEXTFIXED|VUNSET, "MAILPATH=", NULL }, - { &vpath, VSTRFIXED|VTEXTFIXED, "PATH=/bin:/usr/bin", + { &vpath, VSTRFIXED|VTEXTFIXED, "PATH=" _PATH_DEFPATH, changepath }, { &vppid, VSTRFIXED|VTEXTFIXED|VUNSET, "PPID=", NULL }, ==== //depot/projects/ia64_epc/contrib/isc-dhcp/client/clparse.c#2 (text+ko) ==== @@ -44,7 +44,7 @@ #ifndef lint static char copyright[] = "$Id: clparse.c,v 1.62.2.3 2002/11/17 02:25:43 dhankins Exp $ Copyright (c) 1996-2002 The Internet Software Consortium. All rights reserved.\n" -"$FreeBSD: src/contrib/isc-dhcp/client/clparse.c,v 1.9 2003/01/16 07:22:32 obrien Exp $\n"; +"$FreeBSD: src/contrib/isc-dhcp/client/clparse.c,v 1.10 2003/05/05 22:49:22 obrien Exp $\n"; #endif /* not lint */ #include "dhcpd.h" @@ -53,7 +53,7 @@ struct client_config top_level_config; -char client_script_name [] = "/sbin/dhclient-script"; +char client_script_name [] = _PATH_DHCLIENT_SCRIPT; u_int32_t default_requested_options [] = { DHO_SUBNET_MASK, ==== //depot/projects/ia64_epc/contrib/tar/src/buffer.c#2 (text+ko) ==== @@ -19,12 +19,18 @@ with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/tar/src/buffer.c,v 1.5 2002/10/09 07:33:29 sobomax Exp $ */ +/* $FreeBSD: src/contrib/tar/src/buffer.c,v 1.6 2003/05/05 22:49:22 obrien Exp $ */ #include "system.h" #include +#if __FreeBSD__ +# include +#else +# define _PATH_BSHELL "/bin/sh" +#endif + #if MSDOS # include #endif @@ -1549,7 +1555,7 @@ pid_t child; const char *shell = getenv ("SHELL"); if (! shell) - shell = "/bin/sh"; + shell = _PATH_BSHELL; child = xfork (); if (child == 0) { ==== //depot/projects/ia64_epc/etc/Makefile#8 (text+ko) ==== @@ -1,13 +1,13 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.312 2003/05/02 22:27:31 dougb Exp $ +# $FreeBSD: src/etc/Makefile,v 1.313 2003/05/06 07:25:17 dougb Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail .endif BIN1= amd.map apmd.conf auth.conf \ - crontab csh.cshrc csh.login csh.logout \ - devd.conf dhclient.conf disktab fbtab ftpusers gettytab group \ + crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \ + dhclient.conf disktab fbtab ftpusers gettytab group \ hosts hosts.allow hosts.equiv hosts.lpd \ inetd.conf login.access login.conf \ mac.conf motd netconfig network.subr networks newsyslog.conf \ ==== //depot/projects/ia64_epc/etc/devd.conf#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.3 2003/05/03 10:16:55 akiyama Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.4 2003/05/07 15:48:20 imp Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -64,9 +64,10 @@ }; # Don't even try to second guess what to do about drivers that don't -# match here. Instead, pass it off to a smart script to deal. +# match here. Instead, pass it off to syslog. Commented out for the +# moment, as pnpinfo isn't set in devd yet nomatch 0 { - action "logger Unknown device: $pnpinfo $location $bus"; + // action "logger Unknown device: $pnpinfo $location $bus"; }; /* EXAMPLES TO END OF FILE ==== //depot/projects/ia64_epc/etc/newsyslog.conf#4 (text+ko) ==== @@ -1,5 +1,14 @@ # configuration file for newsyslog -# $FreeBSD: src/etc/newsyslog.conf,v 1.44 2003/04/08 16:14:02 des Exp $ +# $FreeBSD: src/etc/newsyslog.conf,v 1.46 2003/05/05 19:08:33 gad Exp $ +# +# Entries which do not specify the '/pid_file' field will cause the +# syslogd process to be signalled when that log file is rotated. This +# action is only appropriate for log files which are written to by the +# syslogd process (ie, files listed in /etc/syslogd.conf). If there +# is no process which needs to be signalled when a given log file is +# rotated, then the entry for that file should include the 'N' flag. +# +# The 'flags' field is one or more of the letters: BCGJNUWZ or a '-'. # # Note: some sites will want to select more restrictive protections than the # defaults. In particular, it may be desirable to switch many of the 644 @@ -7,23 +16,23 @@ # contents of maillog, messages, and lpd-errs to be confidential. In the # future, these defaults may change to more conservative ones. # -# logfilename [owner:group] mode count size when [ZJB] [/pid_file] [sig_num] +# logfilename [owner:group] mode count size when flags [/pid_file] [sig_num] /var/log/all.log 600 7 * @T00 J /var/log/amd.log 644 7 100 * J /var/log/auth.log 600 7 100 * J /var/log/console.log 600 5 100 * J /var/log/cron 600 3 100 * J -/var/log/daily.log 640 7 * @T00 J +/var/log/daily.log 640 7 * @T00 JN /var/log/debug.log 600 7 100 * J /var/log/kerberos.log 600 7 100 * J /var/log/lpd-errs 644 7 100 * J /var/log/maillog 640 7 * @T00 J /var/log/messages 644 5 100 * J -/var/log/monthly.log 640 12 * $M1D0 J +/var/log/monthly.log 640 12 * $M1D0 JN /var/log/ppp.log root:network 640 3 100 * J /var/log/security 600 10 100 * J /var/log/sendmail.st 640 10 * 168 B /var/log/slip.log root:network 640 3 100 * J -/var/log/weekly.log 640 5 1 $W6D0 J +/var/log/weekly.log 640 5 1 $W6D0 JN /var/log/wtmp 644 3 * @01T05 B /var/log/xferlog 600 7 100 * J ==== //depot/projects/ia64_epc/etc/pccard_ether#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/etc/pccard_ether,v 1.28 2002/12/12 09:31:09 imp Exp $ +# $FreeBSD: src/etc/pccard_ether,v 1.29 2003/05/05 19:06:46 ume Exp $ # # pccard_ether interfacename [start|stop] [ifconfig option] # @@ -134,8 +134,8 @@ # IPv6 setup case ${ipv6_enable} in [Yy][Ee][Ss]) - if [ -r /etc/rc.network6 ]; then - . /etc/rc.network6 + if [ -r /etc/rc.d/network_ipv6 ]; then + . /etc/rc.d/network_ipv6 network6_interface_setup ${interface} fi ;; ==== //depot/projects/ia64_epc/etc/rc.d/apm#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/apm,v 1.2 2003/05/02 08:35:17 mtm Exp $ +# $FreeBSD: src/etc/rc.d/apm,v 1.3 2003/05/05 23:55:43 obrien Exp $ # # PROVIDE: apm @@ -19,7 +19,7 @@ apm_precmd() { case `${SYSCTL_N} hw.machine_arch` in - i386|amd64) + i386) return 0 ;; esac ==== //depot/projects/ia64_epc/etc/rc.d/apmd#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: apmd,v 1.5 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/apmd,v 1.6 2003/05/02 08:35:17 mtm Exp $ +# $FreeBSD: src/etc/rc.d/apmd,v 1.7 2003/05/06 00:09:51 obrien Exp $ # # PROVIDE: apmd @@ -24,7 +24,7 @@ apmd_prestart() { case `${SYSCTL_N} hw.machine_arch` in - i386|amd64) + i386) # Start apm if it is not already running /etc/rc.d/apm forcestatus > /dev/null || /etc/rc.d/apm forcestart ;; ==== //depot/projects/ia64_epc/etc/rc.d/archdep#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/archdep,v 1.4 2003/05/02 08:35:17 mtm Exp $ +# $FreeBSD: src/etc/rc.d/archdep,v 1.5 2003/05/06 00:09:51 obrien Exp $ # # PROVIDE: archdep @@ -56,7 +56,7 @@ _arch=`${SYSCTL_N} hw.machine` echo -n "Initial $_arch initialization:" case $_arch in -i386|amd64) +i386) ibcs2_compat ;; alpha) ==== //depot/projects/ia64_epc/etc/rc.d/devfs#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/devfs,v 1.4 2003/05/05 15:38:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/devfs,v 1.5 2003/05/06 01:10:33 dougb Exp $ # # PROVIDE: devfs @@ -11,18 +11,31 @@ . /etc/rc.subr name="devfs" +start_cmd='read_devfs_conf' +stop_cmd=':' +read_devfs_conf() +{ + if [ -r /etc/devfs.conf ]; then + cd /dev + while read action device parameter; do + case "${action}" in + l*) if [ -c ${device} -a ! -e ${parameter} ]; then + ln -fs ${device} ${parameter} + fi + ;; + o*) if [ -c ${device} ]; then + chown ${parameter} ${device} + fi + ;; + p*) if [ -c ${device} ]; then + chmod ${parameter} ${device} + fi + ;; + esac + done < /etc/devfs.conf + fi +} + load_rc_config $name - -# Setup DEVFS, ie permissions, links etc. -# -if [ -c /dev/ttyv0 -a ! -e /dev/vga ];then - ln -fs /dev/ttyv0 /dev/vga -fi - -# XXX - in case the user has a customized /etc/rc.devfs we need to keep -# pulling it in until we have a better way of doing this in rc.d. -# -if [ -r /etc/rc.devfs ]; then - sh /etc/rc.devfs -fi +run_rc_command "$1" ==== //depot/projects/ia64_epc/etc/rc.d/kpasswdd#2 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/kpasswdd,v 1.1 2003/04/30 20:58:49 markm Exp $ +# $FreeBSD: src/etc/rc.d/kpasswdd,v 1.2 2003/05/06 02:28:03 mtm Exp $ # # PROVIDE: kpasswdd -# REQUIRE: kadmind5 +# REQUIRE: kadmin # BEFORE: DAEMON # KEYWORD: FreeBSD ==== //depot/projects/ia64_epc/etc/remote#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/remote,v 1.11 2001/02/21 19:45:47 nik Exp $ +# $FreeBSD: src/etc/remote,v 1.12 2003/05/05 21:37:43 dougb Exp $ # # @(#)remote 5.2 (Berkeley) 6/30/90 # @@ -52,7 +52,7 @@ cuaa0c|cua0c:dv=/dev/cuaa0:br#9600:pa=none: # Finger friendly shortcuts -com1:dv=/dev/cuaa0:br#9600:pa=none: -com2:dv=/dev/cuaa1:br#9600:pa=none: -com3:dv=/dev/cuaa2:br#9600:pa=none: -com4:dv=/dev/cuaa3:br#9600:pa=none: +sio0|com1:dv=/dev/cuaa0:br#9600:pa=none: +sio1|com2:dv=/dev/cuaa1:br#9600:pa=none: +sio2|com3:dv=/dev/cuaa2:br#9600:pa=none: +sio3|com4:dv=/dev/cuaa3:br#9600:pa=none: ==== //depot/projects/ia64_epc/etc/services#3 (text+ko) ==== @@ -16,7 +16,7 @@ # Kerberos services are for Kerberos v4, and are unofficial. Sites running # v5 should uncomment v5 entries and comment v4 entries. # -# $FreeBSD: src/etc/services,v 1.92 2003/04/29 09:54:06 mdodd Exp $ +# $FreeBSD: src/etc/services,v 1.93 2003/05/05 22:10:14 dougb Exp $ # From: @(#)services 5.8 (Berkeley) 5/9/91 # # WELL KNOWN PORT NUMBERS @@ -1198,6 +1198,7 @@ accessbuilder 888/tcp accessbuilder 888/udp swat 901/tcp # samba web configuration tool +rndc 953/tcp # named's rndc control socket ftps-data 989/tcp # ftp protocol, data, over TLS/SSL ftps-data 989/udp ftps 990/tcp # ftp protocol, control, over TLS/SSL @@ -1922,6 +1923,8 @@ dec-notes 3333/tcp #DEC Notes dec-notes 3333/udp #DEC Notes rsvp-encap 3455/udp #RSVP encapsulated in UDP +nut 3493/tcp #Network UPS Tools +nut 3493/udp #Network UPS Tools mapper-nodemgr 3984/tcp #MAPPER network node manager mapper-nodemgr 3984/udp #MAPPER network node manager mapper-mapethd 3985/tcp #MAPPER TCP/IP server ==== //depot/projects/ia64_epc/gnu/usr.bin/binutils/libbinutils/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbinutils/Makefile,v 1.18 2002/10/11 06:28:05 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbinutils/Makefile,v 1.19 2003/05/08 06:39:31 peter Exp $ .include "../Makefile.inc0" @@ -9,7 +9,12 @@ ieee.c rdcoff.c rddbg.c rename.c stabs.c unwind-ia64.c \ wrstabs.c version.c binemul.c budemang.c emul_vanilla.c WARNS= 0 -CFLAGS+= -DTARGET=\"${TARGET_ARCH}-unknown-freebsd\" +.if ${TARGET_ARCH} == "amd64" +BINUTILS_ARCH=x86_64 +.else +BINUTILS_ARCH=${TARGET_ARCH} +.endif +CFLAGS+= -DTARGET=\"${BINUTILS_ARCH}-unknown-freebsd\" CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\" CFLAGS+= -I${SRCDIR}/binutils CFLAGS+= -I${SRCDIR}/bfd ==== //depot/projects/ia64_epc/include/paths.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)paths.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/paths.h,v 1.18 2003/04/07 16:21:25 mdodd Exp $ + * $FreeBSD: src/include/paths.h,v 1.19 2003/05/05 22:49:22 obrien Exp $ */ #ifndef _PATHS_H_ @@ -59,6 +59,8 @@ #define _PATH_DRUM "/dev/drum" #define _PATH_ETC "/etc" #define _PATH_FTPUSERS "/etc/ftpusers" +#define _PATH_HALT "/sbin/halt" +#define _PATH_IFCONFIG "/sbin/ifconfig" #define _PATH_KMEM "/dev/kmem" #define _PATH_LIBMAP_CONF "/etc/libmap.conf" #define _PATH_LOGIN "/usr/bin/login" @@ -67,7 +69,9 @@ #define _PATH_MEM "/dev/mem" #define _PATH_NOLOGIN "/var/run/nologin" #define _PATH_RCP "/bin/rcp" +#define _PATH_REBOOT "/sbin/reboot" #define _PATH_RLOGIN "/usr/bin/rlogin" +#define _PATH_RM "/bin/rm" #define _PATH_RSH "/usr/bin/rsh" #define _PATH_SENDMAIL "/usr/sbin/sendmail" #define _PATH_SHELLS "/etc/shells" ==== //depot/projects/ia64_epc/lib/libc/amd64/_fpmath.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/amd64/_fpmath.h,v 1.2 2003/04/05 22:10:13 das Exp $ + * $FreeBSD: src/lib/libc/amd64/_fpmath.h,v 1.3 2003/05/08 00:02:03 peter Exp $ */ union IEEEl2bits { @@ -33,7 +33,8 @@ unsigned int manh :32; unsigned int exp :15; unsigned int sign :1; - unsigned int junk :16; + unsigned int junkl :16; + unsigned int junkh :32; } bits; }; ==== //depot/projects/ia64_epc/lib/libc/amd64/arith.h#2 (text+ko) ==== @@ -1,8 +1,12 @@ /* * MD header for contrib/gdtoa * - * $FreeBSD: src/lib/libc/amd64/arith.h,v 1.1 2003/03/12 20:29:59 das Exp $ + * $FreeBSD: src/lib/libc/amd64/arith.h,v 1.2 2003/05/07 23:48:05 peter Exp $ */ #define IEEE_8087 #define Arith_Kind_ASL 1 +#define Long int +#define Intcast (int)(long) +#define Double_Align +#define X64_bit_pointers ==== //depot/projects/ia64_epc/lib/libc/amd64/gen/Makefile.inc#2 (text+ko) ==== @@ -1,6 +1,6 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.19 2003/04/30 18:08:01 peter Exp $ +# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.20 2003/05/07 23:49:24 peter Exp $ -SRCS+= _setjmp.S setjmp.S sigsetjmp.S alloca.S \ +SRCS+= _setjmp.S setjmp.S sigsetjmp.S \ fabs.S modf.S \ frexp.c infinity.c isinf.c ==== //depot/projects/ia64_epc/lib/libc/amd64/gen/alloca.S#2 (text+ko) ==== @@ -38,14 +38,14 @@ .asciz "@(#)alloca.s 5.2 (Berkeley) 5/14/90" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/alloca.S,v 1.1 2003/05/01 16:04:38 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/alloca.S,v 1.2 2003/05/08 00:02:47 peter Exp $"); /* like alloc, but automatic automatic free in return */ ENTRY(alloca) popq %rdx /* pop return addr */ - movl %rsp,%rcx + movq %rsp,%rcx addq $15,%rdi /* round amount to allocate up to 16 bytes */ andq $~15,%rdi subq %rdi,%rsp ==== //depot/projects/ia64_epc/lib/libc/amd64/gen/modf.S#2 (text+ko) ==== @@ -40,7 +40,7 @@ #if defined(LIBC_SCCS) RCSID("$NetBSD: modf.S,v 1.5 1997/07/16 14:37:18 christos Exp $") #endif -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/modf.S,v 1.1 2003/04/30 16:21:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/modf.S,v 1.2 2003/05/08 03:19:37 peter Exp $"); /* * modf(value, iptr): return fractional part of value, and stores the @@ -52,44 +52,41 @@ /* With CHOP mode on, frndint behaves as TRUNC does. Useful. */ ENTRY(modf) - pushq %rbp - movq %rsp,%rbp - subq $24,%rsp /* * Set chop mode. */ - fnstcw -12(%rbp) - movw -12(%rbp),%dx + fnstcw -12(%rsp) + movw -12(%rsp),%dx orw $3072,%dx - movw %dx,-16(%rbp) - fldcw -16(%rbp) + movw %dx,-16(%rsp) + fldcw -16(%rsp) /* * Get integral part. */ - movsd %xmm0,-24(%rbp) - fldl -24(%rbp) + movsd %xmm0,-24(%rsp) + fldl -24(%rsp) frndint - fstpl -8(%rbp) + fstpl -8(%rsp) /* * Restore control word. */ - fldcw -12(%rbp) + fldcw -12(%rsp) /* * Store integral part. */ - movsd -8(%rbp),%xmm0 + movsd -8(%rsp),%xmm0 movsd %xmm0,(%rdi) /* * Get fractional part and return it. */ - fldl -24(%rbp) - fsubl -8(%rbp) - movsd -8(%rbp),%xmm0 + fldl -24(%rsp) + fsubl -8(%rsp) + fstpl -8(%rsp) + movsd -8(%rsp),%xmm0 - leave ret ==== //depot/projects/ia64_epc/lib/libc/amd64/gen/setjmp.S#2 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)setjmp.s 5.1 (Berkeley) 4/23/90" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.23 2003/04/30 18:09:33 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.24 2003/05/08 06:25:03 peter Exp $"); /* * C library -- _setjmp, _longjmp @@ -55,9 +55,9 @@ ENTRY(setjmp) pushq %rdi movq %rdi,%rcx - leaq 72(%rcx),%rdi /* (sigset_t*)oset */ + movq $1,%rdi /* SIG_BLOCK */ movq $0,%rsi /* (sigset_t*)set */ - movq $1,%rdx /* SIG_BLOCK */ + leaq 72(%rcx),%rdx /* (sigset_t*)oset */ call PIC_PLT(CNAME(_sigprocmask)) popq %rdi movq %rdi,%rcx @@ -80,9 +80,9 @@ pushq %rdi pushq %rsi movq %rdi,%rdx - movq $0,%rdi /* (sigset_t*)oset */ + movq $1,%rdi /* SIG_SETMASK */ leaq 72(%rdx),%rsi /* (sigset_t*)set */ - movq $3,%rdx /* SIG_SETMASK */ + movq $0,%rdx /* (sigset_t*)oset */ call PIC_PLT(CNAME(_sigprocmask)) popq %rsi popq %rdi /* jmpbuf */ ==== //depot/projects/ia64_epc/lib/libc/amd64/gen/sigsetjmp.S#2 (text+ko) ==== @@ -41,7 +41,7 @@ .asciz "$Id: sigsetjmp.S,v 1.1 1993/12/05 13:01:05 ats Exp $" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/sigsetjmp.S,v 1.25 2003/04/30 18:09:33 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/sigsetjmp.S,v 1.26 2003/05/08 06:25:03 peter Exp $"); #include "SYS.h" @@ -58,18 +58,17 @@ */ ENTRY(sigsetjmp) - pushq %rdi - movq %rdi,%rcx - movl %esi,88(%rcx) + movl %esi,88(%rdi) testl %esi,%esi jz 2f - leaq 72(%rcx),%rdi /* (sigset_t*)oset */ + pushq %rdi + movq $1,%rdi /* SIG_BLOCK */ movq $0,%rsi /* (sigset_t*)set */ - movq $1,%rdx /* SIG_BLOCK */ + leaq 72(%rcx),%rdx /* (sigset_t*)oset */ call PIC_PLT(CNAME(_sigprocmask)) popq %rdi - movq %rdi,%rcx -2: movq 0(%rsp),%rdx /* retval */ +2: movq %rdi,%rcx + movq 0(%rsp),%rdx /* retval */ movq %rdx, 0(%rcx) /* retval */ movq %rbx, 8(%rcx) movq %rsp,16(%rcx) @@ -90,9 +89,9 @@ movq %rdi,%rdx pushq %rdi pushq %rsi - movq $0,%rdi /* (sigset_t*)oset */ + movq $3,%rdi /* SIG_SETMASK */ leaq 72(%rdx),%rsi /* (sigset_t*)set */ - movq $3,%rdx /* SIG_SETMASK */ + movq $0,%rdx /* (sigset_t*)oset */ call PIC_PLT(CNAME(_sigprocmask)) popq %rsi popq %rdi /* jmpbuf */ ==== //depot/projects/ia64_epc/lib/libc/i386/gen/rfork_thread.S#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/rfork_thread.S,v 1.4 2002/03/23 02:44:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/rfork_thread.S,v 1.5 2003/05/07 17:23:25 jhb Exp $"); /* * With thanks to John Dyson for the original version of this. @@ -109,5 +109,9 @@ * Branch here if the thread creation fails: */ 2: + addl $8, %esp + popl %esi + movl %ebp, %esp + popl %ebp PIC_PROLOGUE jmp PIC_PLT(HIDENAME(cerror)) ==== //depot/projects/ia64_epc/lib/libpam/libpam/Makefile#4 (text+ko) ==== @@ -33,7 +33,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/libpam/Makefile,v 1.43 2003/05/01 14:55:06 des Exp $ +# $FreeBSD: src/lib/libpam/libpam/Makefile,v 1.44 2003/05/05 21:15:35 des Exp $ OPENPAM= ${.CURDIR}/../../../contrib/openpam .PATH: ${OPENPAM}/include ${OPENPAM}/lib ${OPENPAM}/doc/man @@ -127,7 +127,7 @@ pam_vprompt.3 CSTD?= c99 -WARNS?= 5 +WARNS?= 6 CFLAGS+= -I${.CURDIR} -I${OPENPAM}/include CFLAGS+= -DLIB_MAJ=${SHLIB_MAJOR} ==== //depot/projects/ia64_epc/lib/libpthread/thread/thr_cancel.c#5 (text+ko) ==== @@ -1,6 +1,6 @@ /* * David Leonard , 1999. Public domain. - * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.19 2003/04/28 23:56:11 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.20 2003/05/06 00:02:54 deischen Exp $ */ #include #include @@ -64,16 +64,7 @@ break; case PS_JOIN: - /* - * Disconnect the thread from the joinee: - */ - if (pthread->join_status.thread != NULL) { - pthread->join_status.thread->joiner - = NULL; - pthread->join_status.thread = NULL; - } pthread->cancelflags |= THR_CANCELLING; - _thr_setrunnable_unlocked(pthread); break; case PS_SUSPENDED: ==== //depot/projects/ia64_epc/lib/libthr/arch/i386/i386/_setcurthread.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (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: src/lib/libthr/arch/i386/i386/_setcurthread.c,v 1.3 2003/04/03 03:34:49 jake Exp $ + * $FreeBSD: src/lib/libthr/arch/i386/i386/_setcurthread.c,v 1.4 2003/05/06 02:33:49 mtm Exp $ */ #include @@ -62,7 +62,10 @@ void _retire_thread(void *entry) { - *(void **)entry = *ldt_free; + if (ldt_free == NULL) + *(void **)entry = NULL; + else + *(void **)entry = *ldt_free; ldt_free = entry; } ==== //depot/projects/ia64_epc/lib/libthr/thread/thr_mutex.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.3 2003/04/02 03:05:39 jeff Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.4 2003/05/06 02:30:52 mtm Exp $ */ #include #include @@ -471,7 +471,7 @@ int ret = 0; PTHREAD_ASSERT((mutex != NULL) && (*mutex != NULL), - "Uninitialized mutex in pthread_mutex_trylock_basic"); + "Uninitialized mutex in mutex_lock_common"); /* * Enter a loop waiting to become the mutex owner. We need a ==== //depot/projects/ia64_epc/lib/libthr/thread/thr_sig.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * (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: src/lib/libthr/thread/thr_sig.c,v 1.2 2003/04/02 03:05:39 jeff Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_sig.c,v 1.3 2003/05/06 02:30:52 mtm Exp $ */ #include @@ -124,28 +124,25 @@ curthread->state = psd.psd_state; curthread->flags = psd.psd_flags; - /* Check the threads previous state: */ - if (psd.psd_state != PS_RUNNING) { - /* - * Do a little cleanup handling for those threads in - * queues before calling the signal handler. Signals - * for these threads are temporarily blocked until - * after cleanup handling. - */ - switch (psd.psd_state) { - case PS_COND_WAIT: - _cond_wait_backout(curthread); - psd.psd_state = PS_RUNNING; - break; + /* + * Do a little cleanup handling for those threads in + * queues before calling the signal handler. Signals + * for these threads are temporarily blocked until + * after cleanup handling. + */ + switch (psd.psd_state) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 8 00:48:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0751837B404; Thu, 8 May 2003 00:48:30 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AA08337B405 for ; Thu, 8 May 2003 00:48:29 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C16A143F85 for ; Thu, 8 May 2003 00:48:26 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h487mQ0U019379 for ; Thu, 8 May 2003 00:48:26 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h487mPme019361 for perforce@freebsd.org; Thu, 8 May 2003 00:48:25 -0700 (PDT) Date: Thu, 8 May 2003 00:48:25 -0700 (PDT) Message-Id: <200305080748.h487mPme019361@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30769 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 07:48:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=30769 Change 30769 by marcel@marcel_pluto1 on 2003/05/08 00:47:30 IFC @30760 Affected files ... .. //depot/projects/sio/UPDATING#4 integrate .. //depot/projects/sio/bin/df/df.1#2 integrate .. //depot/projects/sio/bin/ls/ls.1#2 integrate .. //depot/projects/sio/bin/mv/mv.c#3 integrate .. //depot/projects/sio/bin/mv/pathnames.h#2 delete .. //depot/projects/sio/bin/sh/var.c#2 integrate .. //depot/projects/sio/contrib/isc-dhcp/client/clparse.c#2 integrate .. //depot/projects/sio/contrib/tar/src/buffer.c#2 integrate .. //depot/projects/sio/etc/Makefile#4 integrate .. //depot/projects/sio/etc/devd.conf#3 integrate .. //depot/projects/sio/etc/devfs.conf#1 branch .. //depot/projects/sio/etc/newsyslog.conf#2 integrate .. //depot/projects/sio/etc/pccard_ether#2 integrate .. //depot/projects/sio/etc/rc.d/apm#3 integrate .. //depot/projects/sio/etc/rc.d/apmd#3 integrate .. //depot/projects/sio/etc/rc.d/archdep#3 integrate .. //depot/projects/sio/etc/rc.d/devfs#4 integrate .. //depot/projects/sio/etc/rc.d/kpasswdd#2 integrate .. //depot/projects/sio/etc/remote#2 integrate .. //depot/projects/sio/etc/services#2 integrate .. //depot/projects/sio/gnu/usr.bin/binutils/libbinutils/Makefile#2 integrate .. //depot/projects/sio/gnu/usr.bin/binutils/libopcodes/Makefile.amd64#1 branch .. //depot/projects/sio/include/paths.h#2 integrate .. //depot/projects/sio/lib/libc/amd64/_fpmath.h#2 integrate .. //depot/projects/sio/lib/libc/amd64/arith.h#2 integrate .. //depot/projects/sio/lib/libc/amd64/gen/Makefile.inc#2 integrate .. //depot/projects/sio/lib/libc/amd64/gen/alloca.S#2 integrate .. //depot/projects/sio/lib/libc/amd64/gen/modf.S#2 integrate .. //depot/projects/sio/lib/libc/amd64/gen/setjmp.S#2 integrate .. //depot/projects/sio/lib/libc/amd64/gen/sigsetjmp.S#2 integrate .. //depot/projects/sio/lib/libc/i386/gen/rfork_thread.S#2 integrate .. //depot/projects/sio/lib/libpam/libpam/Makefile#3 integrate .. //depot/projects/sio/lib/libpthread/thread/thr_cancel.c#2 integrate .. //depot/projects/sio/lib/libthr/arch/i386/i386/_setcurthread.c#2 integrate .. //depot/projects/sio/lib/libthr/thread/thr_mutex.c#2 integrate .. //depot/projects/sio/lib/libthr/thread/thr_sig.c#2 integrate .. //depot/projects/sio/libexec/Makefile#4 integrate .. //depot/projects/sio/libexec/rtld-elf/rtld.c#3 integrate .. //depot/projects/sio/release/Makefile#3 integrate .. //depot/projects/sio/release/alpha/dokern.sh#2 integrate .. //depot/projects/sio/release/doc/en_US.ISO8859-1/readme/article.sgml#2 integrate .. //depot/projects/sio/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#7 integrate .. //depot/projects/sio/release/doc/share/sgml/release.ent#2 integrate .. //depot/projects/sio/sbin/Makefile#2 integrate .. //depot/projects/sio/sbin/bsdlabel/Makefile#4 integrate .. //depot/projects/sio/sbin/dump/main.c#3 integrate .. //depot/projects/sio/sbin/dump/traverse.c#2 integrate .. //depot/projects/sio/sbin/dumpon/dumpon.8#2 integrate .. //depot/projects/sio/sbin/mdmfs/mdmfs.8#2 integrate .. //depot/projects/sio/sbin/shutdown/pathnames.h#2 delete .. //depot/projects/sio/sbin/shutdown/shutdown.c#3 integrate .. //depot/projects/sio/sbin/startslip/startslip.c#2 integrate .. //depot/projects/sio/sbin/vinum/commands.c#4 integrate .. //depot/projects/sio/share/examples/etc/make.conf#3 integrate .. //depot/projects/sio/share/man/man5/disktab.5#2 integrate .. //depot/projects/sio/share/man/man9/malloc.9#2 integrate .. //depot/projects/sio/share/mk/bsd.sys.mk#3 integrate .. //depot/projects/sio/share/sendmail/Makefile#2 integrate .. //depot/projects/sio/sys/Makefile#2 integrate .. //depot/projects/sio/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/sio/sys/amd64/amd64/machdep.c#3 integrate .. //depot/projects/sio/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/sio/sys/conf/NOTES#4 integrate .. //depot/projects/sio/sys/conf/newvers.sh#2 integrate .. //depot/projects/sio/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/sio/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/sio/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/sio/sys/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/sio/sys/dev/em/if_em.c#3 integrate .. //depot/projects/sio/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/sio/sys/dev/vinum/vinumioctl.c#3 integrate .. //depot/projects/sio/sys/geom/geom_bsd.c#5 integrate .. //depot/projects/sio/sys/geom/geom_io.c#3 integrate .. //depot/projects/sio/sys/i386/isa/intr_machdep.c#2 integrate .. //depot/projects/sio/sys/kern/kern_mac.c#2 integrate .. //depot/projects/sio/sys/kern/kern_sig.c#2 integrate .. //depot/projects/sio/sys/kern/kern_subr.c#2 integrate .. //depot/projects/sio/sys/kern/kern_synch.c#3 integrate .. //depot/projects/sio/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/sio/sys/kern/vfs_default.c#4 integrate .. //depot/projects/sio/sys/netinet/ip_input.c#2 integrate .. //depot/projects/sio/sys/netinet/tcp_input.c#2 integrate .. //depot/projects/sio/sys/netinet/tcp_subr.c#2 integrate .. //depot/projects/sio/sys/netinet/tcp_var.h#2 integrate .. //depot/projects/sio/sys/pci/if_sis.c#2 integrate .. //depot/projects/sio/sys/sys/dkstat.h#2 integrate .. //depot/projects/sio/sys/sys/signalvar.h#2 integrate .. //depot/projects/sio/sys/sys/syscallsubr.h#3 integrate .. //depot/projects/sio/sys/vm/swap_pager.c#2 integrate .. //depot/projects/sio/sys/vm/vm_object.c#6 integrate .. //depot/projects/sio/sys/vm/vm_pager.c#2 integrate .. //depot/projects/sio/sys/vm/vnode_pager.c#2 integrate .. //depot/projects/sio/tools/tools/tinderbox/tbmaster.pl#4 integrate .. //depot/projects/sio/usr.bin/Makefile#4 integrate .. //depot/projects/sio/usr.bin/calendar/calendars/calendar.freebsd#2 integrate .. //depot/projects/sio/usr.bin/vi/pathnames.h#2 integrate .. //depot/projects/sio/usr.bin/xlint/lint1/param.h#2 integrate .. //depot/projects/sio/usr.sbin/newsyslog/newsyslog.c#3 integrate .. //depot/projects/sio/usr.sbin/pw/pw.8#2 integrate Differences ... ==== //depot/projects/sio/UPDATING#4 (text+ko) ==== @@ -17,6 +17,11 @@ developers choose to disable these features on build machines to maximize performance. +20030505: + Kerberos 5 (Heimdal) is now built by default. Setting + MAKE_KERBEROS5 no longer has any effect. If you do NOT + want the "base" Kerberos 5, you need to set NO_KERBEROS. + 20030502: groff has been updated. If you try to do a buildworld and get an infinite loop in troff, update to May 4th or newer. If you @@ -1273,4 +1278,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.250 2003/05/04 06:26:30 imp Exp $ +$FreeBSD: src/UPDATING,v 1.251 2003/05/05 20:05:37 markm Exp $ ==== //depot/projects/sio/bin/df/df.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)df.1 8.3 (Berkeley) 5/8/95 -.\" $FreeBSD: src/bin/df/df.1,v 1.28 2002/08/26 04:56:23 trhodes Exp $ +.\" $FreeBSD: src/bin/df/df.1,v 1.29 2003/05/06 21:54:46 trhodes Exp $ .\" .Dd May 8, 1995 .Dt DF 1 @@ -81,11 +81,11 @@ .It Fl H "Human-readable" output. Use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte and Petabyte in order to reduce the number of -digits to three or less using base 10 for sizes. +digits to four or fewer using base 10 for sizes. .It Fl h "Human-readable" output. Use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte and Petabyte in order to reduce the number of -digits to three or less using base 2 for sizes. +digits to four or fewer using base 2 for sizes. .It Fl i Include statistics on the number of free inodes. .It Fl k ==== //depot/projects/sio/bin/ls/ls.1#2 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.73 2003/01/20 21:25:00 chris Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.74 2003/05/06 21:54:46 trhodes Exp $ .\" .Dd May 19, 2002 .Dt LS 1 @@ -175,7 +175,7 @@ When used with the .Fl l option, use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte -and Petabyte in order to reduce the number of digits to three or less +and Petabyte in order to reduce the number of digits to four or fewer using base 2 for sizes. .It Fl i For each file, print the file's file serial number (inode number). ==== //depot/projects/sio/bin/mv/mv.c#3 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.40 2003/05/01 16:58:56 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.41 2003/05/05 22:49:22 obrien Exp $"); #include #include @@ -67,8 +67,6 @@ #include #include -#include "pathnames.h" - int fflg, iflg, nflg, vflg; int copy(char *, char *); ==== //depot/projects/sio/bin/sh/var.c#2 (text+ko) ==== @@ -40,10 +40,11 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.23 2002/10/01 00:54:14 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.24 2003/05/05 22:49:22 obrien Exp $"); #include #include +#include /* * Shell variables. @@ -105,7 +106,7 @@ NULL }, { &vmpath, VSTRFIXED|VTEXTFIXED|VUNSET, "MAILPATH=", NULL }, - { &vpath, VSTRFIXED|VTEXTFIXED, "PATH=/bin:/usr/bin", + { &vpath, VSTRFIXED|VTEXTFIXED, "PATH=" _PATH_DEFPATH, changepath }, { &vppid, VSTRFIXED|VTEXTFIXED|VUNSET, "PPID=", NULL }, ==== //depot/projects/sio/contrib/isc-dhcp/client/clparse.c#2 (text+ko) ==== @@ -44,7 +44,7 @@ #ifndef lint static char copyright[] = "$Id: clparse.c,v 1.62.2.3 2002/11/17 02:25:43 dhankins Exp $ Copyright (c) 1996-2002 The Internet Software Consortium. All rights reserved.\n" -"$FreeBSD: src/contrib/isc-dhcp/client/clparse.c,v 1.9 2003/01/16 07:22:32 obrien Exp $\n"; +"$FreeBSD: src/contrib/isc-dhcp/client/clparse.c,v 1.10 2003/05/05 22:49:22 obrien Exp $\n"; #endif /* not lint */ #include "dhcpd.h" @@ -53,7 +53,7 @@ struct client_config top_level_config; -char client_script_name [] = "/sbin/dhclient-script"; +char client_script_name [] = _PATH_DHCLIENT_SCRIPT; u_int32_t default_requested_options [] = { DHO_SUBNET_MASK, ==== //depot/projects/sio/contrib/tar/src/buffer.c#2 (text+ko) ==== @@ -19,12 +19,18 @@ with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/tar/src/buffer.c,v 1.5 2002/10/09 07:33:29 sobomax Exp $ */ +/* $FreeBSD: src/contrib/tar/src/buffer.c,v 1.6 2003/05/05 22:49:22 obrien Exp $ */ #include "system.h" #include +#if __FreeBSD__ +# include +#else +# define _PATH_BSHELL "/bin/sh" +#endif + #if MSDOS # include #endif @@ -1549,7 +1555,7 @@ pid_t child; const char *shell = getenv ("SHELL"); if (! shell) - shell = "/bin/sh"; + shell = _PATH_BSHELL; child = xfork (); if (child == 0) { ==== //depot/projects/sio/etc/Makefile#4 (text+ko) ==== @@ -1,13 +1,13 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.312 2003/05/02 22:27:31 dougb Exp $ +# $FreeBSD: src/etc/Makefile,v 1.313 2003/05/06 07:25:17 dougb Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail .endif BIN1= amd.map apmd.conf auth.conf \ - crontab csh.cshrc csh.login csh.logout \ - devd.conf dhclient.conf disktab fbtab ftpusers gettytab group \ + crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \ + dhclient.conf disktab fbtab ftpusers gettytab group \ hosts hosts.allow hosts.equiv hosts.lpd \ inetd.conf login.access login.conf \ mac.conf motd netconfig network.subr networks newsyslog.conf \ ==== //depot/projects/sio/etc/devd.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.3 2003/05/03 10:16:55 akiyama Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.4 2003/05/07 15:48:20 imp Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -64,9 +64,10 @@ }; # Don't even try to second guess what to do about drivers that don't -# match here. Instead, pass it off to a smart script to deal. +# match here. Instead, pass it off to syslog. Commented out for the +# moment, as pnpinfo isn't set in devd yet nomatch 0 { - action "logger Unknown device: $pnpinfo $location $bus"; + // action "logger Unknown device: $pnpinfo $location $bus"; }; /* EXAMPLES TO END OF FILE ==== //depot/projects/sio/etc/newsyslog.conf#2 (text+ko) ==== @@ -1,5 +1,14 @@ # configuration file for newsyslog -# $FreeBSD: src/etc/newsyslog.conf,v 1.44 2003/04/08 16:14:02 des Exp $ +# $FreeBSD: src/etc/newsyslog.conf,v 1.46 2003/05/05 19:08:33 gad Exp $ +# +# Entries which do not specify the '/pid_file' field will cause the +# syslogd process to be signalled when that log file is rotated. This +# action is only appropriate for log files which are written to by the +# syslogd process (ie, files listed in /etc/syslogd.conf). If there +# is no process which needs to be signalled when a given log file is +# rotated, then the entry for that file should include the 'N' flag. +# +# The 'flags' field is one or more of the letters: BCGJNUWZ or a '-'. # # Note: some sites will want to select more restrictive protections than the # defaults. In particular, it may be desirable to switch many of the 644 @@ -7,23 +16,23 @@ # contents of maillog, messages, and lpd-errs to be confidential. In the # future, these defaults may change to more conservative ones. # -# logfilename [owner:group] mode count size when [ZJB] [/pid_file] [sig_num] +# logfilename [owner:group] mode count size when flags [/pid_file] [sig_num] /var/log/all.log 600 7 * @T00 J /var/log/amd.log 644 7 100 * J /var/log/auth.log 600 7 100 * J /var/log/console.log 600 5 100 * J /var/log/cron 600 3 100 * J -/var/log/daily.log 640 7 * @T00 J +/var/log/daily.log 640 7 * @T00 JN /var/log/debug.log 600 7 100 * J /var/log/kerberos.log 600 7 100 * J /var/log/lpd-errs 644 7 100 * J /var/log/maillog 640 7 * @T00 J /var/log/messages 644 5 100 * J -/var/log/monthly.log 640 12 * $M1D0 J +/var/log/monthly.log 640 12 * $M1D0 JN /var/log/ppp.log root:network 640 3 100 * J /var/log/security 600 10 100 * J /var/log/sendmail.st 640 10 * 168 B /var/log/slip.log root:network 640 3 100 * J -/var/log/weekly.log 640 5 1 $W6D0 J +/var/log/weekly.log 640 5 1 $W6D0 JN /var/log/wtmp 644 3 * @01T05 B /var/log/xferlog 600 7 100 * J ==== //depot/projects/sio/etc/pccard_ether#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/etc/pccard_ether,v 1.28 2002/12/12 09:31:09 imp Exp $ +# $FreeBSD: src/etc/pccard_ether,v 1.29 2003/05/05 19:06:46 ume Exp $ # # pccard_ether interfacename [start|stop] [ifconfig option] # @@ -134,8 +134,8 @@ # IPv6 setup case ${ipv6_enable} in [Yy][Ee][Ss]) - if [ -r /etc/rc.network6 ]; then - . /etc/rc.network6 + if [ -r /etc/rc.d/network_ipv6 ]; then + . /etc/rc.d/network_ipv6 network6_interface_setup ${interface} fi ;; ==== //depot/projects/sio/etc/rc.d/apm#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/apm,v 1.2 2003/05/02 08:35:17 mtm Exp $ +# $FreeBSD: src/etc/rc.d/apm,v 1.3 2003/05/05 23:55:43 obrien Exp $ # # PROVIDE: apm @@ -19,7 +19,7 @@ apm_precmd() { case `${SYSCTL_N} hw.machine_arch` in - i386|amd64) + i386) return 0 ;; esac ==== //depot/projects/sio/etc/rc.d/apmd#3 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: apmd,v 1.5 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/apmd,v 1.6 2003/05/02 08:35:17 mtm Exp $ +# $FreeBSD: src/etc/rc.d/apmd,v 1.7 2003/05/06 00:09:51 obrien Exp $ # # PROVIDE: apmd @@ -24,7 +24,7 @@ apmd_prestart() { case `${SYSCTL_N} hw.machine_arch` in - i386|amd64) + i386) # Start apm if it is not already running /etc/rc.d/apm forcestatus > /dev/null || /etc/rc.d/apm forcestart ;; ==== //depot/projects/sio/etc/rc.d/archdep#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/archdep,v 1.4 2003/05/02 08:35:17 mtm Exp $ +# $FreeBSD: src/etc/rc.d/archdep,v 1.5 2003/05/06 00:09:51 obrien Exp $ # # PROVIDE: archdep @@ -56,7 +56,7 @@ _arch=`${SYSCTL_N} hw.machine` echo -n "Initial $_arch initialization:" case $_arch in -i386|amd64) +i386) ibcs2_compat ;; alpha) ==== //depot/projects/sio/etc/rc.d/devfs#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/devfs,v 1.4 2003/05/05 15:38:41 mtm Exp $ +# $FreeBSD: src/etc/rc.d/devfs,v 1.5 2003/05/06 01:10:33 dougb Exp $ # # PROVIDE: devfs @@ -11,18 +11,31 @@ . /etc/rc.subr name="devfs" +start_cmd='read_devfs_conf' +stop_cmd=':' +read_devfs_conf() +{ + if [ -r /etc/devfs.conf ]; then + cd /dev + while read action device parameter; do + case "${action}" in + l*) if [ -c ${device} -a ! -e ${parameter} ]; then + ln -fs ${device} ${parameter} + fi + ;; + o*) if [ -c ${device} ]; then + chown ${parameter} ${device} + fi + ;; + p*) if [ -c ${device} ]; then + chmod ${parameter} ${device} + fi + ;; + esac + done < /etc/devfs.conf + fi +} + load_rc_config $name - -# Setup DEVFS, ie permissions, links etc. -# -if [ -c /dev/ttyv0 -a ! -e /dev/vga ];then - ln -fs /dev/ttyv0 /dev/vga -fi - -# XXX - in case the user has a customized /etc/rc.devfs we need to keep -# pulling it in until we have a better way of doing this in rc.d. -# -if [ -r /etc/rc.devfs ]; then - sh /etc/rc.devfs -fi +run_rc_command "$1" ==== //depot/projects/sio/etc/rc.d/kpasswdd#2 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/kpasswdd,v 1.1 2003/04/30 20:58:49 markm Exp $ +# $FreeBSD: src/etc/rc.d/kpasswdd,v 1.2 2003/05/06 02:28:03 mtm Exp $ # # PROVIDE: kpasswdd -# REQUIRE: kadmind5 +# REQUIRE: kadmin # BEFORE: DAEMON # KEYWORD: FreeBSD ==== //depot/projects/sio/etc/remote#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/remote,v 1.11 2001/02/21 19:45:47 nik Exp $ +# $FreeBSD: src/etc/remote,v 1.12 2003/05/05 21:37:43 dougb Exp $ # # @(#)remote 5.2 (Berkeley) 6/30/90 # @@ -52,7 +52,7 @@ cuaa0c|cua0c:dv=/dev/cuaa0:br#9600:pa=none: # Finger friendly shortcuts -com1:dv=/dev/cuaa0:br#9600:pa=none: -com2:dv=/dev/cuaa1:br#9600:pa=none: -com3:dv=/dev/cuaa2:br#9600:pa=none: -com4:dv=/dev/cuaa3:br#9600:pa=none: +sio0|com1:dv=/dev/cuaa0:br#9600:pa=none: +sio1|com2:dv=/dev/cuaa1:br#9600:pa=none: +sio2|com3:dv=/dev/cuaa2:br#9600:pa=none: +sio3|com4:dv=/dev/cuaa3:br#9600:pa=none: ==== //depot/projects/sio/etc/services#2 (text+ko) ==== @@ -16,7 +16,7 @@ # Kerberos services are for Kerberos v4, and are unofficial. Sites running # v5 should uncomment v5 entries and comment v4 entries. # -# $FreeBSD: src/etc/services,v 1.92 2003/04/29 09:54:06 mdodd Exp $ +# $FreeBSD: src/etc/services,v 1.93 2003/05/05 22:10:14 dougb Exp $ # From: @(#)services 5.8 (Berkeley) 5/9/91 # # WELL KNOWN PORT NUMBERS @@ -1198,6 +1198,7 @@ accessbuilder 888/tcp accessbuilder 888/udp swat 901/tcp # samba web configuration tool +rndc 953/tcp # named's rndc control socket ftps-data 989/tcp # ftp protocol, data, over TLS/SSL ftps-data 989/udp ftps 990/tcp # ftp protocol, control, over TLS/SSL @@ -1922,6 +1923,8 @@ dec-notes 3333/tcp #DEC Notes dec-notes 3333/udp #DEC Notes rsvp-encap 3455/udp #RSVP encapsulated in UDP +nut 3493/tcp #Network UPS Tools +nut 3493/udp #Network UPS Tools mapper-nodemgr 3984/tcp #MAPPER network node manager mapper-nodemgr 3984/udp #MAPPER network node manager mapper-mapethd 3985/tcp #MAPPER TCP/IP server ==== //depot/projects/sio/gnu/usr.bin/binutils/libbinutils/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbinutils/Makefile,v 1.18 2002/10/11 06:28:05 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbinutils/Makefile,v 1.19 2003/05/08 06:39:31 peter Exp $ .include "../Makefile.inc0" @@ -9,7 +9,12 @@ ieee.c rdcoff.c rddbg.c rename.c stabs.c unwind-ia64.c \ wrstabs.c version.c binemul.c budemang.c emul_vanilla.c WARNS= 0 -CFLAGS+= -DTARGET=\"${TARGET_ARCH}-unknown-freebsd\" +.if ${TARGET_ARCH} == "amd64" +BINUTILS_ARCH=x86_64 +.else +BINUTILS_ARCH=${TARGET_ARCH} +.endif +CFLAGS+= -DTARGET=\"${BINUTILS_ARCH}-unknown-freebsd\" CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\" CFLAGS+= -I${SRCDIR}/binutils CFLAGS+= -I${SRCDIR}/bfd ==== //depot/projects/sio/include/paths.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)paths.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/paths.h,v 1.18 2003/04/07 16:21:25 mdodd Exp $ + * $FreeBSD: src/include/paths.h,v 1.19 2003/05/05 22:49:22 obrien Exp $ */ #ifndef _PATHS_H_ @@ -59,6 +59,8 @@ #define _PATH_DRUM "/dev/drum" #define _PATH_ETC "/etc" #define _PATH_FTPUSERS "/etc/ftpusers" +#define _PATH_HALT "/sbin/halt" +#define _PATH_IFCONFIG "/sbin/ifconfig" #define _PATH_KMEM "/dev/kmem" #define _PATH_LIBMAP_CONF "/etc/libmap.conf" #define _PATH_LOGIN "/usr/bin/login" @@ -67,7 +69,9 @@ #define _PATH_MEM "/dev/mem" #define _PATH_NOLOGIN "/var/run/nologin" #define _PATH_RCP "/bin/rcp" +#define _PATH_REBOOT "/sbin/reboot" #define _PATH_RLOGIN "/usr/bin/rlogin" +#define _PATH_RM "/bin/rm" #define _PATH_RSH "/usr/bin/rsh" #define _PATH_SENDMAIL "/usr/sbin/sendmail" #define _PATH_SHELLS "/etc/shells" ==== //depot/projects/sio/lib/libc/amd64/_fpmath.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/amd64/_fpmath.h,v 1.2 2003/04/05 22:10:13 das Exp $ + * $FreeBSD: src/lib/libc/amd64/_fpmath.h,v 1.3 2003/05/08 00:02:03 peter Exp $ */ union IEEEl2bits { @@ -33,7 +33,8 @@ unsigned int manh :32; unsigned int exp :15; unsigned int sign :1; - unsigned int junk :16; + unsigned int junkl :16; + unsigned int junkh :32; } bits; }; ==== //depot/projects/sio/lib/libc/amd64/arith.h#2 (text+ko) ==== @@ -1,8 +1,12 @@ /* * MD header for contrib/gdtoa * - * $FreeBSD: src/lib/libc/amd64/arith.h,v 1.1 2003/03/12 20:29:59 das Exp $ + * $FreeBSD: src/lib/libc/amd64/arith.h,v 1.2 2003/05/07 23:48:05 peter Exp $ */ #define IEEE_8087 #define Arith_Kind_ASL 1 +#define Long int +#define Intcast (int)(long) +#define Double_Align +#define X64_bit_pointers ==== //depot/projects/sio/lib/libc/amd64/gen/Makefile.inc#2 (text+ko) ==== @@ -1,6 +1,6 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.19 2003/04/30 18:08:01 peter Exp $ +# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.20 2003/05/07 23:49:24 peter Exp $ -SRCS+= _setjmp.S setjmp.S sigsetjmp.S alloca.S \ +SRCS+= _setjmp.S setjmp.S sigsetjmp.S \ fabs.S modf.S \ frexp.c infinity.c isinf.c ==== //depot/projects/sio/lib/libc/amd64/gen/alloca.S#2 (text+ko) ==== @@ -38,14 +38,14 @@ .asciz "@(#)alloca.s 5.2 (Berkeley) 5/14/90" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/alloca.S,v 1.1 2003/05/01 16:04:38 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/alloca.S,v 1.2 2003/05/08 00:02:47 peter Exp $"); /* like alloc, but automatic automatic free in return */ ENTRY(alloca) popq %rdx /* pop return addr */ - movl %rsp,%rcx + movq %rsp,%rcx addq $15,%rdi /* round amount to allocate up to 16 bytes */ andq $~15,%rdi subq %rdi,%rsp ==== //depot/projects/sio/lib/libc/amd64/gen/modf.S#2 (text+ko) ==== @@ -40,7 +40,7 @@ #if defined(LIBC_SCCS) RCSID("$NetBSD: modf.S,v 1.5 1997/07/16 14:37:18 christos Exp $") #endif -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/modf.S,v 1.1 2003/04/30 16:21:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/modf.S,v 1.2 2003/05/08 03:19:37 peter Exp $"); /* * modf(value, iptr): return fractional part of value, and stores the @@ -52,44 +52,41 @@ /* With CHOP mode on, frndint behaves as TRUNC does. Useful. */ ENTRY(modf) - pushq %rbp - movq %rsp,%rbp - subq $24,%rsp /* * Set chop mode. */ - fnstcw -12(%rbp) - movw -12(%rbp),%dx + fnstcw -12(%rsp) + movw -12(%rsp),%dx orw $3072,%dx - movw %dx,-16(%rbp) - fldcw -16(%rbp) + movw %dx,-16(%rsp) + fldcw -16(%rsp) /* * Get integral part. */ - movsd %xmm0,-24(%rbp) - fldl -24(%rbp) + movsd %xmm0,-24(%rsp) + fldl -24(%rsp) frndint - fstpl -8(%rbp) + fstpl -8(%rsp) /* * Restore control word. */ - fldcw -12(%rbp) + fldcw -12(%rsp) /* * Store integral part. */ - movsd -8(%rbp),%xmm0 + movsd -8(%rsp),%xmm0 movsd %xmm0,(%rdi) /* * Get fractional part and return it. */ - fldl -24(%rbp) - fsubl -8(%rbp) - movsd -8(%rbp),%xmm0 + fldl -24(%rsp) + fsubl -8(%rsp) + fstpl -8(%rsp) + movsd -8(%rsp),%xmm0 - leave ret ==== //depot/projects/sio/lib/libc/amd64/gen/setjmp.S#2 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)setjmp.s 5.1 (Berkeley) 4/23/90" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.23 2003/04/30 18:09:33 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.24 2003/05/08 06:25:03 peter Exp $"); /* * C library -- _setjmp, _longjmp @@ -55,9 +55,9 @@ ENTRY(setjmp) pushq %rdi movq %rdi,%rcx - leaq 72(%rcx),%rdi /* (sigset_t*)oset */ + movq $1,%rdi /* SIG_BLOCK */ movq $0,%rsi /* (sigset_t*)set */ - movq $1,%rdx /* SIG_BLOCK */ + leaq 72(%rcx),%rdx /* (sigset_t*)oset */ call PIC_PLT(CNAME(_sigprocmask)) popq %rdi movq %rdi,%rcx @@ -80,9 +80,9 @@ pushq %rdi pushq %rsi movq %rdi,%rdx - movq $0,%rdi /* (sigset_t*)oset */ + movq $1,%rdi /* SIG_SETMASK */ leaq 72(%rdx),%rsi /* (sigset_t*)set */ - movq $3,%rdx /* SIG_SETMASK */ + movq $0,%rdx /* (sigset_t*)oset */ call PIC_PLT(CNAME(_sigprocmask)) popq %rsi popq %rdi /* jmpbuf */ ==== //depot/projects/sio/lib/libc/amd64/gen/sigsetjmp.S#2 (text+ko) ==== @@ -41,7 +41,7 @@ .asciz "$Id: sigsetjmp.S,v 1.1 1993/12/05 13:01:05 ats Exp $" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/sigsetjmp.S,v 1.25 2003/04/30 18:09:33 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/sigsetjmp.S,v 1.26 2003/05/08 06:25:03 peter Exp $"); #include "SYS.h" @@ -58,18 +58,17 @@ */ ENTRY(sigsetjmp) - pushq %rdi - movq %rdi,%rcx - movl %esi,88(%rcx) + movl %esi,88(%rdi) testl %esi,%esi jz 2f - leaq 72(%rcx),%rdi /* (sigset_t*)oset */ + pushq %rdi + movq $1,%rdi /* SIG_BLOCK */ movq $0,%rsi /* (sigset_t*)set */ - movq $1,%rdx /* SIG_BLOCK */ + leaq 72(%rcx),%rdx /* (sigset_t*)oset */ call PIC_PLT(CNAME(_sigprocmask)) popq %rdi - movq %rdi,%rcx -2: movq 0(%rsp),%rdx /* retval */ +2: movq %rdi,%rcx + movq 0(%rsp),%rdx /* retval */ movq %rdx, 0(%rcx) /* retval */ movq %rbx, 8(%rcx) movq %rsp,16(%rcx) @@ -90,9 +89,9 @@ movq %rdi,%rdx pushq %rdi pushq %rsi - movq $0,%rdi /* (sigset_t*)oset */ + movq $3,%rdi /* SIG_SETMASK */ leaq 72(%rdx),%rsi /* (sigset_t*)set */ - movq $3,%rdx /* SIG_SETMASK */ + movq $0,%rdx /* (sigset_t*)oset */ call PIC_PLT(CNAME(_sigprocmask)) popq %rsi popq %rdi /* jmpbuf */ ==== //depot/projects/sio/lib/libc/i386/gen/rfork_thread.S#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/rfork_thread.S,v 1.4 2002/03/23 02:44:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/rfork_thread.S,v 1.5 2003/05/07 17:23:25 jhb Exp $"); /* * With thanks to John Dyson for the original version of this. @@ -109,5 +109,9 @@ * Branch here if the thread creation fails: */ 2: + addl $8, %esp + popl %esi + movl %ebp, %esp + popl %ebp PIC_PROLOGUE jmp PIC_PLT(HIDENAME(cerror)) ==== //depot/projects/sio/lib/libpam/libpam/Makefile#3 (text+ko) ==== @@ -33,7 +33,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/libpam/Makefile,v 1.43 2003/05/01 14:55:06 des Exp $ +# $FreeBSD: src/lib/libpam/libpam/Makefile,v 1.44 2003/05/05 21:15:35 des Exp $ OPENPAM= ${.CURDIR}/../../../contrib/openpam .PATH: ${OPENPAM}/include ${OPENPAM}/lib ${OPENPAM}/doc/man @@ -127,7 +127,7 @@ pam_vprompt.3 CSTD?= c99 -WARNS?= 5 +WARNS?= 6 CFLAGS+= -I${.CURDIR} -I${OPENPAM}/include CFLAGS+= -DLIB_MAJ=${SHLIB_MAJOR} ==== //depot/projects/sio/lib/libpthread/thread/thr_cancel.c#2 (text+ko) ==== @@ -1,6 +1,6 @@ /* * David Leonard , 1999. Public domain. - * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.19 2003/04/28 23:56:11 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.20 2003/05/06 00:02:54 deischen Exp $ */ #include #include @@ -64,16 +64,7 @@ break; case PS_JOIN: - /* - * Disconnect the thread from the joinee: - */ - if (pthread->join_status.thread != NULL) { - pthread->join_status.thread->joiner - = NULL; - pthread->join_status.thread = NULL; - } pthread->cancelflags |= THR_CANCELLING; - _thr_setrunnable_unlocked(pthread); break; case PS_SUSPENDED: ==== //depot/projects/sio/lib/libthr/arch/i386/i386/_setcurthread.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (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: src/lib/libthr/arch/i386/i386/_setcurthread.c,v 1.3 2003/04/03 03:34:49 jake Exp $ + * $FreeBSD: src/lib/libthr/arch/i386/i386/_setcurthread.c,v 1.4 2003/05/06 02:33:49 mtm Exp $ */ #include @@ -62,7 +62,10 @@ void _retire_thread(void *entry) { - *(void **)entry = *ldt_free; + if (ldt_free == NULL) + *(void **)entry = NULL; + else + *(void **)entry = *ldt_free; ldt_free = entry; } ==== //depot/projects/sio/lib/libthr/thread/thr_mutex.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.3 2003/04/02 03:05:39 jeff Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.4 2003/05/06 02:30:52 mtm Exp $ */ #include #include @@ -471,7 +471,7 @@ int ret = 0; PTHREAD_ASSERT((mutex != NULL) && (*mutex != NULL), - "Uninitialized mutex in pthread_mutex_trylock_basic"); + "Uninitialized mutex in mutex_lock_common"); /* * Enter a loop waiting to become the mutex owner. We need a ==== //depot/projects/sio/lib/libthr/thread/thr_sig.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * (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: src/lib/libthr/thread/thr_sig.c,v 1.2 2003/04/02 03:05:39 jeff Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_sig.c,v 1.3 2003/05/06 02:30:52 mtm Exp $ */ #include @@ -124,28 +124,25 @@ curthread->state = psd.psd_state; curthread->flags = psd.psd_flags; - /* Check the threads previous state: */ - if (psd.psd_state != PS_RUNNING) { - /* - * Do a little cleanup handling for those threads in - * queues before calling the signal handler. Signals - * for these threads are temporarily blocked until - * after cleanup handling. - */ - switch (psd.psd_state) { - case PS_COND_WAIT: - _cond_wait_backout(curthread); - psd.psd_state = PS_RUNNING; - break; + /* + * Do a little cleanup handling for those threads in + * queues before calling the signal handler. Signals + * for these threads are temporarily blocked until + * after cleanup handling. + */ + switch (psd.psd_state) { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 8 00:50:36 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9053A37B401; Thu, 8 May 2003 00:50:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2667C37B412 for ; Thu, 8 May 2003 00:50:35 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7809A43FB1 for ; Thu, 8 May 2003 00:50:33 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h487oX0U019602 for ; Thu, 8 May 2003 00:50:33 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h487oUX6019597 for perforce@freebsd.org; Thu, 8 May 2003 00:50:30 -0700 (PDT) Date: Thu, 8 May 2003 00:50:30 -0700 (PDT) Message-Id: <200305080750.h487oUX6019597@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30772 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 07:50:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=30772 Change 30772 by marcel@marcel_pluto1 on 2003/05/08 00:49:29 IFC @30760 Affected files ... .. //depot/projects/tty/Makefile.inc1#6 integrate .. //depot/projects/tty/UPDATING#5 integrate .. //depot/projects/tty/bin/df/df.1#2 integrate .. //depot/projects/tty/bin/ls/ls.1#3 integrate .. //depot/projects/tty/bin/mv/mv.c#3 integrate .. //depot/projects/tty/bin/mv/pathnames.h#2 delete .. //depot/projects/tty/bin/sh/var.c#2 integrate .. //depot/projects/tty/contrib/isc-dhcp/client/clparse.c#2 integrate .. //depot/projects/tty/contrib/tar/src/buffer.c#2 integrate .. //depot/projects/tty/crypto/telnet/libtelnet/auth.c#2 integrate .. //depot/projects/tty/crypto/telnet/libtelnet/enc_des.c#3 integrate .. //depot/projects/tty/crypto/telnet/telnet/authenc.c#2 integrate .. //depot/projects/tty/crypto/telnet/telnet/commands.c#2 integrate .. //depot/projects/tty/crypto/telnet/telnet/main.c#2 integrate .. //depot/projects/tty/crypto/telnet/telnet/network.c#2 integrate .. //depot/projects/tty/crypto/telnet/telnet/ring.c#2 integrate .. //depot/projects/tty/crypto/telnet/telnet/sys_bsd.c#2 integrate .. //depot/projects/tty/crypto/telnet/telnet/telnet.c#2 integrate .. //depot/projects/tty/crypto/telnet/telnet/terminal.c#2 integrate .. //depot/projects/tty/crypto/telnet/telnet/utilities.c#2 integrate .. //depot/projects/tty/crypto/telnet/telnetd/authenc.c#2 integrate .. //depot/projects/tty/crypto/telnet/telnetd/global.c#2 integrate .. //depot/projects/tty/crypto/telnet/telnetd/slc.c#2 integrate .. //depot/projects/tty/crypto/telnet/telnetd/state.c#2 integrate .. //depot/projects/tty/crypto/telnet/telnetd/sys_term.c#2 integrate .. //depot/projects/tty/crypto/telnet/telnetd/telnetd.c#2 integrate .. //depot/projects/tty/crypto/telnet/telnetd/termstat.c#2 integrate .. //depot/projects/tty/crypto/telnet/telnetd/utility.c#2 integrate .. //depot/projects/tty/etc/Makefile#5 integrate .. //depot/projects/tty/etc/devd.conf#4 integrate .. //depot/projects/tty/etc/devfs.conf#1 branch .. //depot/projects/tty/etc/newsyslog.conf#4 integrate .. //depot/projects/tty/etc/pccard_ether#2 integrate .. //depot/projects/tty/etc/rc.d/abi#2 integrate .. //depot/projects/tty/etc/rc.d/apm#3 integrate .. //depot/projects/tty/etc/rc.d/apmd#3 integrate .. //depot/projects/tty/etc/rc.d/archdep#3 integrate .. //depot/projects/tty/etc/rc.d/cron#2 integrate .. //depot/projects/tty/etc/rc.d/devfs#3 integrate .. //depot/projects/tty/etc/rc.d/jail#2 integrate .. //depot/projects/tty/etc/rc.d/kpasswdd#2 integrate .. //depot/projects/tty/etc/rc.d/localdaemons#2 integrate .. //depot/projects/tty/etc/rc.d/network3#2 integrate .. //depot/projects/tty/etc/rc.d/securelevel#3 integrate .. //depot/projects/tty/etc/rc.d/serial#2 integrate .. //depot/projects/tty/etc/rc.d/virecover#3 integrate .. //depot/projects/tty/etc/remote#2 integrate .. //depot/projects/tty/etc/services#3 integrate .. //depot/projects/tty/games/caesar/caesar.c#2 integrate .. //depot/projects/tty/games/fortune/fortune/fortune.c#2 integrate .. //depot/projects/tty/games/fortune/strfile/strfile.c#2 integrate .. //depot/projects/tty/games/fortune/unstr/unstr.c#2 integrate .. //depot/projects/tty/games/pom/pom.c#2 integrate .. //depot/projects/tty/games/random/random.c#4 integrate .. //depot/projects/tty/gnu/usr.bin/binutils/libbinutils/Makefile#2 integrate .. //depot/projects/tty/gnu/usr.bin/binutils/libopcodes/Makefile.amd64#1 branch .. //depot/projects/tty/gnu/usr.bin/cvs/cvs/Makefile#2 integrate .. //depot/projects/tty/include/Makefile#5 integrate .. //depot/projects/tty/include/paths.h#3 integrate .. //depot/projects/tty/include/rpcsvc/bootparam_prot.x#2 integrate .. //depot/projects/tty/include/rpcsvc/crypt.x#2 integrate .. //depot/projects/tty/include/rpcsvc/key_prot.x#2 integrate .. //depot/projects/tty/include/rpcsvc/klm_prot.x#2 integrate .. //depot/projects/tty/include/rpcsvc/mount.x#2 integrate .. //depot/projects/tty/include/rpcsvc/nfs_prot.x#2 integrate .. //depot/projects/tty/include/rpcsvc/nis.x#2 integrate .. //depot/projects/tty/include/rpcsvc/nis_cache.x#2 integrate .. //depot/projects/tty/include/rpcsvc/nis_callback.x#2 integrate .. //depot/projects/tty/include/rpcsvc/nlm_prot.x#2 integrate .. //depot/projects/tty/include/rpcsvc/pmap_prot.x#2 integrate .. //depot/projects/tty/include/rpcsvc/rex.x#2 integrate .. //depot/projects/tty/include/rpcsvc/rnusers.x#2 integrate .. //depot/projects/tty/include/rpcsvc/rquota.x#2 integrate .. //depot/projects/tty/include/rpcsvc/rstat.x#2 integrate .. //depot/projects/tty/include/rpcsvc/sm_inter.x#2 integrate .. //depot/projects/tty/include/rpcsvc/spray.x#2 integrate .. //depot/projects/tty/include/rpcsvc/yp.x#2 integrate .. //depot/projects/tty/include/rpcsvc/yppasswd.x#2 integrate .. //depot/projects/tty/include/rpcsvc/ypupdate_prot.x#2 integrate .. //depot/projects/tty/include/rpcsvc/ypxfrd.x#2 integrate .. //depot/projects/tty/kerberos5/Makefile#2 integrate .. //depot/projects/tty/lib/Makefile#7 integrate .. //depot/projects/tty/lib/csu/common/crtbrand.c#2 integrate .. //depot/projects/tty/lib/csu/i386-elf/Makefile#2 integrate .. //depot/projects/tty/lib/libc/amd64/_fpmath.h#2 integrate .. //depot/projects/tty/lib/libc/amd64/arith.h#2 integrate .. //depot/projects/tty/lib/libc/amd64/gen/Makefile.inc#2 integrate .. //depot/projects/tty/lib/libc/amd64/gen/alloca.S#2 integrate .. //depot/projects/tty/lib/libc/amd64/gen/modf.S#2 integrate .. //depot/projects/tty/lib/libc/amd64/gen/setjmp.S#2 integrate .. //depot/projects/tty/lib/libc/amd64/gen/sigsetjmp.S#2 integrate .. //depot/projects/tty/lib/libc/i386/gen/rfork_thread.S#2 integrate .. //depot/projects/tty/lib/libc/net/getaddrinfo.c#4 integrate .. //depot/projects/tty/lib/libc/net/name6.c#4 integrate .. //depot/projects/tty/lib/libpam/libpam/Makefile#4 integrate .. //depot/projects/tty/lib/libpam/modules/modules.inc#5 integrate .. //depot/projects/tty/lib/libpthread/sys/lock.c#2 integrate .. //depot/projects/tty/lib/libpthread/sys/lock.h#2 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_cancel.c#4 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_create.c#3 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_kern.c#4 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_private.h#4 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_resume_np.c#3 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_sig.c#4 integrate .. //depot/projects/tty/lib/libpthread/thread/thr_suspend_np.c#3 integrate .. //depot/projects/tty/lib/libthr/arch/i386/i386/_setcurthread.c#2 integrate .. //depot/projects/tty/lib/libthr/thread/thr_mutex.c#2 integrate .. //depot/projects/tty/lib/libthr/thread/thr_sig.c#2 integrate .. //depot/projects/tty/lib/libutil/login.conf.5#3 integrate .. //depot/projects/tty/libexec/Makefile#3 integrate .. //depot/projects/tty/libexec/rlogind/rlogind.c#2 integrate .. //depot/projects/tty/libexec/rtld-elf/malloc.c#3 integrate .. //depot/projects/tty/libexec/rtld-elf/map_object.c#3 integrate .. //depot/projects/tty/libexec/rtld-elf/rtld.c#6 integrate .. //depot/projects/tty/libexec/ypxfr/yp_dbwrite.c#2 integrate .. //depot/projects/tty/libexec/ypxfr/ypxfr_getmap.c#2 integrate .. //depot/projects/tty/libexec/ypxfr/ypxfr_main.c#2 integrate .. //depot/projects/tty/libexec/ypxfr/ypxfr_misc.c#2 integrate .. //depot/projects/tty/libexec/ypxfr/ypxfrd_getmap.c#2 integrate .. //depot/projects/tty/release/Makefile#6 integrate .. //depot/projects/tty/release/alpha/dokern.sh#3 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#5 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#4 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/readme/article.sgml#3 integrate .. //depot/projects/tty/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#8 integrate .. //depot/projects/tty/release/doc/share/sgml/release.ent#2 integrate .. //depot/projects/tty/release/i386/dokern.sh#4 integrate .. //depot/projects/tty/sbin/Makefile#4 integrate .. //depot/projects/tty/sbin/atacontrol/atacontrol.c#3 integrate .. //depot/projects/tty/sbin/bsdlabel/Makefile#2 integrate .. //depot/projects/tty/sbin/bsdlabel/bsdlabel.c#2 integrate .. //depot/projects/tty/sbin/dump/main.c#4 integrate .. //depot/projects/tty/sbin/dump/traverse.c#2 integrate .. //depot/projects/tty/sbin/dumpon/dumpon.8#2 integrate .. //depot/projects/tty/sbin/mdmfs/mdmfs.8#3 integrate .. //depot/projects/tty/sbin/routed/rtquery/rtquery.8#2 integrate .. //depot/projects/tty/sbin/shutdown/pathnames.h#2 delete .. //depot/projects/tty/sbin/shutdown/shutdown.c#3 integrate .. //depot/projects/tty/sbin/startslip/startslip.c#2 integrate .. //depot/projects/tty/sbin/vinum/commands.c#4 integrate .. //depot/projects/tty/sbin/vinum/list.c#4 integrate .. //depot/projects/tty/sbin/vinum/vinum.8#2 integrate .. //depot/projects/tty/secure/lib/Makefile#3 integrate .. //depot/projects/tty/secure/lib/libssh/Makefile#3 integrate .. //depot/projects/tty/secure/libexec/Makefile#3 integrate .. //depot/projects/tty/secure/usr.bin/Makefile#3 integrate .. //depot/projects/tty/secure/usr.bin/ssh/Makefile#3 integrate .. //depot/projects/tty/secure/usr.sbin/sshd/Makefile#3 integrate .. //depot/projects/tty/share/dict/web2#2 integrate .. //depot/projects/tty/share/examples/etc/make.conf#5 integrate .. //depot/projects/tty/share/man/man4/geom.4#3 integrate .. //depot/projects/tty/share/man/man5/disktab.5#2 integrate .. //depot/projects/tty/share/man/man5/make.conf.5#5 integrate .. //depot/projects/tty/share/man/man5/rc.conf.5#6 integrate .. //depot/projects/tty/share/man/man7/release.7#4 integrate .. //depot/projects/tty/share/man/man9/malloc.9#5 integrate .. //depot/projects/tty/share/mk/bsd.libnames.mk#4 integrate .. //depot/projects/tty/share/mk/bsd.sys.mk#3 integrate .. //depot/projects/tty/share/sendmail/Makefile#2 integrate .. //depot/projects/tty/share/syscons/keymaps/INDEX.keymaps#2 integrate .. //depot/projects/tty/share/syscons/keymaps/Makefile#2 integrate .. //depot/projects/tty/share/syscons/keymaps/norwegian.dvorak.kbd#1 branch .. //depot/projects/tty/sys/Makefile#2 integrate .. //depot/projects/tty/sys/alpha/include/_limits.h#2 integrate .. //depot/projects/tty/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/tty/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/tty/sys/amd64/include/_limits.h#2 integrate .. //depot/projects/tty/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/tty/sys/arm/include/_limits.h#2 integrate .. //depot/projects/tty/sys/boot/common/help.common#3 integrate .. //depot/projects/tty/sys/boot/common/loader.8#4 integrate .. //depot/projects/tty/sys/compat/linux/linux_ipc.c#4 integrate .. //depot/projects/tty/sys/conf/NOTES#8 integrate .. //depot/projects/tty/sys/conf/newvers.sh#2 integrate .. //depot/projects/tty/sys/dev/aic7xxx/ahc_eisa.c#2 integrate .. //depot/projects/tty/sys/dev/aic7xxx/ahc_pci.c#2 integrate .. //depot/projects/tty/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic7770.c#2 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic79xx.c#4 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic79xx.h#4 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic79xx.reg#4 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic79xx.seq#3 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic79xx_inline.h#4 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic79xx_osm.c#4 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic79xx_pci.c#4 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic7xxx.c#2 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic7xxx.h#2 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic7xxx.reg#2 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic7xxx_inline.h#2 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic7xxx_osm.c#3 integrate .. //depot/projects/tty/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate .. //depot/projects/tty/sys/dev/ata/ata-all.c#7 integrate .. //depot/projects/tty/sys/dev/ata/ata-all.h#5 integrate .. //depot/projects/tty/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/tty/sys/dev/ata/ata-pci.c#4 integrate .. //depot/projects/tty/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/tty/sys/dev/ata/ata-raid.c#6 integrate .. //depot/projects/tty/sys/dev/ata/ata-raid.h#4 integrate .. //depot/projects/tty/sys/dev/ata/atapi-tape.c#5 integrate .. //depot/projects/tty/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/tty/sys/dev/bge/if_bgereg.h#5 integrate .. //depot/projects/tty/sys/dev/em/if_em.c#4 integrate .. //depot/projects/tty/sys/dev/en/midway.c#5 integrate .. //depot/projects/tty/sys/dev/en/midwayvar.h#3 integrate .. //depot/projects/tty/sys/dev/firewire/firewire.c#7 integrate .. //depot/projects/tty/sys/dev/firewire/sbp.c#7 integrate .. //depot/projects/tty/sys/dev/mii/brgphy.c#3 integrate .. //depot/projects/tty/sys/dev/pccbb/pccbb.c#4 integrate .. //depot/projects/tty/sys/dev/pccbb/pccbbdevid.h#3 integrate .. //depot/projects/tty/sys/dev/sio/sio.c#6 integrate .. //depot/projects/tty/sys/dev/usb/uhci_pci.c#3 integrate .. //depot/projects/tty/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/tty/sys/dev/usb/usbdevs.h#7 integrate .. //depot/projects/tty/sys/dev/usb/usbdevs_data.h#7 integrate .. //depot/projects/tty/sys/dev/vinum/vinum.c#5 integrate .. //depot/projects/tty/sys/dev/vinum/vinumconfig.c#3 integrate .. //depot/projects/tty/sys/dev/vinum/vinumext.h#5 integrate .. //depot/projects/tty/sys/dev/vinum/vinumio.c#5 integrate .. //depot/projects/tty/sys/dev/vinum/vinumio.h#2 integrate .. //depot/projects/tty/sys/dev/vinum/vinumioctl.c#5 integrate .. //depot/projects/tty/sys/dev/vinum/vinumkw.h#3 integrate .. //depot/projects/tty/sys/dev/vinum/vinumlock.c#3 integrate .. //depot/projects/tty/sys/dev/vinum/vinumobj.h#2 integrate .. //depot/projects/tty/sys/dev/vinum/vinumparser.c#3 integrate .. //depot/projects/tty/sys/dev/vinum/vinumrequest.c#4 integrate .. //depot/projects/tty/sys/dev/vinum/vinumrevive.c#3 integrate .. //depot/projects/tty/sys/fs/procfs/procfs_dbregs.c#2 integrate .. //depot/projects/tty/sys/fs/procfs/procfs_fpregs.c#2 integrate .. //depot/projects/tty/sys/fs/procfs/procfs_regs.c#2 integrate .. //depot/projects/tty/sys/fs/udf/udf.h#2 integrate .. //depot/projects/tty/sys/fs/udf/udf_vfsops.c#4 integrate .. //depot/projects/tty/sys/fs/udf/udf_vnops.c#5 integrate .. //depot/projects/tty/sys/geom/bde/g_bde.c#5 integrate .. //depot/projects/tty/sys/geom/bde/g_bde_work.c#4 integrate .. //depot/projects/tty/sys/geom/geom.h#5 integrate .. //depot/projects/tty/sys/geom/geom_aes.c#4 integrate .. //depot/projects/tty/sys/geom/geom_bsd.c#5 integrate .. //depot/projects/tty/sys/geom/geom_bsd_enc.c#2 integrate .. //depot/projects/tty/sys/geom/geom_ctl.c#4 integrate .. //depot/projects/tty/sys/geom/geom_io.c#6 integrate .. //depot/projects/tty/sys/i386/include/_limits.h#2 integrate .. //depot/projects/tty/sys/i386/isa/intr_machdep.c#3 integrate .. //depot/projects/tty/sys/ia64/include/_limits.h#2 integrate .. //depot/projects/tty/sys/kern/kern_mac.c#5 integrate .. //depot/projects/tty/sys/kern/kern_malloc.c#6 integrate .. //depot/projects/tty/sys/kern/kern_sig.c#6 integrate .. //depot/projects/tty/sys/kern/kern_subr.c#5 integrate .. //depot/projects/tty/sys/kern/kern_synch.c#6 integrate .. //depot/projects/tty/sys/kern/md5c.c#2 integrate .. //depot/projects/tty/sys/kern/sysv_shm.c#4 integrate .. //depot/projects/tty/sys/kern/uipc_syscalls.c#6 integrate .. //depot/projects/tty/sys/kern/vfs_default.c#6 integrate .. //depot/projects/tty/sys/net/if_atm.h#4 integrate .. //depot/projects/tty/sys/net/if_atmsubr.c#5 integrate .. //depot/projects/tty/sys/net/if_ethersubr.c#5 integrate .. //depot/projects/tty/sys/netinet/ip_input.c#6 integrate .. //depot/projects/tty/sys/netinet/tcp_input.c#7 integrate .. //depot/projects/tty/sys/netinet/tcp_subr.c#5 integrate .. //depot/projects/tty/sys/netinet/tcp_var.h#5 integrate .. //depot/projects/tty/sys/pci/if_en_pci.c#3 integrate .. //depot/projects/tty/sys/pci/if_sis.c#5 integrate .. //depot/projects/tty/sys/powerpc/include/_limits.h#2 integrate .. //depot/projects/tty/sys/powerpc/powerpc/ofwmagic.S#2 integrate .. //depot/projects/tty/sys/sparc64/include/_limits.h#2 integrate .. //depot/projects/tty/sys/sparc64/sparc64/trap.c#6 integrate .. //depot/projects/tty/sys/sys/dkstat.h#3 integrate .. //depot/projects/tty/sys/sys/limits.h#2 integrate .. //depot/projects/tty/sys/sys/signalvar.h#3 integrate .. //depot/projects/tty/sys/sys/soundcard.h#3 integrate .. //depot/projects/tty/sys/sys/syscallsubr.h#4 integrate .. //depot/projects/tty/sys/vm/swap_pager.c#4 integrate .. //depot/projects/tty/sys/vm/vm_object.c#6 integrate .. //depot/projects/tty/sys/vm/vm_pageout.c#5 integrate .. //depot/projects/tty/sys/vm/vm_pager.c#4 integrate .. //depot/projects/tty/sys/vm/vnode_pager.c#4 integrate .. //depot/projects/tty/tools/tools/tinderbox/tbmaster.pl#6 integrate .. //depot/projects/tty/usr.bin/Makefile#4 integrate .. //depot/projects/tty/usr.bin/calendar/calendars/calendar.freebsd#5 integrate .. //depot/projects/tty/usr.bin/vi/pathnames.h#2 integrate .. //depot/projects/tty/usr.bin/xlint/lint1/param.h#2 integrate .. //depot/projects/tty/usr.bin/xlint/xlint/xlint.c#3 integrate .. //depot/projects/tty/usr.sbin/burncd/burncd.8#3 integrate .. //depot/projects/tty/usr.sbin/burncd/burncd.c#2 integrate .. //depot/projects/tty/usr.sbin/newsyslog/newsyslog.c#5 integrate .. //depot/projects/tty/usr.sbin/pw/pw.8#2 integrate .. //depot/projects/tty/usr.sbin/sysinstall/menus.c#5 integrate .. //depot/projects/tty/usr.sbin/syslogd/syslogd.c#4 integrate .. //depot/projects/tty/usr.sbin/usbd/usbd.8#3 integrate Differences ... ==== //depot/projects/tty/Makefile.inc1#6 (text+ko) ==== @@ -1,8 +1,8 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.353 2003/05/01 20:41:03 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.356 2003/05/05 12:54:26 bde Exp $ # # Make command line options: -# -DMAKE_KERBEROS5 to build Kerberos5 +# -DNO_KERBEROS Do not build Heimdal (Kerberos 5) # -DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir # -DNOCLEAN do not clean at all # -DNOCRYPT will prevent building of crypt versions @@ -61,7 +61,7 @@ SUBDIR+= gnu .endif .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ - !defined(NOCRYPT) && !defined(NO_OPENSSL) && defined(MAKE_KERBEROS5) + !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_KERBEROS) SUBDIR+= kerberos5 .endif .if exists(${.CURDIR}/libexec) @@ -119,7 +119,9 @@ .endif MAKEOBJDIRPREFIX?= /usr/obj +.if !defined(OSRELDATE) OSRELDATE!= sysctl -n kern.osreldate +.endif TARGET_ARCH?= ${MACHINE_ARCH} .if ${TARGET_ARCH} == ${MACHINE_ARCH} TARGET?= ${MACHINE} @@ -277,14 +279,10 @@ mkdir -p ${WORLDTMP}/legacy/${_dir} .endfor .for _dir in \ - usr/bin usr/lib/compat/aout usr/libdata/ldscripts usr/libexec usr/share/misc + usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \ + usr/libexec usr/share/misc mkdir -p ${WORLDTMP}/${_dir} .endfor -.for _dir in \ - arpa dev fs g++/backward g++/bits g++/ext isc isofs libmilter \ - objc openssl protocols readline rpc rpcsvc security ufs - mkdir -p ${WORLDTMP}/usr/include/${_dir} -.endfor ln -sf ${.CURDIR}/sys ${WORLDTMP} _legacy: @echo @@ -695,7 +693,7 @@ .endif .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ - !defined(NOCRYPT) && defined(MAKE_KERBEROS5) + !defined(NOCRYPT) && !defined(NO_KERBEROS) _libkrb5= kerberos5/lib/libroken kerberos5/lib/libvers \ kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl .endif @@ -782,7 +780,7 @@ _generic_libs= gnu/lib -.if !defined(NOCRYPT) && defined(MAKE_KERBEROS5) +.if !defined(NOCRYPT) && !defined(NO_KERBEROS) _prebuild_libs+= kerberos5/lib/libasn1 _prebuild_libs+= kerberos5/lib/libgssapi _prebuild_libs+= kerberos5/lib/libkrb5 ==== //depot/projects/tty/UPDATING#5 (text+ko) ==== @@ -17,6 +17,17 @@ developers choose to disable these features on build machines to maximize performance. +20030505: + Kerberos 5 (Heimdal) is now built by default. Setting + MAKE_KERBEROS5 no longer has any effect. If you do NOT + want the "base" Kerberos 5, you need to set NO_KERBEROS. + +20030502: + groff has been updated. If you try to do a buildworld and + get an infinite loop in troff, update to May 4th or newer. If you + have a newer kernel than userland, you may need to set the OSRELDATE + to 500110 in your environment before starting a buildworld. + 20030501: The old rc system has been removed. Please report any problems to freebsd-rc@yahoogroups.com, and/or freebsd-current@freebsd.org. @@ -25,7 +36,6 @@ especially when using mergemaster, since the compatibility code that utilizes these old scripts has also been removed. - 20030423: A bug has been fixed in /dev/devctl which would cause devd to hang on boot, were it not for a workaround in devd. The @@ -1268,4 +1278,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.249 2003/05/02 05:27:33 dougb Exp $ +$FreeBSD: src/UPDATING,v 1.251 2003/05/05 20:05:37 markm Exp $ ==== //depot/projects/tty/bin/df/df.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)df.1 8.3 (Berkeley) 5/8/95 -.\" $FreeBSD: src/bin/df/df.1,v 1.28 2002/08/26 04:56:23 trhodes Exp $ +.\" $FreeBSD: src/bin/df/df.1,v 1.29 2003/05/06 21:54:46 trhodes Exp $ .\" .Dd May 8, 1995 .Dt DF 1 @@ -81,11 +81,11 @@ .It Fl H "Human-readable" output. Use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte and Petabyte in order to reduce the number of -digits to three or less using base 10 for sizes. +digits to four or fewer using base 10 for sizes. .It Fl h "Human-readable" output. Use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte and Petabyte in order to reduce the number of -digits to three or less using base 2 for sizes. +digits to four or fewer using base 2 for sizes. .It Fl i Include statistics on the number of free inodes. .It Fl k ==== //depot/projects/tty/bin/ls/ls.1#3 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.73 2003/01/20 21:25:00 chris Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.74 2003/05/06 21:54:46 trhodes Exp $ .\" .Dd May 19, 2002 .Dt LS 1 @@ -175,7 +175,7 @@ When used with the .Fl l option, use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte -and Petabyte in order to reduce the number of digits to three or less +and Petabyte in order to reduce the number of digits to four or fewer using base 2 for sizes. .It Fl i For each file, print the file's file serial number (inode number). ==== //depot/projects/tty/bin/mv/mv.c#3 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.40 2003/05/01 16:58:56 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.41 2003/05/05 22:49:22 obrien Exp $"); #include #include @@ -67,8 +67,6 @@ #include #include -#include "pathnames.h" - int fflg, iflg, nflg, vflg; int copy(char *, char *); ==== //depot/projects/tty/bin/sh/var.c#2 (text+ko) ==== @@ -40,10 +40,11 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.23 2002/10/01 00:54:14 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.24 2003/05/05 22:49:22 obrien Exp $"); #include #include +#include /* * Shell variables. @@ -105,7 +106,7 @@ NULL }, { &vmpath, VSTRFIXED|VTEXTFIXED|VUNSET, "MAILPATH=", NULL }, - { &vpath, VSTRFIXED|VTEXTFIXED, "PATH=/bin:/usr/bin", + { &vpath, VSTRFIXED|VTEXTFIXED, "PATH=" _PATH_DEFPATH, changepath }, { &vppid, VSTRFIXED|VTEXTFIXED|VUNSET, "PPID=", NULL }, ==== //depot/projects/tty/contrib/isc-dhcp/client/clparse.c#2 (text+ko) ==== @@ -44,7 +44,7 @@ #ifndef lint static char copyright[] = "$Id: clparse.c,v 1.62.2.3 2002/11/17 02:25:43 dhankins Exp $ Copyright (c) 1996-2002 The Internet Software Consortium. All rights reserved.\n" -"$FreeBSD: src/contrib/isc-dhcp/client/clparse.c,v 1.9 2003/01/16 07:22:32 obrien Exp $\n"; +"$FreeBSD: src/contrib/isc-dhcp/client/clparse.c,v 1.10 2003/05/05 22:49:22 obrien Exp $\n"; #endif /* not lint */ #include "dhcpd.h" @@ -53,7 +53,7 @@ struct client_config top_level_config; -char client_script_name [] = "/sbin/dhclient-script"; +char client_script_name [] = _PATH_DHCLIENT_SCRIPT; u_int32_t default_requested_options [] = { DHO_SUBNET_MASK, ==== //depot/projects/tty/contrib/tar/src/buffer.c#2 (text+ko) ==== @@ -19,12 +19,18 @@ with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/tar/src/buffer.c,v 1.5 2002/10/09 07:33:29 sobomax Exp $ */ +/* $FreeBSD: src/contrib/tar/src/buffer.c,v 1.6 2003/05/05 22:49:22 obrien Exp $ */ #include "system.h" #include +#if __FreeBSD__ +# include +#else +# define _PATH_BSHELL "/bin/sh" +#endif + #if MSDOS # include #endif @@ -1549,7 +1555,7 @@ pid_t child; const char *shell = getenv ("SHELL"); if (! shell) - shell = "/bin/sh"; + shell = _PATH_BSHELL; child = xfork (); if (child == 0) { ==== //depot/projects/tty/crypto/telnet/libtelnet/auth.c#2 (text+ko) ==== @@ -30,16 +30,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/crypto/telnet/libtelnet/auth.c,v 1.9 2001/12/03 12:13:18 markm Exp $ */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/libtelnet/auth.c,v 1.9 2001/12/03 12:13:18 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)auth.c 8.3 (Berkeley) 5/30/95"; #endif /* not lint */ +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/libtelnet/auth.c,v 1.10 2003/05/04 02:54:48 obrien Exp $"); + /* * Copyright (C) 1990 by the Massachusetts Institute of Technology ==== //depot/projects/tty/crypto/telnet/libtelnet/enc_des.c#3 (text+ko) ==== @@ -29,17 +29,15 @@ * 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: src/crypto/telnet/libtelnet/enc_des.c,v 1.9 2003/01/29 18:14:28 nectar Exp $ */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/libtelnet/enc_des.c,v 1.9 2003/01/29 18:14:28 nectar Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)enc_des.c 8.3 (Berkeley) 5/30/95"; #endif /* not lint */ +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/libtelnet/enc_des.c,v 1.10 2003/05/04 02:54:48 obrien Exp $"); #ifdef ENCRYPTION # ifdef AUTHENTICATION ==== //depot/projects/tty/crypto/telnet/telnet/authenc.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/authenc.c,v 1.5 2001/11/30 21:06:35 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)authenc.c 8.1 (Berkeley) 6/6/93"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/authenc.c,v 1.6 2003/05/04 02:54:48 obrien Exp $"); #ifdef AUTHENTICATION #ifdef ENCRYPTION ==== //depot/projects/tty/crypto/telnet/telnet/commands.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/commands.c,v 1.29 2002/11/27 06:34:24 eric Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)commands.c 8.4 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/commands.c,v 1.30 2003/05/04 02:54:48 obrien Exp $"); #include #include ==== //depot/projects/tty/crypto/telnet/telnet/main.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/main.c,v 1.16 2002/09/25 07:26:24 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)main.c 8.3 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/main.c,v 1.17 2003/05/04 02:54:48 obrien Exp $"); #include #include ==== //depot/projects/tty/crypto/telnet/telnet/network.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/network.c,v 1.6 2002/05/11 03:19:44 alfred Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)network.c 8.2 (Berkeley) 12/15/93"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/network.c,v 1.7 2003/05/04 02:54:48 obrien Exp $"); #include #include ==== //depot/projects/tty/crypto/telnet/telnet/ring.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/ring.c,v 1.6 2001/11/30 21:06:36 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)ring.c 8.2 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/ring.c,v 1.7 2003/05/04 02:54:48 obrien Exp $"); /* * This defines a structure for a ring buffer. ==== //depot/projects/tty/crypto/telnet/telnet/sys_bsd.c#2 (text+ko) ==== @@ -31,15 +31,13 @@ * SUCH DAMAGE. */ -#include -#include -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/sys_bsd.c,v 1.11 2002/09/25 07:24:01 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)sys_bsd.c 8.4 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/sys_bsd.c,v 1.12 2003/05/04 02:54:48 obrien Exp $"); /* * The following routines try to encapsulate what is system dependent @@ -49,9 +47,11 @@ #include #include #include +#include #include #include #include +#include #include #include ==== //depot/projects/tty/crypto/telnet/telnet/telnet.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/telnet.c,v 1.12 2002/09/25 07:26:25 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)telnet.c 8.4 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/telnet.c,v 1.13 2003/05/04 02:54:48 obrien Exp $"); #include ==== //depot/projects/tty/crypto/telnet/telnet/terminal.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/terminal.c,v 1.6 2002/05/11 03:19:44 alfred Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)terminal.c 8.2 (Berkeley) 2/16/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/terminal.c,v 1.7 2003/05/04 02:54:48 obrien Exp $"); #include #include ==== //depot/projects/tty/crypto/telnet/telnet/utilities.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/utilities.c,v 1.7 2002/05/11 03:19:44 alfred Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)utilities.c 8.3 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/utilities.c,v 1.8 2003/05/04 02:54:48 obrien Exp $"); #define TELOPTS #define TELCMDS ==== //depot/projects/tty/crypto/telnet/telnetd/authenc.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/authenc.c,v 1.7 2001/11/30 21:06:38 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)authenc.c 8.2 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/authenc.c,v 1.8 2003/05/04 02:54:49 obrien Exp $"); #ifdef AUTHENTICATION #ifdef ENCRYPTION ==== //depot/projects/tty/crypto/telnet/telnetd/global.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint -#if 0 static const char sccsid[] = "@(#)global.c 8.1 (Berkeley) 6/4/93"; +#endif /* not lint */ #endif -static const char rcsid[] = - "$FreeBSD: src/crypto/telnet/telnetd/global.c,v 1.5 2000/07/16 05:52:45 peter Exp $"; -#endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/global.c,v 1.6 2003/05/04 02:54:49 obrien Exp $"); /* * Allocate global variables. We do this ==== //depot/projects/tty/crypto/telnet/telnetd/slc.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/slc.c,v 1.8 2001/11/30 21:06:38 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)slc.c 8.2 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/slc.c,v 1.9 2003/05/04 02:54:49 obrien Exp $"); #include "telnetd.h" ==== //depot/projects/tty/crypto/telnet/telnetd/state.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/state.c,v 1.13 2002/09/25 07:28:04 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)state.c 8.5 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/state.c,v 1.14 2003/05/04 02:54:49 obrien Exp $"); #include #include "telnetd.h" ==== //depot/projects/tty/crypto/telnet/telnetd/sys_term.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/sys_term.c,v 1.17 2002/05/27 08:10:21 jmallett Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)sys_term.c 8.4+1 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/sys_term.c,v 1.18 2003/05/04 02:54:49 obrien Exp $"); #include #include ==== //depot/projects/tty/crypto/telnet/telnetd/telnetd.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/telnetd.c,v 1.21 2001/11/30 22:28:07 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)telnetd.c 8.4 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/telnetd.c,v 1.22 2003/05/04 02:54:49 obrien Exp $"); #include "telnetd.h" #include "pathnames.h" ==== //depot/projects/tty/crypto/telnet/telnetd/termstat.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/termstat.c,v 1.11 2001/11/30 21:06:38 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)termstat.c 8.2 (Berkeley) 5/30/95"; #endif +#endif +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/termstat.c,v 1.12 2003/05/04 02:54:49 obrien Exp $"); #include "telnetd.h" ==== //depot/projects/tty/crypto/telnet/telnetd/utility.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint -#if 0 static const char sccsid[] = "@(#)utility.c 8.4 (Berkeley) 5/30/95"; +#endif /* not lint */ #endif -static const char rcsid[] = - "$FreeBSD: src/crypto/telnet/telnetd/utility.c,v 1.12 2001/11/30 21:06:38 markm Exp $"; -#endif /* not lint */ +#include +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/utility.c,v 1.13 2003/05/04 02:54:49 obrien Exp $"); #ifdef __FreeBSD__ #include ==== //depot/projects/tty/etc/Makefile#5 (text+ko) ==== @@ -1,13 +1,13 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.312 2003/05/02 22:27:31 dougb Exp $ +# $FreeBSD: src/etc/Makefile,v 1.313 2003/05/06 07:25:17 dougb Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail .endif BIN1= amd.map apmd.conf auth.conf \ - crontab csh.cshrc csh.login csh.logout \ - devd.conf dhclient.conf disktab fbtab ftpusers gettytab group \ + crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \ + dhclient.conf disktab fbtab ftpusers gettytab group \ hosts hosts.allow hosts.equiv hosts.lpd \ inetd.conf login.access login.conf \ mac.conf motd netconfig network.subr networks newsyslog.conf \ ==== //depot/projects/tty/etc/devd.conf#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.3 2003/05/03 10:16:55 akiyama Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.4 2003/05/07 15:48:20 imp Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -64,9 +64,10 @@ }; # Don't even try to second guess what to do about drivers that don't -# match here. Instead, pass it off to a smart script to deal. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 8 00:54:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A60937B404; Thu, 8 May 2003 00:54:41 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2B95437B401 for ; Thu, 8 May 2003 00:54:41 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B729943F3F for ; Thu, 8 May 2003 00:54:40 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h487se0U019722 for ; Thu, 8 May 2003 00:54:40 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h487seXc019719 for perforce@freebsd.org; Thu, 8 May 2003 00:54:40 -0700 (PDT) Date: Thu, 8 May 2003 00:54:40 -0700 (PDT) Message-Id: <200305080754.h487seXc019719@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30775 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 07:54:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=30775 Change 30775 by peter@peter_daintree on 2003/05/08 00:54:06 IFC @30774 Affected files ... .. //depot/projects/hammer/gnu/usr.bin/binutils/libopcodes/Makefile.amd64#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Thu May 8 01:22:16 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F393137B404; Thu, 8 May 2003 01:22:15 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8D6B637B401 for ; Thu, 8 May 2003 01:22:15 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3247C43F93 for ; Thu, 8 May 2003 01:22:15 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h488MF0U021728 for ; Thu, 8 May 2003 01:22:15 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h488MEIg021724 for perforce@freebsd.org; Thu, 8 May 2003 01:22:14 -0700 (PDT) Date: Thu, 8 May 2003 01:22:14 -0700 (PDT) Message-Id: <200305080822.h488MEIg021724@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30777 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 08:22:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=30777 Change 30777 by peter@peter_overcee on 2003/05/08 01:21:28 Change the page IDTVEC back to an interrupt gate instead of a trap gate. Otherwise we could preempt and %cr2 could be reused on another process when it faults. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#12 edit .. //depot/projects/hammer/sys/amd64/amd64/trap.c#6 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#12 (text+ko) ==== @@ -1219,7 +1219,7 @@ setidt(11, &IDTVEC(missing), SDT_SYSTGT, SEL_KPL, 0); setidt(12, &IDTVEC(stk), SDT_SYSTGT, SEL_KPL, 0); setidt(13, &IDTVEC(prot), SDT_SYSTGT, SEL_KPL, 0); - setidt(14, &IDTVEC(page), SDT_SYSTGT, SEL_KPL, 0); + setidt(14, &IDTVEC(page), SDT_SYSIGT, SEL_KPL, 0); setidt(15, &IDTVEC(rsvd), SDT_SYSTGT, SEL_KPL, 0); setidt(16, &IDTVEC(fpu), SDT_SYSTGT, SEL_KPL, 0); setidt(17, &IDTVEC(align), SDT_SYSTGT, SEL_KPL, 0); ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#6 (text+ko) ==== @@ -213,9 +213,17 @@ * do the VM lookup, so just consider it a fatal trap so the * kernel can print out a useful trap message and even get * to the debugger. + * + * Note that T_PAGEFLT is registered as an interrupt gate. This + * is just like a trap gate, except interrupts are disabled. This + * happens to be critically important, because we could otherwise + * preempt and run another process that may cause %cr2 to be + * clobbered for something else. */ eva = rcr2(); - if (PCPU_GET(spinlocks) != NULL) + if (PCPU_GET(spinlocks) == NULL) + enable_intr(); + else trap_fatal(&frame, eva); } From owner-p4-projects@FreeBSD.ORG Thu May 8 01:28:25 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9358637B404; Thu, 8 May 2003 01:28:24 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 48AC837B401 for ; Thu, 8 May 2003 01:28:24 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E817743FD7 for ; Thu, 8 May 2003 01:28:23 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h488SN0U022025 for ; Thu, 8 May 2003 01:28:23 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h488SNce022022 for perforce@freebsd.org; Thu, 8 May 2003 01:28:23 -0700 (PDT) Date: Thu, 8 May 2003 01:28:23 -0700 (PDT) Message-Id: <200305080828.h488SNce022022@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30779 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 08:28:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=30779 Change 30779 by peter@peter_overcee on 2003/05/08 01:27:34 IFC @30778 Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#13 integrate .. //depot/projects/hammer/sys/amd64/amd64/trap.c#7 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#13 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.567 2003/05/08 00:13:24 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.568 2003/05/08 08:25:51 peter Exp $ */ #include "opt_atalk.h" ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#7 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/amd64/amd64/trap.c,v 1.252 2003/05/01 01:05:21 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/trap.c,v 1.253 2003/05/08 08:25:51 peter Exp $ */ /* From owner-p4-projects@FreeBSD.ORG Thu May 8 01:58:03 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5705D37B404; Thu, 8 May 2003 01:58:03 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DAF0337B401 for ; Thu, 8 May 2003 01:58:02 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 70F2643FDF for ; Thu, 8 May 2003 01:58:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h488w20U023250 for ; Thu, 8 May 2003 01:58:02 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h488w1qi023247 for perforce@freebsd.org; Thu, 8 May 2003 01:58:01 -0700 (PDT) Date: Thu, 8 May 2003 01:58:01 -0700 (PDT) Message-Id: <200305080858.h488w1qi023247@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30783 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 08:58:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=30783 Change 30783 by peter@peter_overcee on 2003/05/08 01:57:33 usr.sbin/ppp/ncpaddr.c ICE's gcc-3.2.2 (but not 3.3) Affected files ... .. //depot/projects/hammer/usr.sbin/Makefile#10 edit Differences ... ==== //depot/projects/hammer/usr.sbin/Makefile#10 (text+ko) ==== @@ -74,7 +74,6 @@ pciconf \ periodic \ pkg_install \ - ppp \ pppd \ pppstats \ procctl \ @@ -134,6 +133,10 @@ ypset \ zic +.if ${MACHINE_ARCH} != "amd64" +SUBDIR+=ppp +.endif + .if !defined(NO_IPFILTER) SUBDIR+=ipftest \ ipresend \ From owner-p4-projects@FreeBSD.ORG Thu May 8 02:09:18 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AE25237B404; Thu, 8 May 2003 02:09:17 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 59A7137B401 for ; Thu, 8 May 2003 02:09:17 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DFA3843F85 for ; Thu, 8 May 2003 02:09:16 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4899G0U024649 for ; Thu, 8 May 2003 02:09:16 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4899GNM024646 for perforce@freebsd.org; Thu, 8 May 2003 02:09:16 -0700 (PDT) Date: Thu, 8 May 2003 02:09:16 -0700 (PDT) Message-Id: <200305080909.h4899GNM024646@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30784 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 09:09:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=30784 Change 30784 by peter@peter_overcee on 2003/05/08 02:08:35 pppd isn't happy either. Affected files ... .. //depot/projects/hammer/usr.sbin/Makefile#11 edit Differences ... ==== //depot/projects/hammer/usr.sbin/Makefile#11 (text+ko) ==== @@ -74,7 +74,6 @@ pciconf \ periodic \ pkg_install \ - pppd \ pppstats \ procctl \ pstat \ @@ -134,7 +133,8 @@ zic .if ${MACHINE_ARCH} != "amd64" -SUBDIR+=ppp +SUBDIR+=ppp \ + pppd .endif .if !defined(NO_IPFILTER) From owner-p4-projects@FreeBSD.ORG Thu May 8 06:53:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4FC2637B405; Thu, 8 May 2003 06:53:13 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DC32337B401 for ; Thu, 8 May 2003 06:53:12 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 367FD43FA3 for ; Thu, 8 May 2003 06:53:12 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h48DrC0U046868 for ; Thu, 8 May 2003 06:53:12 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h48DrBi3046865 for perforce@freebsd.org; Thu, 8 May 2003 06:53:11 -0700 (PDT) Date: Thu, 8 May 2003 06:53:11 -0700 (PDT) Message-Id: <200305081353.h48DrBi3046865@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 30802 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 13:53:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=30802 Change 30802 by jhb@jhb_laptop on 2003/05/08 06:53:01 Use td_critnest instead of the spinlocks list since the spinlocks list is only used if WITNESS is enabled. Affected files ... .. //depot/projects/smpng/sys/i386/i386/trap.c#56 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/trap.c#56 (text+ko) ==== @@ -222,10 +222,10 @@ type); /* * Page faults need interrupts diasabled until later, - * and we shouldn't enable interrupts while holding a - * spin lock. + * and we shouldn't enable interrupts while in a + * critical section. */ - if (type != T_PAGEFLT && PCPU_GET(spinlocks) == NULL) + if (type != T_PAGEFLT && td->td_critnest == 0) enable_intr(); } } @@ -240,7 +240,7 @@ * are finally ready to read %cr2 and then must * reenable interrupts. * - * If we get a page fault while holding a spin lock, then + * If we get a page fault while in a critical section, then * it is most likely a fatal kernel page fault. The kernel * is already going to panic trying to get a sleep lock to * do the VM lookup, so just consider it a fatal trap so the @@ -248,7 +248,7 @@ * to the debugger. */ eva = rcr2(); - if (PCPU_GET(spinlocks) == NULL) + if (td->td_critnest == 0) enable_intr(); else trap_fatal(&frame, eva); From owner-p4-projects@FreeBSD.ORG Thu May 8 07:18:46 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C08FA37B404; Thu, 8 May 2003 07:18:45 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5830337B401 for ; Thu, 8 May 2003 07:18:45 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 27F2143F3F for ; Thu, 8 May 2003 07:18:44 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h48EIi0U048777 for ; Thu, 8 May 2003 07:18:44 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h48EIh0b048773 for perforce@freebsd.org; Thu, 8 May 2003 07:18:43 -0700 (PDT) Date: Thu, 8 May 2003 07:18:43 -0700 (PDT) Message-Id: <200305081418.h48EIh0b048773@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 30803 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 14:18:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=30803 Change 30803 by rwatson@rwatson_tislabs on 2003/05/08 07:18:18 Further integrate the MAC branch; libthr fixes, rc.d fixes, loop back of various MAC bits including TCP bug fix, removal of redundant label copy in ip_input(). Affected files ... .. //depot/projects/trustedbsd/mac/UPDATING#27 integrate .. //depot/projects/trustedbsd/mac/bin/df/df.1#5 integrate .. //depot/projects/trustedbsd/mac/bin/ls/ls.1#18 integrate .. //depot/projects/trustedbsd/mac/bin/mv/mv.c#10 integrate .. //depot/projects/trustedbsd/mac/bin/mv/pathnames.h#4 delete .. //depot/projects/trustedbsd/mac/bin/sh/var.c#7 integrate .. //depot/projects/trustedbsd/mac/contrib/isc-dhcp/client/clparse.c#6 integrate .. //depot/projects/trustedbsd/mac/contrib/tar/src/buffer.c#5 integrate .. //depot/projects/trustedbsd/mac/etc/Makefile#29 integrate .. //depot/projects/trustedbsd/mac/etc/devd.conf#4 integrate .. //depot/projects/trustedbsd/mac/etc/devfs.conf#1 branch .. //depot/projects/trustedbsd/mac/etc/newsyslog.conf#9 integrate .. //depot/projects/trustedbsd/mac/etc/pccard_ether#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/abi#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/apm#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/apmd#7 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/archdep#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/cron#3 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/devfs#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/jail#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/kpasswdd#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/localdaemons#2 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/network3#4 integrate .. //depot/projects/trustedbsd/mac/etc/rc.d/securelevel#6 integrate .. //depot/projects/trustedbsd/mac/etc/remote#3 integrate .. //depot/projects/trustedbsd/mac/etc/services#8 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/cvs/cvs/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/include/paths.h#7 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/gen/rfork_thread.S#4 integrate .. //depot/projects/trustedbsd/mac/lib/libpam/libpam/Makefile#16 integrate .. //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_cancel.c#4 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/arch/i386/i386/_setcurthread.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_mutex.c#2 integrate .. //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_sig.c#2 integrate .. //depot/projects/trustedbsd/mac/release/alpha/dokern.sh#9 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#16 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/readme/article.sgml#11 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#55 integrate .. //depot/projects/trustedbsd/mac/release/doc/share/sgml/release.ent#6 integrate .. //depot/projects/trustedbsd/mac/sbin/Makefile#16 integrate .. //depot/projects/trustedbsd/mac/sbin/bsdlabel/Makefile#2 integrate .. //depot/projects/trustedbsd/mac/sbin/dump/main.c#17 integrate .. //depot/projects/trustedbsd/mac/sbin/dump/traverse.c#12 integrate .. //depot/projects/trustedbsd/mac/sbin/mdmfs/mdmfs.8#9 integrate .. //depot/projects/trustedbsd/mac/sbin/shutdown/pathnames.h#3 delete .. //depot/projects/trustedbsd/mac/sbin/shutdown/shutdown.c#4 integrate .. //depot/projects/trustedbsd/mac/sbin/startslip/startslip.c#3 integrate .. //depot/projects/trustedbsd/mac/sbin/vinum/commands.c#8 integrate .. //depot/projects/trustedbsd/mac/sbin/vinum/vinum.8#8 integrate .. //depot/projects/trustedbsd/mac/share/examples/etc/make.conf#20 integrate .. //depot/projects/trustedbsd/mac/share/man/man4/geom.4#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/malloc.9#7 integrate .. //depot/projects/trustedbsd/mac/share/mk/bsd.sys.mk#9 integrate .. //depot/projects/trustedbsd/mac/share/sendmail/Makefile#3 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/trustedbsd/mac/sys/conf/NOTES#39 integrate .. //depot/projects/trustedbsd/mac/sys/conf/newvers.sh#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/trustedbsd/mac/sys/dev/em/if_em.c#19 integrate .. //depot/projects/trustedbsd/mac/sys/dev/en/midway.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/dev/en/midwayvar.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/dev/usb/uhci_pci.c#3 integrate .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumrequest.c#9 integrate .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumrevive.c#8 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_aes.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_bsd.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_io.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/i386/isa/intr_machdep.c#10 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#386 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_sig.c#29 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_subr.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_synch.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/kern/uipc_syscalls.c#32 integrate .. //depot/projects/trustedbsd/mac/sys/kern/vfs_default.c#20 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_atm.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/net/if_atmsubr.c#13 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/ip_input.c#31 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_input.c#39 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_subr.c#33 integrate .. //depot/projects/trustedbsd/mac/sys/netinet/tcp_var.h#13 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_en_pci.c#4 integrate .. //depot/projects/trustedbsd/mac/sys/pci/if_sis.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/sys/dkstat.h#3 integrate .. //depot/projects/trustedbsd/mac/sys/sys/signalvar.h#12 integrate .. //depot/projects/trustedbsd/mac/sys/sys/syscallsubr.h#5 integrate .. //depot/projects/trustedbsd/mac/sys/vm/swap_pager.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_object.c#27 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_pager.c#11 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vnode_pager.c#21 integrate .. //depot/projects/trustedbsd/mac/tools/tools/tinderbox/tbmaster.pl#5 integrate .. //depot/projects/trustedbsd/mac/usr.bin/calendar/calendars/calendar.freebsd#22 integrate .. //depot/projects/trustedbsd/mac/usr.bin/vi/pathnames.h#2 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/newsyslog/newsyslog.c#14 integrate Differences ... ==== //depot/projects/trustedbsd/mac/UPDATING#27 (text+ko) ==== @@ -17,6 +17,11 @@ developers choose to disable these features on build machines to maximize performance. +20030505: + Kerberos 5 (Heimdal) is now built by default. Setting + MAKE_KERBEROS5 no longer has any effect. If you do NOT + want the "base" Kerberos 5, you need to set NO_KERBEROS. + 20030502: groff has been updated. If you try to do a buildworld and get an infinite loop in troff, update to May 4th or newer. If you @@ -1273,4 +1278,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.250 2003/05/04 06:26:30 imp Exp $ +$FreeBSD: src/UPDATING,v 1.251 2003/05/05 20:05:37 markm Exp $ ==== //depot/projects/trustedbsd/mac/bin/df/df.1#5 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)df.1 8.3 (Berkeley) 5/8/95 -.\" $FreeBSD: src/bin/df/df.1,v 1.28 2002/08/26 04:56:23 trhodes Exp $ +.\" $FreeBSD: src/bin/df/df.1,v 1.29 2003/05/06 21:54:46 trhodes Exp $ .\" .Dd May 8, 1995 .Dt DF 1 @@ -81,11 +81,11 @@ .It Fl H "Human-readable" output. Use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte and Petabyte in order to reduce the number of -digits to three or less using base 10 for sizes. +digits to four or fewer using base 10 for sizes. .It Fl h "Human-readable" output. Use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte and Petabyte in order to reduce the number of -digits to three or less using base 2 for sizes. +digits to four or fewer using base 2 for sizes. .It Fl i Include statistics on the number of free inodes. .It Fl k ==== //depot/projects/trustedbsd/mac/bin/ls/ls.1#18 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ls.1 8.7 (Berkeley) 7/29/94 -.\" $FreeBSD: src/bin/ls/ls.1,v 1.73 2003/01/20 21:25:00 chris Exp $ +.\" $FreeBSD: src/bin/ls/ls.1,v 1.74 2003/05/06 21:54:46 trhodes Exp $ .\" .Dd May 19, 2002 .Dt LS 1 @@ -175,7 +175,7 @@ When used with the .Fl l option, use unit suffixes: Byte, Kilobyte, Megabyte, Gigabyte, Terabyte -and Petabyte in order to reduce the number of digits to three or less +and Petabyte in order to reduce the number of digits to four or fewer using base 2 for sizes. .It Fl i For each file, print the file's file serial number (inode number). ==== //depot/projects/trustedbsd/mac/bin/mv/mv.c#10 (text+ko) ==== @@ -46,7 +46,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.40 2003/05/01 16:58:56 obrien Exp $"); +__FBSDID("$FreeBSD: src/bin/mv/mv.c,v 1.41 2003/05/05 22:49:22 obrien Exp $"); #include #include @@ -67,8 +67,6 @@ #include #include -#include "pathnames.h" - int fflg, iflg, nflg, vflg; int copy(char *, char *); ==== //depot/projects/trustedbsd/mac/bin/sh/var.c#7 (text+ko) ==== @@ -40,10 +40,11 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.23 2002/10/01 00:54:14 tjr Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.24 2003/05/05 22:49:22 obrien Exp $"); #include #include +#include /* * Shell variables. @@ -105,7 +106,7 @@ NULL }, { &vmpath, VSTRFIXED|VTEXTFIXED|VUNSET, "MAILPATH=", NULL }, - { &vpath, VSTRFIXED|VTEXTFIXED, "PATH=/bin:/usr/bin", + { &vpath, VSTRFIXED|VTEXTFIXED, "PATH=" _PATH_DEFPATH, changepath }, { &vppid, VSTRFIXED|VTEXTFIXED|VUNSET, "PPID=", NULL }, ==== //depot/projects/trustedbsd/mac/contrib/isc-dhcp/client/clparse.c#6 (text+ko) ==== @@ -44,7 +44,7 @@ #ifndef lint static char copyright[] = "$Id: clparse.c,v 1.62.2.3 2002/11/17 02:25:43 dhankins Exp $ Copyright (c) 1996-2002 The Internet Software Consortium. All rights reserved.\n" -"$FreeBSD: src/contrib/isc-dhcp/client/clparse.c,v 1.9 2003/01/16 07:22:32 obrien Exp $\n"; +"$FreeBSD: src/contrib/isc-dhcp/client/clparse.c,v 1.10 2003/05/05 22:49:22 obrien Exp $\n"; #endif /* not lint */ #include "dhcpd.h" @@ -53,7 +53,7 @@ struct client_config top_level_config; -char client_script_name [] = "/sbin/dhclient-script"; +char client_script_name [] = _PATH_DHCLIENT_SCRIPT; u_int32_t default_requested_options [] = { DHO_SUBNET_MASK, ==== //depot/projects/trustedbsd/mac/contrib/tar/src/buffer.c#5 (text+ko) ==== @@ -19,12 +19,18 @@ with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/tar/src/buffer.c,v 1.5 2002/10/09 07:33:29 sobomax Exp $ */ +/* $FreeBSD: src/contrib/tar/src/buffer.c,v 1.6 2003/05/05 22:49:22 obrien Exp $ */ #include "system.h" #include +#if __FreeBSD__ +# include +#else +# define _PATH_BSHELL "/bin/sh" +#endif + #if MSDOS # include #endif @@ -1549,7 +1555,7 @@ pid_t child; const char *shell = getenv ("SHELL"); if (! shell) - shell = "/bin/sh"; + shell = _PATH_BSHELL; child = xfork (); if (child == 0) { ==== //depot/projects/trustedbsd/mac/etc/Makefile#29 (text+ko) ==== @@ -1,13 +1,13 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.312 2003/05/02 22:27:31 dougb Exp $ +# $FreeBSD: src/etc/Makefile,v 1.313 2003/05/06 07:25:17 dougb Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail .endif BIN1= amd.map apmd.conf auth.conf \ - crontab csh.cshrc csh.login csh.logout \ - devd.conf dhclient.conf disktab fbtab ftpusers gettytab group \ + crontab csh.cshrc csh.login csh.logout devd.conf devfs.conf \ + dhclient.conf disktab fbtab ftpusers gettytab group \ hosts hosts.allow hosts.equiv hosts.lpd \ inetd.conf login.access login.conf \ mac.conf motd netconfig network.subr networks newsyslog.conf \ ==== //depot/projects/trustedbsd/mac/etc/devd.conf#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.3 2003/05/03 10:16:55 akiyama Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.4 2003/05/07 15:48:20 imp Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -64,9 +64,10 @@ }; # Don't even try to second guess what to do about drivers that don't -# match here. Instead, pass it off to a smart script to deal. +# match here. Instead, pass it off to syslog. Commented out for the +# moment, as pnpinfo isn't set in devd yet nomatch 0 { - action "logger Unknown device: $pnpinfo $location $bus"; + // action "logger Unknown device: $pnpinfo $location $bus"; }; /* EXAMPLES TO END OF FILE ==== //depot/projects/trustedbsd/mac/etc/newsyslog.conf#9 (text+ko) ==== @@ -1,5 +1,14 @@ # configuration file for newsyslog -# $FreeBSD: src/etc/newsyslog.conf,v 1.44 2003/04/08 16:14:02 des Exp $ +# $FreeBSD: src/etc/newsyslog.conf,v 1.46 2003/05/05 19:08:33 gad Exp $ +# +# Entries which do not specify the '/pid_file' field will cause the +# syslogd process to be signalled when that log file is rotated. This +# action is only appropriate for log files which are written to by the +# syslogd process (ie, files listed in /etc/syslogd.conf). If there +# is no process which needs to be signalled when a given log file is +# rotated, then the entry for that file should include the 'N' flag. +# +# The 'flags' field is one or more of the letters: BCGJNUWZ or a '-'. # # Note: some sites will want to select more restrictive protections than the # defaults. In particular, it may be desirable to switch many of the 644 @@ -7,23 +16,23 @@ # contents of maillog, messages, and lpd-errs to be confidential. In the # future, these defaults may change to more conservative ones. # -# logfilename [owner:group] mode count size when [ZJB] [/pid_file] [sig_num] +# logfilename [owner:group] mode count size when flags [/pid_file] [sig_num] /var/log/all.log 600 7 * @T00 J /var/log/amd.log 644 7 100 * J /var/log/auth.log 600 7 100 * J /var/log/console.log 600 5 100 * J /var/log/cron 600 3 100 * J -/var/log/daily.log 640 7 * @T00 J +/var/log/daily.log 640 7 * @T00 JN /var/log/debug.log 600 7 100 * J /var/log/kerberos.log 600 7 100 * J /var/log/lpd-errs 644 7 100 * J /var/log/maillog 640 7 * @T00 J /var/log/messages 644 5 100 * J -/var/log/monthly.log 640 12 * $M1D0 J +/var/log/monthly.log 640 12 * $M1D0 JN /var/log/ppp.log root:network 640 3 100 * J /var/log/security 600 10 100 * J /var/log/sendmail.st 640 10 * 168 B /var/log/slip.log root:network 640 3 100 * J -/var/log/weekly.log 640 5 1 $W6D0 J +/var/log/weekly.log 640 5 1 $W6D0 JN /var/log/wtmp 644 3 * @01T05 B /var/log/xferlog 600 7 100 * J ==== //depot/projects/trustedbsd/mac/etc/pccard_ether#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh - # -# $FreeBSD: src/etc/pccard_ether,v 1.28 2002/12/12 09:31:09 imp Exp $ +# $FreeBSD: src/etc/pccard_ether,v 1.29 2003/05/05 19:06:46 ume Exp $ # # pccard_ether interfacename [start|stop] [ifconfig option] # @@ -134,8 +134,8 @@ # IPv6 setup case ${ipv6_enable} in [Yy][Ee][Ss]) - if [ -r /etc/rc.network6 ]; then - . /etc/rc.network6 + if [ -r /etc/rc.d/network_ipv6 ]; then + . /etc/rc.d/network_ipv6 network6_interface_setup ${interface} fi ;; ==== //depot/projects/trustedbsd/mac/etc/rc.d/abi#2 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/abi,v 1.1 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/abi,v 1.2 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: abi # REQUIRE: LOGIN +# BEFORE: securelevel # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/trustedbsd/mac/etc/rc.d/apm#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/apm,v 1.2 2003/05/02 08:35:17 mtm Exp $ +# $FreeBSD: src/etc/rc.d/apm,v 1.3 2003/05/05 23:55:43 obrien Exp $ # # PROVIDE: apm @@ -19,7 +19,7 @@ apm_precmd() { case `${SYSCTL_N} hw.machine_arch` in - i386|amd64) + i386) return 0 ;; esac ==== //depot/projects/trustedbsd/mac/etc/rc.d/apmd#7 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: apmd,v 1.5 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/apmd,v 1.6 2003/05/02 08:35:17 mtm Exp $ +# $FreeBSD: src/etc/rc.d/apmd,v 1.7 2003/05/06 00:09:51 obrien Exp $ # # PROVIDE: apmd @@ -24,7 +24,7 @@ apmd_prestart() { case `${SYSCTL_N} hw.machine_arch` in - i386|amd64) + i386) # Start apm if it is not already running /etc/rc.d/apm forcestatus > /dev/null || /etc/rc.d/apm forcestart ;; ==== //depot/projects/trustedbsd/mac/etc/rc.d/archdep#4 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/archdep,v 1.4 2003/05/02 08:35:17 mtm Exp $ +# $FreeBSD: src/etc/rc.d/archdep,v 1.5 2003/05/06 00:09:51 obrien Exp $ # # PROVIDE: archdep @@ -56,7 +56,7 @@ _arch=`${SYSCTL_N} hw.machine` echo -n "Initial $_arch initialization:" case $_arch in -i386|amd64) +i386) ibcs2_compat ;; alpha) ==== //depot/projects/trustedbsd/mac/etc/rc.d/cron#3 (text+ko) ==== @@ -1,11 +1,12 @@ #!/bin/sh # # $NetBSD: cron,v 1.5 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/cron,v 1.2 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/cron,v 1.3 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: cron # REQUIRE: LOGIN +# BEFORE: securelevel # KEYWORD: FreeBSD NetBSD shutdown . /etc/rc.subr ==== //depot/projects/trustedbsd/mac/etc/rc.d/devfs#4 (text+ko) ==== @@ -1,27 +1,41 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/devfs,v 1.3 2003/05/02 08:10:58 mtm Exp $ +# $FreeBSD: src/etc/rc.d/devfs,v 1.5 2003/05/06 01:10:33 dougb Exp $ # # PROVIDE: devfs # REQUIRE: LOGIN +# BEFORE: securelevel # KEYWORD: FreeBSD . /etc/rc.subr name="devfs" +start_cmd='read_devfs_conf' +stop_cmd=':' + +read_devfs_conf() +{ + if [ -r /etc/devfs.conf ]; then + cd /dev + while read action device parameter; do + case "${action}" in + l*) if [ -c ${device} -a ! -e ${parameter} ]; then + ln -fs ${device} ${parameter} + fi + ;; + o*) if [ -c ${device} ]; then + chown ${parameter} ${device} + fi + ;; + p*) if [ -c ${device} ]; then + chmod ${parameter} ${device} + fi + ;; + esac + done < /etc/devfs.conf + fi +} load_rc_config $name - -# Setup DEVFS, ie permissions, links etc. -# -if [ -c /dev/ttyv0 -a ! -e /dev/vga ];then - ln -fs /dev/ttyv0 /dev/vga -fi - -# XXX - in case the user has a customized /etc/rc.devfs we need to keep -# pulling it in until we have a better way of doing this in rc.d. -# -if [ -r /etc/rc.devfs ]; then - sh /etc/rc.devfs -fi +run_rc_command "$1" ==== //depot/projects/trustedbsd/mac/etc/rc.d/jail#2 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.3 2003/04/19 07:50:32 mtm Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.4 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: jail # REQUIRE: LOGIN +# BEFORE: securelevel # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/trustedbsd/mac/etc/rc.d/kpasswdd#2 (text+ko) ==== @@ -1,10 +1,10 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/kpasswdd,v 1.1 2003/04/30 20:58:49 markm Exp $ +# $FreeBSD: src/etc/rc.d/kpasswdd,v 1.2 2003/05/06 02:28:03 mtm Exp $ # # PROVIDE: kpasswdd -# REQUIRE: kadmind5 +# REQUIRE: kadmin # BEFORE: DAEMON # KEYWORD: FreeBSD ==== //depot/projects/trustedbsd/mac/etc/rc.d/localdaemons#2 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/localdaemons,v 1.1 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/localdaemons,v 1.2 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: localdaemons # REQUIRE: abi +# BEFORE: securelevel # KEYWORD: FreeBSD shutdown . /etc/rc.subr ==== //depot/projects/trustedbsd/mac/etc/rc.d/network3#4 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/network3,v 1.136 2002/10/12 10:31:31 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/network3,v 1.137 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: network3 # REQUIRE: localdaemons +# BEFORE: securelevel # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/trustedbsd/mac/etc/rc.d/securelevel#6 (text+ko) ==== @@ -1,12 +1,10 @@ #!/bin/sh # # $NetBSD: securelevel,v 1.4 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/securelevel,v 1.5 2003/04/24 08:27:29 mtm Exp $ +# $FreeBSD: src/etc/rc.d/securelevel,v 1.6 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: securelevel -# REQUIRE: aftermountlkm ipnat mountd -# BEFORE: DAEMON # KEYWORD: FreeBSD NetBSD . /etc/rc.subr ==== //depot/projects/trustedbsd/mac/etc/remote#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/remote,v 1.11 2001/02/21 19:45:47 nik Exp $ +# $FreeBSD: src/etc/remote,v 1.12 2003/05/05 21:37:43 dougb Exp $ # # @(#)remote 5.2 (Berkeley) 6/30/90 # @@ -52,7 +52,7 @@ cuaa0c|cua0c:dv=/dev/cuaa0:br#9600:pa=none: # Finger friendly shortcuts -com1:dv=/dev/cuaa0:br#9600:pa=none: -com2:dv=/dev/cuaa1:br#9600:pa=none: -com3:dv=/dev/cuaa2:br#9600:pa=none: -com4:dv=/dev/cuaa3:br#9600:pa=none: +sio0|com1:dv=/dev/cuaa0:br#9600:pa=none: +sio1|com2:dv=/dev/cuaa1:br#9600:pa=none: +sio2|com3:dv=/dev/cuaa2:br#9600:pa=none: +sio3|com4:dv=/dev/cuaa3:br#9600:pa=none: ==== //depot/projects/trustedbsd/mac/etc/services#8 (text+ko) ==== @@ -16,7 +16,7 @@ # Kerberos services are for Kerberos v4, and are unofficial. Sites running # v5 should uncomment v5 entries and comment v4 entries. # -# $FreeBSD: src/etc/services,v 1.92 2003/04/29 09:54:06 mdodd Exp $ +# $FreeBSD: src/etc/services,v 1.93 2003/05/05 22:10:14 dougb Exp $ # From: @(#)services 5.8 (Berkeley) 5/9/91 # # WELL KNOWN PORT NUMBERS @@ -1198,6 +1198,7 @@ accessbuilder 888/tcp accessbuilder 888/udp swat 901/tcp # samba web configuration tool +rndc 953/tcp # named's rndc control socket ftps-data 989/tcp # ftp protocol, data, over TLS/SSL ftps-data 989/udp ftps 990/tcp # ftp protocol, control, over TLS/SSL @@ -1922,6 +1923,8 @@ dec-notes 3333/tcp #DEC Notes dec-notes 3333/udp #DEC Notes rsvp-encap 3455/udp #RSVP encapsulated in UDP +nut 3493/tcp #Network UPS Tools +nut 3493/udp #Network UPS Tools mapper-nodemgr 3984/tcp #MAPPER network node manager mapper-nodemgr 3984/udp #MAPPER network node manager mapper-mapethd 3985/tcp #MAPPER TCP/IP server ==== //depot/projects/trustedbsd/mac/gnu/usr.bin/cvs/cvs/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cvs/cvs/Makefile,v 1.40 2003/01/21 23:00:35 peter Exp $ +# $FreeBSD: src/gnu/usr.bin/cvs/cvs/Makefile,v 1.41 2003/05/05 16:50:42 nectar Exp $ MAINTAINER= peter@FreeBSD.org @@ -30,15 +30,12 @@ DPADD+= ${LIBCVS} ${LIBDIFF} ${LIBGNUREGEX} ${LIBMD} ${LIBCRYPT} ${LIBZ} LDADD+= ${LIBCVS} ${LIBDIFF} -lgnuregex -lmd -lcrypt -lz -.if defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) && !defined(NOCRYPT) -CFLAGS+=-DHAVE_KERBEROS -DHAVE_KRB_GET_ERR_TEXT -LDADD+= -lkrb -lcrypto -lcom_err -DPADD+= ${LIBKRB} ${LIBCRYPTO} ${LIBCOM_ERR} -DISTRIBUTION= krb4 -# XXX do we want to mess with this? It's probably not really worth it for -# the public freebsd stuff, but others might want it. It's an optional -# feature anyway, the -x switch is needed to activate it. -CFLAGS+= -DENCRYPTION +.if !defined(NO_KERBEROS) && !defined(NO_OPENSSL) && !defined(NOCRYPT) +CFLAGS+= -DHAVE_GSSAPI -DHAVE_GSSAPI_H -DENCRYPTION +LDADD+= -lgssapi -lkrb5 -lasn1 -lcrypto -lroken -lcrypt -lcom_err +DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBROKEN} +DPADD+= ${LIBCRYPT} ${LIBCOM_ERR} +DISTRIBUTION= crypto .endif # ==== //depot/projects/trustedbsd/mac/include/paths.h#7 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)paths.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/include/paths.h,v 1.18 2003/04/07 16:21:25 mdodd Exp $ + * $FreeBSD: src/include/paths.h,v 1.19 2003/05/05 22:49:22 obrien Exp $ */ #ifndef _PATHS_H_ @@ -59,6 +59,8 @@ #define _PATH_DRUM "/dev/drum" #define _PATH_ETC "/etc" #define _PATH_FTPUSERS "/etc/ftpusers" +#define _PATH_HALT "/sbin/halt" +#define _PATH_IFCONFIG "/sbin/ifconfig" #define _PATH_KMEM "/dev/kmem" #define _PATH_LIBMAP_CONF "/etc/libmap.conf" #define _PATH_LOGIN "/usr/bin/login" @@ -67,7 +69,9 @@ #define _PATH_MEM "/dev/mem" #define _PATH_NOLOGIN "/var/run/nologin" #define _PATH_RCP "/bin/rcp" +#define _PATH_REBOOT "/sbin/reboot" #define _PATH_RLOGIN "/usr/bin/rlogin" +#define _PATH_RM "/bin/rm" #define _PATH_RSH "/usr/bin/rsh" #define _PATH_SENDMAIL "/usr/sbin/sendmail" #define _PATH_SHELLS "/etc/shells" ==== //depot/projects/trustedbsd/mac/lib/libc/i386/gen/rfork_thread.S#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/rfork_thread.S,v 1.4 2002/03/23 02:44:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/i386/gen/rfork_thread.S,v 1.5 2003/05/07 17:23:25 jhb Exp $"); /* * With thanks to John Dyson for the original version of this. @@ -109,5 +109,9 @@ * Branch here if the thread creation fails: */ 2: + addl $8, %esp + popl %esi + movl %ebp, %esp + popl %ebp PIC_PROLOGUE jmp PIC_PLT(HIDENAME(cerror)) ==== //depot/projects/trustedbsd/mac/lib/libpam/libpam/Makefile#16 (text+ko) ==== @@ -33,7 +33,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/lib/libpam/libpam/Makefile,v 1.43 2003/05/01 14:55:06 des Exp $ +# $FreeBSD: src/lib/libpam/libpam/Makefile,v 1.44 2003/05/05 21:15:35 des Exp $ OPENPAM= ${.CURDIR}/../../../contrib/openpam .PATH: ${OPENPAM}/include ${OPENPAM}/lib ${OPENPAM}/doc/man @@ -127,7 +127,7 @@ pam_vprompt.3 CSTD?= c99 -WARNS?= 5 +WARNS?= 6 CFLAGS+= -I${.CURDIR} -I${OPENPAM}/include CFLAGS+= -DLIB_MAJ=${SHLIB_MAJOR} ==== //depot/projects/trustedbsd/mac/lib/libpthread/thread/thr_cancel.c#4 (text+ko) ==== @@ -1,6 +1,6 @@ /* * David Leonard , 1999. Public domain. - * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.19 2003/04/28 23:56:11 deischen Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.20 2003/05/06 00:02:54 deischen Exp $ */ #include #include @@ -64,16 +64,7 @@ break; case PS_JOIN: - /* - * Disconnect the thread from the joinee: - */ - if (pthread->join_status.thread != NULL) { - pthread->join_status.thread->joiner - = NULL; - pthread->join_status.thread = NULL; - } pthread->cancelflags |= THR_CANCELLING; - _thr_setrunnable_unlocked(pthread); break; case PS_SUSPENDED: ==== //depot/projects/trustedbsd/mac/lib/libthr/arch/i386/i386/_setcurthread.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (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: src/lib/libthr/arch/i386/i386/_setcurthread.c,v 1.3 2003/04/03 03:34:49 jake Exp $ + * $FreeBSD: src/lib/libthr/arch/i386/i386/_setcurthread.c,v 1.4 2003/05/06 02:33:49 mtm Exp $ */ #include @@ -62,7 +62,10 @@ void _retire_thread(void *entry) { - *(void **)entry = *ldt_free; + if (ldt_free == NULL) + *(void **)entry = NULL; + else + *(void **)entry = *ldt_free; ldt_free = entry; } ==== //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_mutex.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.3 2003/04/02 03:05:39 jeff Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.4 2003/05/06 02:30:52 mtm Exp $ */ #include #include @@ -471,7 +471,7 @@ int ret = 0; PTHREAD_ASSERT((mutex != NULL) && (*mutex != NULL), - "Uninitialized mutex in pthread_mutex_trylock_basic"); + "Uninitialized mutex in mutex_lock_common"); /* * Enter a loop waiting to become the mutex owner. We need a ==== //depot/projects/trustedbsd/mac/lib/libthr/thread/thr_sig.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ * (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: src/lib/libthr/thread/thr_sig.c,v 1.2 2003/04/02 03:05:39 jeff Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_sig.c,v 1.3 2003/05/06 02:30:52 mtm Exp $ */ #include @@ -124,28 +124,25 @@ curthread->state = psd.psd_state; curthread->flags = psd.psd_flags; - /* Check the threads previous state: */ - if (psd.psd_state != PS_RUNNING) { - /* - * Do a little cleanup handling for those threads in - * queues before calling the signal handler. Signals - * for these threads are temporarily blocked until - * after cleanup handling. - */ - switch (psd.psd_state) { - case PS_COND_WAIT: - _cond_wait_backout(curthread); - psd.psd_state = PS_RUNNING; - break; + /* + * Do a little cleanup handling for those threads in + * queues before calling the signal handler. Signals + * for these threads are temporarily blocked until + * after cleanup handling. + */ + switch (psd.psd_state) { + case PS_COND_WAIT: + _cond_wait_backout(curthread); + psd.psd_state = PS_RUNNING; + break; - case PS_MUTEX_WAIT: - /* _mutex_lock_backout(curthread); XXXTHR */ - psd.psd_state = PS_RUNNING; - break; + case PS_MUTEX_WAIT: + /* _mutex_lock_backout(curthread); XXXTHR */ + psd.psd_state = PS_RUNNING; + break; - default: - break; - } + default: + break; } if (_thread_sigact[sig -1].sa_handler != NULL) { ==== //depot/projects/trustedbsd/mac/release/alpha/dokern.sh#9 (text+ko) ==== @@ -1,60 +1,64 @@ #!/bin/sh # -# $FreeBSD: src/release/alpha/dokern.sh,v 1.66 2003/03/22 14:23:23 ru Exp $ +# $FreeBSD: src/release/alpha/dokern.sh,v 1.68 2003/05/07 18:14:00 obrien Exp $ # +# XXX sort by order in GENERIC, not alphabetical + sed \ - -e '/DDB/d' \ + -e 's/ident.*GENERIC/ident BOOTMFS/g' -e '/DEBUG/d' \ -e '/DEC_KN8AE/d' \ - -e '/INVARIANTS/d' \ - -e '/INVARIANT_SUPPORT/d' \ - -e '/KTRACE/d' \ - -e '/MSDOSFS/d' \ + -e '/SOFTUPDATES/d' \ + -e '/UFS_ACL/d' \ + -e '/UFS_DIRHASH/d' \ -e '/NFSSERVER/d' \ -e '/NFS_ROOT/d' \ + -e '/MSDOSFS/d' \ -e '/PROCFS/d' \ -e '/PSEUDOFS/d' \ - -e '/SMP/d' \ - -e '/SOFTUPDATES/d' \ + -e '/KTRACE/d' \ -e '/SYSV/d' \ - -e '/UFS_ACL/d' \ - -e '/UFS_DIRHASH/d' \ -e '/_KPOSIX_PRIORITY_SCHEDULING/d' \ + -e '/DDB/d' \ + -e '/INVARIANTS/d' \ + -e '/INVARIANT_SUPPORT/d' \ + -e '/WITNESS/d' \ + -e '/SMP/d' \ -e '/ atapifd /d' \ -e '/ atapist /d' \ - -e '/ aue /d' \ -e '/ ch /d' \ - -e '/ cue /d' \ - -e '/ faith /d' \ - -e '/ gif /d' \ - -e '/ kue /d' \ - -e '/ lpt /d' \ - -e '/ ohci /d' \ -e '/ pass /d' \ + -e '/ sa /d' \ + -e '/ ses /d' \ + -e '/ splash /d' \ + -e '/ ppc$/d' \ -e '/ ppbus /d' \ - -e '/ ppc$/d' \ + -e '/ lpt /d' \ -e '/ ppi /d' \ - -e '/ ppp /d' \ - -e '/ pty /d' \ - -e '/ random /d' \ - -e '/ sa /d' \ - -e '/ ses /d' \ -e '/ sf /d' \ -e '/ sis /d' \ + -e '/ ste /d' \ + -e '/ wb /d' \ + -e '/ random /d' \ -e '/ sl /d' \ - -e '/ splash /d' \ - -e '/ ste /d' \ + -e '/ ppp /d' \ + -e '/ pty /d' \ + -e '/ gif /d' \ + -e '/ faith /d' \ + -e '/ uhci /d' \ + -e '/ ohci /d' \ + -e '/ usb /d' \ -e '/ ugen /d' \ - -e '/ uhci /d' \ -e '/ uhid /d' \ -e '/ ukbd /d' \ -e '/ ulpt /d' \ -e '/ umass /d' \ -e '/ ums /d' \ - -e '/ usb /d' \ - -e '/ wb /d' \ - -e 's/ident.*GENERIC/ident BOOTMFS/g' + -e '/ aue /d' \ + -e '/ axe /d' \ + -e '/ cue /d' \ + -e '/ kue /d' \ echo "options SCSI_NO_OP_STRINGS" echo "options SCSI_NO_SENSE_STRINGS" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 8 07:39:53 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F02537B401; Thu, 8 May 2003 07:39:52 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A9DE537B404 for ; Thu, 8 May 2003 07:39:51 -0700 (PDT) Received: from mail.speakeasy.net (mail16.speakeasy.net [216.254.0.216]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1D74843F85 for ; Thu, 8 May 2003 07:39:46 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 27758 invoked from network); 8 May 2003 14:39:48 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender )encrypted SMTP for ; 8 May 2003 14:39:48 -0000 Received: from laptop.baldwin.cx ([216.133.140.1]) by server.baldwin.cx (8.12.8/8.12.8) with ESMTP id h48Edhp0008627; Thu, 8 May 2003 10:39:43 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.4 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <200305080822.h488MEIg021724@repoman.freebsd.org> Date: Thu, 08 May 2003 10:39:50 -0400 (EDT) From: John Baldwin To: Peter Wemm cc: Perforce Change Reviews Subject: RE: PERFORCE change 30777 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 14:39:53 -0000 On 08-May-2003 Peter Wemm wrote: > http://perforce.freebsd.org/chv.cgi?CH=30777 > > Change 30777 by peter@peter_overcee on 2003/05/08 01:21:28 > > Change the page IDTVEC back to an interrupt gate instead of a trap > gate. Otherwise we could preempt and %cr2 could be reused on another > process when it faults. > > Affected files ... > > .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#12 edit > .. //depot/projects/hammer/sys/amd64/amd64/trap.c#6 edit > > Differences ... > > ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#12 (text+ko) ==== > > @@ -1219,7 +1219,7 @@ > setidt(11, &IDTVEC(missing), SDT_SYSTGT, SEL_KPL, 0); > setidt(12, &IDTVEC(stk), SDT_SYSTGT, SEL_KPL, 0); > setidt(13, &IDTVEC(prot), SDT_SYSTGT, SEL_KPL, 0); > - setidt(14, &IDTVEC(page), SDT_SYSTGT, SEL_KPL, 0); > + setidt(14, &IDTVEC(page), SDT_SYSIGT, SEL_KPL, 0); > setidt(15, &IDTVEC(rsvd), SDT_SYSTGT, SEL_KPL, 0); > setidt(16, &IDTVEC(fpu), SDT_SYSTGT, SEL_KPL, 0); > setidt(17, &IDTVEC(align), SDT_SYSTGT, SEL_KPL, 0); > > ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#6 (text+ko) ==== > > @@ -213,9 +213,17 @@ > * do the VM lookup, so just consider it a fatal trap so the > * kernel can print out a useful trap message and even get > * to the debugger. > + * > + * Note that T_PAGEFLT is registered as an interrupt gate. This > + * is just like a trap gate, except interrupts are disabled. This > + * happens to be critically important, because we could otherwise > + * preempt and run another process that may cause %cr2 to be > + * clobbered for something else. > */ > eva = rcr2(); > - if (PCPU_GET(spinlocks) != NULL) > + if (PCPU_GET(spinlocks) == NULL) > + enable_intr(); > + else > trap_fatal(&frame, eva); > } The spinlocks check only works if witness is on. What you want to do is check td_critnest > 0 instead. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ From owner-p4-projects@FreeBSD.ORG Thu May 8 08:15:24 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 521C737B401; Thu, 8 May 2003 08:15:23 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CC25237B49F; Thu, 8 May 2003 08:15:22 -0700 (PDT) Received: from canning.wemm.org (canning.wemm.org [192.203.228.65]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4D6FA43F85; Thu, 8 May 2003 08:15:22 -0700 (PDT) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by canning.wemm.org (Postfix) with ESMTP id 36B8D2A8AB; Thu, 8 May 2003 08:15:22 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.5 07/13/2001 with nmh-1.0.4 To: John Baldwin In-Reply-To: Date: Thu, 08 May 2003 08:15:22 -0700 From: Peter Wemm Message-Id: <20030508151522.36B8D2A8AB@canning.wemm.org> cc: Perforce Change Reviews Subject: Re: PERFORCE change 30777 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 15:15:24 -0000 John Baldwin wrote: > > On 08-May-2003 Peter Wemm wrote: > > http://perforce.freebsd.org/chv.cgi?CH=30777 > > > > Change 30777 by peter@peter_overcee on 2003/05/08 01:21:28 > > > > Change the page IDTVEC back to an interrupt gate instead of a trap > > gate. Otherwise we could preempt and %cr2 could be reused on another > > process when it faults. > > > > Affected files ... > > > > .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#12 edit > > .. //depot/projects/hammer/sys/amd64/amd64/trap.c#6 edit > > > > Differences ... > > > > ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#12 (text+ko) ==== > > > > @@ -1219,7 +1219,7 @@ > > setidt(11, &IDTVEC(missing), SDT_SYSTGT, SEL_KPL, 0); > > setidt(12, &IDTVEC(stk), SDT_SYSTGT, SEL_KPL, 0); > > setidt(13, &IDTVEC(prot), SDT_SYSTGT, SEL_KPL, 0); > > - setidt(14, &IDTVEC(page), SDT_SYSTGT, SEL_KPL, 0); > > + setidt(14, &IDTVEC(page), SDT_SYSIGT, SEL_KPL, 0); > > setidt(15, &IDTVEC(rsvd), SDT_SYSTGT, SEL_KPL, 0); > > setidt(16, &IDTVEC(fpu), SDT_SYSTGT, SEL_KPL, 0); > > setidt(17, &IDTVEC(align), SDT_SYSTGT, SEL_KPL, 0); > > > > ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#6 (text+ko) ==== > > > > @@ -213,9 +213,17 @@ > > * do the VM lookup, so just consider it a fatal trap so the > > * kernel can print out a useful trap message and even get > > * to the debugger. > > + * > > + * Note that T_PAGEFLT is registered as an interrupt gate. T his > > + * is just like a trap gate, except interrupts are disabled. This > > + * happens to be critically important, because we could other wise > > + * preempt and run another process that may cause %cr2 to be > > + * clobbered for something else. > > */ > > eva = rcr2(); > > - if (PCPU_GET(spinlocks) != NULL) > > + if (PCPU_GET(spinlocks) == NULL) > > + enable_intr(); > > + else > > trap_fatal(&frame, eva); > > } > > The spinlocks check only works if witness is on. What you want to > do is check td_critnest > 0 instead. Hmm. I was just going by the i386 code. Is that wrong too, or is this because I'm using the cheat implementation of the nonlazy critical masking? Cheers, -Peter -- Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com "All of this is for nothing if we don't go to the stars" - JMS/B5 From owner-p4-projects@FreeBSD.ORG Thu May 8 09:53:25 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 658FF37B404; Thu, 8 May 2003 09:53:24 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D388337B401 for ; Thu, 8 May 2003 09:53:23 -0700 (PDT) Received: from mail.speakeasy.net (mail15.speakeasy.net [216.254.0.215]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2D1B343F85 for ; Thu, 8 May 2003 09:53:23 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: (qmail 16470 invoked from network); 8 May 2003 16:53:25 -0000 Received: from unknown (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender )encrypted SMTP for ; 8 May 2003 16:53:25 -0000 Received: from laptop.baldwin.cx ([216.133.140.1]) by server.baldwin.cx (8.12.8/8.12.8) with ESMTP id h48Gr6p0008959; Thu, 8 May 2003 12:53:08 -0400 (EDT) (envelope-from jhb@FreeBSD.org) Message-ID: X-Mailer: XFMail 1.5.4 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 In-Reply-To: <20030508151522.36B8D2A8AB@canning.wemm.org> Date: Thu, 08 May 2003 12:53:09 -0400 (EDT) From: John Baldwin To: Peter Wemm cc: Perforce Change Reviews Subject: Re: PERFORCE change 30777 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 16:53:25 -0000 On 08-May-2003 Peter Wemm wrote: > John Baldwin wrote: >> >> On 08-May-2003 Peter Wemm wrote: >> > http://perforce.freebsd.org/chv.cgi?CH=30777 >> > >> > Change 30777 by peter@peter_overcee on 2003/05/08 01:21:28 >> > >> > Change the page IDTVEC back to an interrupt gate instead of a trap >> > gate. Otherwise we could preempt and %cr2 could be reused on another >> > process when it faults. >> > >> > Affected files ... >> > >> > .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#12 edit >> > .. //depot/projects/hammer/sys/amd64/amd64/trap.c#6 edit >> > >> > Differences ... >> > >> > ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#12 (text+ko) ==== >> > >> > @@ -1219,7 +1219,7 @@ >> > setidt(11, &IDTVEC(missing), SDT_SYSTGT, SEL_KPL, 0); >> > setidt(12, &IDTVEC(stk), SDT_SYSTGT, SEL_KPL, 0); >> > setidt(13, &IDTVEC(prot), SDT_SYSTGT, SEL_KPL, 0); >> > - setidt(14, &IDTVEC(page), SDT_SYSTGT, SEL_KPL, 0); >> > + setidt(14, &IDTVEC(page), SDT_SYSIGT, SEL_KPL, 0); >> > setidt(15, &IDTVEC(rsvd), SDT_SYSTGT, SEL_KPL, 0); >> > setidt(16, &IDTVEC(fpu), SDT_SYSTGT, SEL_KPL, 0); >> > setidt(17, &IDTVEC(align), SDT_SYSTGT, SEL_KPL, 0); >> > >> > ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#6 (text+ko) ==== >> > >> > @@ -213,9 +213,17 @@ >> > * do the VM lookup, so just consider it a fatal trap so the >> > * kernel can print out a useful trap message and even get >> > * to the debugger. >> > + * >> > + * Note that T_PAGEFLT is registered as an interrupt gate. T > his >> > + * is just like a trap gate, except interrupts are disabled. > This >> > + * happens to be critically important, because we could other > wise >> > + * preempt and run another process that may cause %cr2 to be >> > + * clobbered for something else. >> > */ >> > eva = rcr2(); >> > - if (PCPU_GET(spinlocks) != NULL) >> > + if (PCPU_GET(spinlocks) == NULL) >> > + enable_intr(); >> > + else >> > trap_fatal(&frame, eva); >> > } >> >> The spinlocks check only works if witness is on. What you want to >> do is check td_critnest > 0 instead. > > Hmm. I was just going by the i386 code. Is that wrong too, or is this > because I'm using the cheat implementation of the nonlazy critical masking? The i386 code is wrong, I fixed it this morning in the smpng branch. :) I need to make sure I didn't screw it up (make sure it boots ok and stuff) and then get it into HEAD. Then you can put the final version into amd64. It is actually less fatal to be wrong here on i386 because it has the lazy interrupt masking evil. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ From owner-p4-projects@FreeBSD.ORG Thu May 8 11:24:45 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A012537B404; Thu, 8 May 2003 11:24:44 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3ECFA37B401 for ; Thu, 8 May 2003 11:24:44 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DF93143FCB for ; Thu, 8 May 2003 11:24:43 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h48IOh0U068358 for ; Thu, 8 May 2003 11:24:43 -0700 (PDT) (envelope-from cvance@tislabs.com) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h48IOhuc068355 for perforce@freebsd.org; Thu, 8 May 2003 11:24:43 -0700 (PDT) Date: Thu, 8 May 2003 11:24:43 -0700 (PDT) Message-Id: <200305081824.h48IOhuc068355@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cvance@tislabs.com using -f From: Chris Vance To: Perforce Change Reviews Subject: PERFORCE change 30809 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 18:24:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=30809 Change 30809 by cvance@cvance_demo on 2003/05/08 11:24:00 Don't create symlinks for directories under sys/security/sebsd, or the makefile will rm -rf the source directories and overlay symlinks (ouch). Affected files ... .. //depot/projects/trustedbsd/sebsd/include/Makefile#3 edit Differences ... ==== //depot/projects/trustedbsd/sebsd/include/Makefile#3 (text+ko) ==== @@ -44,7 +44,7 @@ # For SHARED=symlinks, cam, netatm, and netgraph are symlinks, so cam/scsi, # netatm/*, and netgraph/* are taken care of -LSYMSUBDIRS= ${LSUBDIRS:Ncam/scsi:Nnetatm/*:Nnetgraph/*} +LSYMSUBDIRS= ${LSUBDIRS:Ncam/scsi:Nnetatm/*:Nnetgraph/*:Nsecurity/sebsd/avc:Nsecurity/sebsd/ss} # Define SHARED to indicate whether you want symbolic links to the system # source (``symlinks''), or a separate copy (``copies''). ``symlinks'' is From owner-p4-projects@FreeBSD.ORG Thu May 8 13:44:37 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 117CA37B404; Thu, 8 May 2003 13:44:37 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8DCB237B401 for ; Thu, 8 May 2003 13:44:36 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3A1AF43F93 for ; Thu, 8 May 2003 13:44:36 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h48Kia0U081054 for ; Thu, 8 May 2003 13:44:36 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h48KiZVV081051 for perforce@freebsd.org; Thu, 8 May 2003 13:44:35 -0700 (PDT) Date: Thu, 8 May 2003 13:44:35 -0700 (PDT) Message-Id: <200305082044.h48KiZVV081051@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30814 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 20:44:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=30814 Change 30814 by jmallett@jmallett_dalek on 2003/05/08 13:44:27 Uncomment DDB since it's compiled in and the like, though it's exploding nicely for me. Affected files ... .. //depot/projects/mips/sys/mips/conf/GENERIC#14 edit Differences ... ==== //depot/projects/mips/sys/mips/conf/GENERIC#14 (text+ko) ==== @@ -23,7 +23,7 @@ #structures. Disable for IP22. # Debugging for use in -current -#options DDB #Enable the kernel debugger +options DDB #Enable the kernel debugger options INVARIANTS #Enable calls of extra sanity checking options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS options WITNESS #Enable checks to detect deadlocks and cycles From owner-p4-projects@FreeBSD.ORG Thu May 8 14:32:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F59837B404; Thu, 8 May 2003 14:32:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1C91437B401 for ; Thu, 8 May 2003 14:32:35 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B9B3443FA3 for ; Thu, 8 May 2003 14:32:34 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h48LWY0U083770 for ; Thu, 8 May 2003 14:32:34 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h48LWY3G083767 for perforce@freebsd.org; Thu, 8 May 2003 14:32:34 -0700 (PDT) Date: Thu, 8 May 2003 14:32:34 -0700 (PDT) Message-Id: <200305082132.h48LWY3G083767@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30815 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 21:32:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=30815 Change 30815 by jmallett@jmallett_dalek on 2003/05/08 14:32:15 Skip the /red/herring PT_INTERP stuff for the kernel it won't matter (afaik), also skip PT_DYNAMIC (which may be wrong.) Affected files ... .. //depot/projects/mips/usr.bin/elf2ecoff/elf2ecoff.c#2 edit Differences ... ==== //depot/projects/mips/usr.bin/elf2ecoff/elf2ecoff.c#2 (text+ko) ==== @@ -253,23 +253,24 @@ /* XXX PT_MIPS_REGINFO.... maybe a machdep macro for doing * the check in question. */ - if (ph[i].p_type == PT_NULL || ph[i].p_type == PT_NOTE || - ph[i].p_type == PT_PHDR /*|| - ph[i].p_type == PT_MIPS_REGINFO*/) { - + switch (ph[i].p_type) { + case PT_NULL: + case PT_NOTE: + case PT_PHDR: + case PT_DYNAMIC: + case PT_INTERP: if (debug) { fprintf(stderr, " skipping PH %d type %d flags 0x%x\n", i, ph[i].p_type, ph[i].p_flags); } continue; + case PT_LOAD: + break; + default: + fprintf(stderr, "Program header %d type %d can't be converted.\n", + i, ph[i].p_type); + exit(1); } - /* Section types we can't handle... */ - else - if (ph[i].p_type != PT_LOAD) { - fprintf(stderr, "Program header %d type %d can't be converted.\n", - i, ph[i].p_type); - exit(1); - } /* Writable (data) segment? */ if (ph[i].p_flags & PF_W) { struct sect ndata, nbss; From owner-p4-projects@FreeBSD.ORG Thu May 8 14:59:09 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF0C937B404; Thu, 8 May 2003 14:59:08 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6EDBE37B401 for ; Thu, 8 May 2003 14:59:08 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1BA2443F93 for ; Thu, 8 May 2003 14:59:08 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h48Lx70U084800 for ; Thu, 8 May 2003 14:59:07 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h48Lx7Gh084797 for perforce@freebsd.org; Thu, 8 May 2003 14:59:07 -0700 (PDT) Date: Thu, 8 May 2003 14:59:07 -0700 (PDT) Message-Id: <200305082159.h48Lx7Gh084797@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30817 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 21:59:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=30817 Change 30817 by jmallett@jmallett_dalek on 2003/05/08 14:59:04 Hack in MIPS_REGINFO support if BUILDING_mips. Affected files ... .. //depot/projects/mips/usr.bin/elf2ecoff/elf2ecoff.c#3 edit Differences ... ==== //depot/projects/mips/usr.bin/elf2ecoff/elf2ecoff.c#3 (text+ko) ==== @@ -54,6 +54,10 @@ #include "exec_ecoff.h" +#if BUILDING_mips && !defined(PT_MIPS_REGINFO) +#define PT_MIPS_REGINFO 0x70000000 +#endif + #define ISLAST(p) (p->n_un.n_name == 0 || p->n_un.n_name[0] == 0) struct sect { @@ -254,6 +258,9 @@ * the check in question. */ switch (ph[i].p_type) { +#if BUILDING_mips + case PT_MIPS_REGINFO: +#endif case PT_NULL: case PT_NOTE: case PT_PHDR: From owner-p4-projects@FreeBSD.ORG Thu May 8 15:23:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8254737B404; Thu, 8 May 2003 15:23:41 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2223C37B401 for ; Thu, 8 May 2003 15:23:41 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C02A443F93 for ; Thu, 8 May 2003 15:23:40 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h48MNe0U086676 for ; Thu, 8 May 2003 15:23:40 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h48MNeuQ086673 for perforce@freebsd.org; Thu, 8 May 2003 15:23:40 -0700 (PDT) Date: Thu, 8 May 2003 15:23:40 -0700 (PDT) Message-Id: <200305082223.h48MNeuQ086673@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30821 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 22:23:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=30821 Change 30821 by jmallett@jmallett_dalek on 2003/05/08 15:22:59 Move mips_cp0_status_[read,write] to cpufunc.h and include that in locore.h. Affected files ... .. //depot/projects/mips/sys/mips/include/cpufunc.h#9 edit .. //depot/projects/mips/sys/mips/include/locore.h#3 edit Differences ... ==== //depot/projects/mips/sys/mips/include/cpufunc.h#9 (text+ko) ==== @@ -33,6 +33,11 @@ #include #include +uint32_t mips_cp0_cause_read(void); +void mips_cp0_cause_write(uint32_t); +uint32_t mips_cp0_status_read(void); +void mips_cp0_status_write(uint32_t); + static __inline register_t intr_disable(void) { ==== //depot/projects/mips/sys/mips/include/locore.h#3 (text+ko) ==== @@ -24,17 +24,13 @@ #ifndef _MIPS_LOCORE_H #define _MIPS_LOCORE_H +#include #include #include #include struct tlb; -uint32_t mips_cp0_cause_read(void); -void mips_cp0_cause_write(uint32_t); -uint32_t mips_cp0_status_read(void); -void mips_cp0_status_write(uint32_t); - void mips3_SetPID(int); void mips3_TBIA(int); void mips3_TBIAP(int); From owner-p4-projects@FreeBSD.ORG Thu May 8 15:24:44 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5D6BB37B407; Thu, 8 May 2003 15:24:43 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0D56837B405 for ; Thu, 8 May 2003 15:24:43 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AAD0443FA3 for ; Thu, 8 May 2003 15:24:42 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h48MOg0U086709 for ; Thu, 8 May 2003 15:24:42 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h48MOgnt086706 for perforce@freebsd.org; Thu, 8 May 2003 15:24:42 -0700 (PDT) Date: Thu, 8 May 2003 15:24:42 -0700 (PDT) Message-Id: <200305082224.h48MOgnt086706@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30822 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 22:24:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=30822 Change 30822 by jmallett@jmallett_dalek on 2003/05/08 15:23:49 Add a cncheckc. Affected files ... .. //depot/projects/mips/sys/dev/arcbios/arcbios.c#8 edit Differences ... ==== //depot/projects/mips/sys/dev/arcbios/arcbios.c#8 (text+ko) ==== @@ -58,6 +58,7 @@ char arcbios_system_identifier[64 + 1]; static cn_getc_t arcbios_cngetc; +static cn_checkc_t arcbios_cncheckc; static cn_putc_t arcbios_cnputc; static void arcbios_fill_vector(struct arcbios *, const struct arcbios_fv *); @@ -65,7 +66,7 @@ struct arcbios_treewalk_context *); extern struct cdevsw arcbios_cdevsw; -CONS_DRIVER(arcbios, NULL, NULL, NULL, arcbios_cngetc, NULL, arcbios_cnputc, NULL); +CONS_DRIVER(arcbios, NULL, NULL, NULL, arcbios_cngetc, arcbios_cncheckc, arcbios_cnputc, NULL); /* * arcbios_init: @@ -257,6 +258,19 @@ return (c); } +int +arcbios_cncheckc(struct consdev *cdev) +{ + int q; + + q = (*ARCBIOS->GetReadStatus)(ARCBIOS_STDIN); + if (q == 0) { + return (arcbios_cngetc(cdev)); + } + + return (-1); +} + void arcbios_cnputc(struct consdev *cdev, int c) { From owner-p4-projects@FreeBSD.ORG Thu May 8 15:24:45 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 966F137B417; Thu, 8 May 2003 15:24:44 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C39C537B419 for ; Thu, 8 May 2003 15:24:43 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 51C6543FA3 for ; Thu, 8 May 2003 15:24:43 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h48MOh0U086715 for ; Thu, 8 May 2003 15:24:43 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h48MOghu086712 for perforce@freebsd.org; Thu, 8 May 2003 15:24:42 -0700 (PDT) Date: Thu, 8 May 2003 15:24:42 -0700 (PDT) Message-Id: <200305082224.h48MOghu086712@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30823 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 22:24:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=30823 Change 30823 by jmallett@jmallett_dalek on 2003/05/08 15:24:38 Move to split format, and steal from SPARC64 instead of PowerPC except for the unsigned char hackery. Affected files ... .. //depot/projects/mips/sys/mips/include/_limits.h#1 add .. //depot/projects/mips/sys/mips/include/limits.h#3 edit Differences ... ==== //depot/projects/mips/sys/mips/include/limits.h#3 (text+ko) ==== @@ -10,13 +10,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE @@ -31,10 +24,10 @@ * SUCH DAMAGE. * * @(#)limits.h 8.3 (Berkeley) 1/4/94 - * $FreeBSD: src/sys/powerpc/include/limits.h,v 1.23 2003/01/18 11:23:42 grehan Exp $ + * $FreeBSD$ */ -#ifndef _MACHINE_LIMITS_H_ +#ifndef _MACHINE_LIMITS_H_ #define _MACHINE_LIMITS_H_ #define CHAR_BIT 8 /* number of bits in a char */ @@ -50,9 +43,9 @@ * some other compilers as well, but this should not be depended on. */ #define SCHAR_MAX 0x7f /* max value for a signed char */ -#define SCHAR_MIN (-0x7f - 1) /* min value for a signed char */ +#define SCHAR_MIN (-0x7f-1) /* min value for a signed char */ -#define UCHAR_MAX 0xff /* max value for an unsigned char */ +#define UCHAR_MAX 0xffU /* max value for an unsigned char */ #ifdef __CHAR_UNSIGNED__ #define CHAR_MAX UCHAR_MAX /* max value for a char */ @@ -62,47 +55,51 @@ #define CHAR_MIN SCHAR_MIN /* min value for a char */ #endif -#define USHRT_MAX 0xffff /* max value for an unsigned short */ +#define USHRT_MAX 0xffffU /* max value for an unsigned short */ #define SHRT_MAX 0x7fff /* max value for a short */ -#define SHRT_MIN (-0x7fff - 1) /* min value for a short */ +#define SHRT_MIN (-0x7fff-1) /* min value for a short */ #define UINT_MAX 0xffffffffU /* max value for an unsigned int */ #define INT_MAX 0x7fffffff /* max value for an int */ -#define INT_MIN (-0x7fffffff - 1) /* min value for an int */ +#define INT_MIN (-0x7fffffff-1) /* min value for an int */ -/* Bad hack for gcc configured to give 64-bit longs. */ -#ifdef _LARGE_LONG -#define ULONG_MAX 0xffffffffffffffffUL -#define LONG_MAX 0x7fffffffffffffffL -#define LONG_MIN (-0x7fffffffffffffffL - 1) -#else -#define ULONG_MAX 0xffffffffUL /* max value for an unsigned long */ -#define LONG_MAX 0x7fffffffL /* max value for a long */ -#define LONG_MIN (-0x7fffffffL - 1) /* min value for a long */ -#endif +#define ULONG_MAX 0xffffffffffffffffUL /* max for an unsigned long */ +#define LONG_MAX 0x7fffffffffffffffL /* max for a long */ +#define LONG_MIN (-0x7fffffffffffffffL-1) /* min for a long */ - /* max value for an unsigned long long */ +/* Long longs and longs are the same size on the alpha. */ + /* max for an unsigned long long */ #define ULLONG_MAX 0xffffffffffffffffULL -#define LLONG_MAX 0x7fffffffffffffffLL /* max value for a long long */ -#define LLONG_MIN (-0x7fffffffffffffffLL - 1) /* min for a long long */ +#define LLONG_MAX 0x7fffffffffffffffLL /* max for a long long */ +#define LLONG_MIN (-0x7fffffffffffffffLL-1) /* min for a long long */ #if !defined(_ANSI_SOURCE) -#define SSIZE_MAX INT_MAX /* max value for a ssize_t */ +#define SSIZE_MAX LONG_MAX /* max value for a ssize_t */ + +#if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE) +#define SIZE_T_MAX ULONG_MAX /* max value for a size_t */ -#if !defined(_POSIX_SOURCE) -#define SIZE_T_MAX UINT_MAX /* max value for a size_t */ +#define OFF_MAX LONG_MAX /* max value for an off_t */ +#define OFF_MIN LONG_MIN /* min value for an off_t */ -#define OFF_MAX LLONG_MAX /* max value for an off_t */ -#define OFF_MIN LLONG_MIN /* min value for an off_t */ +/* Quads and longs are the same on the alpha. Ensure they stay in sync. */ +#define UQUAD_MAX (ULONG_MAX) /* max value for a uquad_t */ +#define QUAD_MAX (LONG_MAX) /* max value for a quad_t */ +#define QUAD_MIN (LONG_MIN) /* min value for a quad_t */ +#endif /* !_POSIX_SOURCE && !_XOPEN_SOURCE */ +#endif /* !_ANSI_SOURCE */ -/* Quads and long longs are the same size. Ensure they stay in sync. */ -#define UQUAD_MAX ULLONG_MAX /* max value for a uquad_t */ -#define QUAD_MAX LLONG_MAX /* max value for a quad_t */ -#define QUAD_MIN LLONG_MIN /* min value for a quad_t */ +#if (!defined(_ANSI_SOURCE)&&!defined(_POSIX_SOURCE)) || defined(_XOPEN_SOURCE) +#define LONG_BIT 64 +#define WORD_BIT 32 -#define LONG_BIT 32 +#define DBL_DIG 15 +#define DBL_MAX 1.7976931348623157E+308 +#define DBL_MIN 2.2250738585072014E-308 -#endif /* !_POSIX_SOURCE */ -#endif /* !_ANSI_SOURCE */ +#define FLT_DIG 6 +#define FLT_MAX 3.40282347E+38F +#define FLT_MIN 1.17549435E-38F +#endif #endif /* !_MACHINE_LIMITS_H_ */ From owner-p4-projects@FreeBSD.ORG Thu May 8 20:01:21 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 438B737B404; Thu, 8 May 2003 20:01:21 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D08F537B401 for ; Thu, 8 May 2003 20:01:20 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7ABFD43F3F for ; Thu, 8 May 2003 20:01:20 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4931K0U007641 for ; Thu, 8 May 2003 20:01:20 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4931K3x007638 for perforce@freebsd.org; Thu, 8 May 2003 20:01:20 -0700 (PDT) Date: Thu, 8 May 2003 20:01:20 -0700 (PDT) Message-Id: <200305090301.h4931K3x007638@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30830 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 03:01:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=30830 Change 30830 by marcel@marcel_nfs on 2003/05/08 20:00:29 Remove copyoutstr. It's not used and only exists on alpha and ia64. Guess where ia64 was spawned off from :-) Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia64/support.s#4 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia64/support.s#4 (text+ko) ==== @@ -453,46 +453,6 @@ END(copyinstr) -ENTRY(copyoutstr, 4) - .prologue - .regstk 4, 3, 4, 0 - .save ar.pfs,loc0 - alloc loc0=ar.pfs,4,3,4,0 - .save rp,loc1 - mov loc1=rp - .body - - movl loc2=VM_MAX_ADDRESS // make sure that dest addr - ;; - cmp.geu p6,p0=in1,loc2 // is in user space. - ;; -(p6) br.cond.spnt.few copyerr // if it's not, error out. - movl r14=copyerr // set up fault handler. - add r15=PC_CURTHREAD,r13 // find curthread - ;; - ld8 r15=[r15] - ;; - add r15=TD_PCB,r15 // find pcb - ;; - ld8 r15=[r15] - ;; - add loc2=PCB_ONFAULT,r15 - ;; - st8 [loc2]=r14 - ;; - mov out0=in0 - mov out1=in1 - mov out2=in2 - mov out3=in3 - ;; - br.call.sptk.few rp=copystr // do the copy. - st8 [loc2]=r0 // kill the fault handler. - mov ar.pfs=loc0 // restore ar.pfs - mov rp=loc1 // restore ra. - br.ret.sptk.few rp // ret0 left over from copystr - -END(copyoutstr) - /* * Not the fastest bcopy in the world. */ From owner-p4-projects@FreeBSD.ORG Thu May 8 21:46:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 74F8937B404; Thu, 8 May 2003 21:46:28 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EE74637B401 for ; Thu, 8 May 2003 21:46:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 736D443F75 for ; Thu, 8 May 2003 21:46:27 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h494kR0U018224 for ; Thu, 8 May 2003 21:46:27 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h494kR5k018221 for perforce@freebsd.org; Thu, 8 May 2003 21:46:27 -0700 (PDT) Date: Thu, 8 May 2003 21:46:27 -0700 (PDT) Message-Id: <200305090446.h494kR5k018221@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30831 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 04:46:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=30831 Change 30831 by jmallett@jmallett_dalek on 2003/05/08 21:46:20 Properly refer to input and output arguments, as to make these work. This fixes atomic_cmpset_ptr most notably for witness such that it gets past that point now. Inspired by Alpha & PowerPC. Affected files ... .. //depot/projects/mips/sys/mips/include/atomic.h#14 edit Differences ... ==== //depot/projects/mips/sys/mips/include/atomic.h#14 (text+ko) ==== @@ -103,12 +103,12 @@ \ __asm __volatile ( \ "1:\n\t" \ - "ll %[temp], (%[p])\n\t" \ + "ll %[temp], %[p]\n\t" \ asmop "\n\t" \ - "sc %[temp], (%[p])\n\t" \ + "sc %[temp], %[p]\n\t" \ "beqz %[temp], 1b\n\t" \ - : [val] "=r"(val) \ - : [temp] "r"(temp), [p] "r"(p) \ + : [val] "=&r"(val), [p] "+m"(*p) \ + : [temp] "r"(temp) \ : "memory" \ ); \ } @@ -139,15 +139,15 @@ __asm __volatile ( "1:\n\t" "move %[res], $0\n\t" - "ll %[temp], (%[p])\n\t" + "ll %[temp], %[p]\n\t" "bne %[temp], %[old], 2f\n\t" "move %[temp], %[val]\n\t" "li %[res], 1\n\t" - "sc %[temp], (%[p])\n\t" + "sc %[temp], %[p]\n\t" "beqz %[temp], 1b\n\t" "2:\n\t" - : [old] "=r"(old), [val] "=r"(val) - : [res] "r"(res), [temp] "r"(temp), [p] "r"(p) + : [res] "=&r"(res), [p] "+m"(*p) + : [old] "r"(old), [val] "r"(val), [temp] "r"(temp) : "memory" ); @@ -164,13 +164,13 @@ __asm __volatile ( "1:\n\t" - "ll %[temp], (%[p])\n\t" + "ll %[temp], %[p]\n\t" "move %[res], %[temp]\n\t" "move %[temp], $0\n\t" - "sc %[temp], (%[p])\n\t" + "sc %[temp], %[p]\n\t" "beqz %[temp], 1b\n\t" - : - : [temp] "r"(temp), [p] "r"(p), [res] "r"(res) + : [res] "=&r"(res), [p] "+m"(*p) + : [temp] "r"(temp) : "memory" ); @@ -191,12 +191,12 @@ \ __asm __volatile ( \ "1:\n\t" \ - "lld %[temp], (%[p])\n\t" \ + "lld %[temp], %[p]\n\t" \ asmop "\n\t" \ - "scd %[temp], (%[p])\n\t" \ + "scd %[temp], %[p]\n\t" \ "beqz %[temp], 1b\n\t" \ - : [val] "=r"(val) \ - : [temp] "r"(temp), [p] "r"(p) \ + : [val] "=&r"(val), [p] "+m"(*p) \ + : [temp] "r"(temp) \ : "memory" \ ); \ } @@ -227,15 +227,15 @@ __asm __volatile ( "1:\n\t" "move %[res], $0\n\t" - "lld %[temp], (%[p])\n\t" + "lld %[temp], %[p]\n\t" "bne %[temp], %[old], 2f\n\t" "move %[temp], %[val]\n\t" "li %[res], 1\n\t" - "scd %[temp], (%[p])\n\t" + "scd %[temp], %[p]\n\t" "beqz %[temp], 1b\n\t" "2:\n\t" - : [old] "=r"(old), [val] "=r"(val) - : [res] "r"(res), [temp] "r"(temp), [p] "r"(p) + : [res] "=&r"(res), [p] "+m"(*p) + : [old] "r"(old), [val] "r"(val), [temp] "r"(temp) : "memory" ); @@ -252,13 +252,13 @@ __asm __volatile ( "1:\n\t" - "lld %[temp], (%[p])\n\t" + "lld %[temp], %[p]\n\t" "move %[res], %[temp]\n\t" "move %[temp], $0\n\t" - "scd %[temp], (%[p])\n\t" + "scd %[temp], %[p]\n\t" "beqz %[temp], 1b\n\t" - : - : [temp] "r"(temp), [p] "r"(p), [res] "r"(res) + : [res] "=&r"(res), [p] "+m"(*p) + : [temp] "r"(temp) : "memory" ); From owner-p4-projects@FreeBSD.ORG Thu May 8 22:30:22 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37E6837B404; Thu, 8 May 2003 22:30:22 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C140B37B401 for ; Thu, 8 May 2003 22:30:21 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6E40E43F3F for ; Thu, 8 May 2003 22:30:21 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h495UL0U020820 for ; Thu, 8 May 2003 22:30:21 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h495UKMR020817 for perforce@freebsd.org; Thu, 8 May 2003 22:30:20 -0700 (PDT) Date: Thu, 8 May 2003 22:30:20 -0700 (PDT) Message-Id: <200305090530.h495UKMR020817@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30832 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 05:30:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=30832 Change 30832 by jmallett@jmallett_dalek on 2003/05/08 22:29:33 Turn back on our exception handlers, provisionally. Call mutex initialisation function. Affected files ... .. //depot/projects/mips/sys/mips/mips/machdep.c#20 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/machdep.c#20 (text+ko) ==== @@ -190,6 +190,7 @@ proc_linkup(&proc0, &ksegrp0, &kse0, &thread0); thread0.td_kstack = kstack0; pcpup->pc_curthread = &thread0; + mutex_init(); } void @@ -552,9 +553,6 @@ /* MIPS32/MIPS64 interrupt exception handler */ extern char mips64_intr[], mips64_intrEnd[]; - /* XXX I want ARCS to be my friend */ - return; - /* * Copy down exception vector code. */ From owner-p4-projects@FreeBSD.ORG Thu May 8 22:31:24 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 447E637B404; Thu, 8 May 2003 22:31:24 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id AC7A937B401 for ; Thu, 8 May 2003 22:31:23 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5756243F75 for ; Thu, 8 May 2003 22:31:23 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h495VN0U020895 for ; Thu, 8 May 2003 22:31:23 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h495VM3Q020890 for perforce@freebsd.org; Thu, 8 May 2003 22:31:22 -0700 (PDT) Date: Thu, 8 May 2003 22:31:22 -0700 (PDT) Message-Id: <200305090531.h495VM3Q020890@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30833 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 05:31:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=30833 Change 30833 by jmallett@jmallett_dalek on 2003/05/08 22:30:46 Don't assume that the badvaddr needs vm_min_kernel_address added to it, and print the exception ra in addition to the pc, so if it happens to be in bzero, you aren't totally left in the dark about where the problem is. Affected files ... .. //depot/projects/mips/sys/mips/mips/mips_subr.S#4 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/mips_subr.S#4 (text+ko) ==== @@ -1463,8 +1463,8 @@ sll k0, k0, PGSHIFT _MTC0 a0, MIPS_COP_0_EXC_PC # return to panic COP0_SYNC - li k1, VM_MIN_KERNEL_ADDRESS - addu a3, k0, k1 + move a3, k0 + move a4, ra #if defined(DDB) bltz sp, 1f # for ddb try to keep frame nop @@ -1476,7 +1476,7 @@ .set at END(MIPSX(TLBMissException)) - MSG("TLB out of universe: ksp %p epc %p vaddr %p") + MSG("TLB out of universe: ksp %p epc %p vaddr %p ra %p") /* * Mark where code entered from exception hander jumptable From owner-p4-projects@FreeBSD.ORG Thu May 8 23:26:32 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C9D5537B404; Thu, 8 May 2003 23:26:31 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6AEEF37B401 for ; Thu, 8 May 2003 23:26:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 183E243FBD for ; Thu, 8 May 2003 23:26:31 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h496QU0U023959 for ; Thu, 8 May 2003 23:26:30 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h496QUg7023956 for perforce@freebsd.org; Thu, 8 May 2003 23:26:30 -0700 (PDT) Date: Thu, 8 May 2003 23:26:30 -0700 (PDT) Message-Id: <200305090626.h496QUg7023956@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30835 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 06:26:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=30835 Change 30835 by jmallett@jmallett_dalek on 2003/05/08 23:25:52 Call pcpu_init. Call kdb_init. Affected files ... .. //depot/projects/mips/sys/mips/mips/machdep.c#21 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/machdep.c#21 (text+ko) ==== @@ -143,6 +143,8 @@ * $FreeBSD$ */ +#include "opt_ddb.h" + #include #include #include @@ -189,8 +191,12 @@ cpu_identify(); proc_linkup(&proc0, &ksegrp0, &kse0, &thread0); thread0.td_kstack = kstack0; + pcpu_init(pcpup, 0, sizeof(struct pcpu)); pcpup->pc_curthread = &thread0; mutex_init(); +#ifdef DDB + kdb_init(); +#endif } void From owner-p4-projects@FreeBSD.ORG Thu May 8 23:26:33 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CFC2E37B401; Thu, 8 May 2003 23:26:32 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EF77237B411 for ; Thu, 8 May 2003 23:26:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 99F8E43F93 for ; Thu, 8 May 2003 23:26:31 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h496QV0U023965 for ; Thu, 8 May 2003 23:26:31 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h496QVpW023962 for perforce@freebsd.org; Thu, 8 May 2003 23:26:31 -0700 (PDT) Date: Thu, 8 May 2003 23:26:31 -0700 (PDT) Message-Id: <200305090626.h496QVpW023962@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30836 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 06:26:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=30836 Change 30836 by jmallett@jmallett_dalek on 2003/05/08 23:26:29 Fill phys_avail with the addresses through KSEG0. Affected files ... .. //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#14 edit Differences ... ==== //depot/projects/mips/sys/mips/sgimips/machdep_sgimips.c#14 (text+ko) ==== @@ -134,8 +134,8 @@ printf("Physical available block %d:\n", j); printf("Available memory range %0x-%0x\n", first, last); - phys_avail[j + 0] = first; - phys_avail[j + 1] = last; + phys_avail[j + 0] = MIPS_PHYS_TO_KSEG0(first); + phys_avail[j + 1] = MIPS_PHYS_TO_KSEG0(last); j += 2; break; default: From owner-p4-projects@FreeBSD.ORG Thu May 8 23:40:52 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9EFC737B405; Thu, 8 May 2003 23:40:51 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 357AD37B404 for ; Thu, 8 May 2003 23:40:51 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9598043F85 for ; Thu, 8 May 2003 23:40:50 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h496eo0U024790 for ; Thu, 8 May 2003 23:40:50 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h496eoca024787 for perforce@freebsd.org; Thu, 8 May 2003 23:40:50 -0700 (PDT) Date: Thu, 8 May 2003 23:40:50 -0700 (PDT) Message-Id: <200305090640.h496eoca024787@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30839 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 06:40:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=30839 Change 30839 by marcel@marcel_nfs on 2003/05/08 23:40:17 Fix the calculation of the number of nat collections between BSP and BSP-regs. The regs term is in bytes... Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia64/db_interface.c#7 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia64/db_interface.c#7 (text+ko) ==== @@ -235,7 +235,7 @@ bsp = ddb_regs.tf_special.bspstore + ddb_regs.tf_special.ndirty; regno = (db_expr_t)vp->valuep - 32; sof = ddb_regs.tf_special.cfm & 0x7f; - nats = (sof - regno + 62 - ((bsp >> 3) & 0x3f)) / 63; + nats = (((sof - regno) << 3) + 62 - ((bsp >> 3) & 0x3f)) / 63; reg = (void*)(bsp - ((sof - regno + nats) << 3)); @@ -469,7 +469,7 @@ bsp = regs->tf_special.bspstore + regs->tf_special.ndirty; regno -= 32; sof = regs->tf_special.cfm & 0x7f; - nats = (sof - regno + 62 - ((bsp >> 3) & 0x3f)) / 63; + nats = (((sof - regno) << 3) + 62 - ((bsp >> 3) & 0x3f)) / 63; rsp = (void*)(bsp - ((sof - regno + nats) << 3)); if (regno < sof) return (*rsp); From owner-p4-projects@FreeBSD.ORG Thu May 8 23:57:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1836C37B416; Thu, 8 May 2003 23:57:13 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5660337B409 for ; Thu, 8 May 2003 23:57:11 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D80E343FBF for ; Thu, 8 May 2003 23:57:10 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h496vA0U025635 for ; Thu, 8 May 2003 23:57:10 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h496vA9u025632 for perforce@freebsd.org; Thu, 8 May 2003 23:57:10 -0700 (PDT) Date: Thu, 8 May 2003 23:57:10 -0700 (PDT) Message-Id: <200305090657.h496vA9u025632@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30840 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 06:57:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=30840 Change 30840 by marcel@marcel_nfs on 2003/05/08 23:56:50 Only set the ia32 flags (eflags and cflg) when executing an ia32 application. Also, enable the high FP registers by default. The ia32 engine needs them. Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia32/ia32_sysvec.c#4 edit .. //depot/projects/ia64_epc/sys/ia64/ia64/machdep.c#23 edit .. //depot/projects/ia64_epc/sys/ia64/ia64/mp_machdep.c#10 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia32/ia32_sysvec.c#4 (text+ko) ==== @@ -248,8 +248,12 @@ exec_setregs(td, entry, stack, ps_strings); - /* Mark this process as using the ia32 instruction set. */ + /* + * Mark this process as using the ia32 instruction set and + * enable the high FP registers by default. + */ frame->tf_special.psr |= IA64_PSR_IS; + frame->tf_special.psr &= ~IA64_PSR_DFH; codesel = LSEL(LUCODE_SEL, SEL_UPL); datasel = LSEL(LUDATA_SEL, SEL_UPL); @@ -333,9 +337,9 @@ frame->tf_scratch.gr30 = ldtseg; /* LDTD */ frame->tf_scratch.gr31 = gdtseg; /* GDTD */ -#if 0 + /* Set ia32 control registers on this processor. */ + ia64_set_cflg(CR0_PE | CR0_PG | ((long)(CR4_XMM | CR4_FXSR) << 32)); ia64_set_eflag(PSL_USER); -#endif /* PS_STRINGS value for BSD/OS binaries. It is 0 for non-BSD/OS. */ frame->tf_scratch.gr11 = IA32_PS_STRINGS; ==== //depot/projects/ia64_epc/sys/ia64/ia64/machdep.c#23 (text+ko) ==== @@ -729,12 +729,6 @@ PCPU_SET(curthread, &thread0); /* - * Set ia32 control registers. - */ - ia64_set_cflg((CR0_PE | CR0_PG) - | ((long)(CR4_XMM | CR4_FXSR) << 32)); - - /* * Initialize the rest of proc 0's PCB. * * Set the kernel sp, reserving space for an (empty) trapframe, ==== //depot/projects/ia64_epc/sys/ia64/ia64/mp_machdep.c#10 (text+ko) ==== @@ -97,9 +97,6 @@ ia64_set_fpsr(IA64_FPSR_DEFAULT); - /* Set ia32 control registers. */ - ia64_set_cflg(CR0_PE | CR0_PG | ((long)(CR4_XMM|CR4_FXSR) << 32)); - /* Wait until it's time for us to be unleashed */ while (ap_spin) /* spin */; From owner-p4-projects@FreeBSD.ORG Fri May 9 10:31:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0436F37B404; Fri, 9 May 2003 10:31:42 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8EB2337B401 for ; Fri, 9 May 2003 10:31:41 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CAA6C43F85 for ; Fri, 9 May 2003 10:31:40 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h49HVe0U074788 for ; Fri, 9 May 2003 10:31:40 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h49HVeSd074785 for perforce@freebsd.org; Fri, 9 May 2003 10:31:40 -0700 (PDT) Date: Fri, 9 May 2003 10:31:40 -0700 (PDT) Message-Id: <200305091731.h49HVeSd074785@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 30848 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 17:31:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=30848 Change 30848 by jhb@jhb_laptop on 2003/05/09 10:31:32 IFC @30847. Affected files ... .. //depot/projects/smpng/sys/Makefile#3 integrate .. //depot/projects/smpng/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.c#20 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#26 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#14 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumioctl.c#13 integrate .. //depot/projects/smpng/sys/kern/kern_mac.c#25 integrate .. //depot/projects/smpng/sys/sys/_label.h#4 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#24 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#35 integrate Differences ... ==== //depot/projects/smpng/sys/Makefile#3 (text+ko) ==== @@ -1,7 +1,10 @@ -# $FreeBSD: src/sys/Makefile,v 1.26 2002/04/26 17:55:21 ru Exp $ +# $FreeBSD: src/sys/Makefile,v 1.27 2003/05/08 06:35:39 peter Exp $ +SUBDIR= # The boot loader -SUBDIR= boot +.if ${MACHINE_ARCH} != "amd64" +SUBDIR+=boot +.endif # KLD modules build for both a.out and ELF .if defined(MODULES_WITH_WORLD) ==== //depot/projects/smpng/sys/amd64/amd64/exception.S#2 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.105 2003/05/03 00:21:43 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.106 2003/05/08 00:05:00 peter Exp $ */ #include @@ -202,7 +202,6 @@ #swapgs movq %rsp,PCPU(SCRATCH_RSP) movq common_tss+COMMON_TSS_RSP0,%rsp - sti /* Now emulate a trapframe. Ugh. */ subq $TF_SIZE,%rsp movq $KUDSEL,TF_SS(%rsp) @@ -226,6 +225,7 @@ movq %r15,TF_R15(%rsp) /* C preserved */ movq PCPU(SCRATCH_RSP),%r12 /* %r12 already saved */ movq %r12,TF_RSP(%rsp) /* user stack pointer */ + sti call syscall movq PCPU(CURPCB),%rax testq $PCB_FULLCTX,PCB_FLAGS(%rax) ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.565 2003/05/01 04:18:02 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.568 2003/05/08 08:25:51 peter Exp $ */ #include "opt_atalk.h" @@ -99,6 +99,7 @@ #include #include #include +#include #include #ifdef PERFMON #include @@ -258,7 +259,7 @@ p->p_sigstk.ss_flags |= SS_ONSTACK; #endif } else - sp = (char *)regs->tf_rsp - sizeof(struct sigframe); + sp = (char *)regs->tf_rsp - sizeof(struct sigframe) - 128; /* Align to 16 bytes. */ sfp = (struct sigframe *)((unsigned long)sp & ~0xF); PROC_UNLOCK(p); @@ -1218,7 +1219,7 @@ setidt(11, &IDTVEC(missing), SDT_SYSTGT, SEL_KPL, 0); setidt(12, &IDTVEC(stk), SDT_SYSTGT, SEL_KPL, 0); setidt(13, &IDTVEC(prot), SDT_SYSTGT, SEL_KPL, 0); - setidt(14, &IDTVEC(page), SDT_SYSTGT, SEL_KPL, 0); + setidt(14, &IDTVEC(page), SDT_SYSIGT, SEL_KPL, 0); setidt(15, &IDTVEC(rsvd), SDT_SYSTGT, SEL_KPL, 0); setidt(16, &IDTVEC(fpu), SDT_SYSTGT, SEL_KPL, 0); setidt(17, &IDTVEC(align), SDT_SYSTGT, SEL_KPL, 0); ==== //depot/projects/smpng/sys/amd64/amd64/trap.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/amd64/amd64/trap.c,v 1.252 2003/05/01 01:05:21 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/trap.c,v 1.253 2003/05/08 08:25:51 peter Exp $ */ /* @@ -213,9 +213,17 @@ * do the VM lookup, so just consider it a fatal trap so the * kernel can print out a useful trap message and even get * to the debugger. + * + * Note that T_PAGEFLT is registered as an interrupt gate. This + * is just like a trap gate, except interrupts are disabled. This + * happens to be critically important, because we could otherwise + * preempt and run another process that may cause %cr2 to be + * clobbered for something else. */ eva = rcr2(); - if (PCPU_GET(spinlocks) != NULL) + if (PCPU_GET(spinlocks) == NULL) + enable_intr(); + else trap_fatal(&frame, eva); } ==== //depot/projects/smpng/sys/dev/ata/ata-raid.c#20 (text+ko) ==== @@ -25,7 +25,7 @@ * (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: src/sys/dev/ata/ata-raid.c,v 1.64 2003/05/04 16:17:54 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.65 2003/05/08 16:38:14 jhb Exp $ */ #include "opt_ata.h" @@ -969,6 +969,7 @@ int disk, s, count = 0, error = 0; caddr_t buffer; + mtx_lock(&Giant); if ((rdp->flags & (AR_F_READY|AR_F_DEGRADED)) != (AR_F_READY|AR_F_DEGRADED)) kthread_exit(EEXIST); ==== //depot/projects/smpng/sys/dev/bge/if_bge.c#26 (text+ko) ==== @@ -64,7 +64,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.39 2003/05/04 00:07:21 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.40 2003/05/07 21:51:13 ps Exp $"); #include #include @@ -483,10 +483,10 @@ ifp = &sc->arpcom.ac_if; if (phy != 1) - switch(sc->bge_asicrev) { - case BGE_ASICREV_BCM5701_B5: - case BGE_ASICREV_BCM5703_A2: - case BGE_ASICREV_BCM5704_A0: + switch(sc->bge_chipid) { + case BGE_CHIPID_BCM5701_B5: + case BGE_CHIPID_BCM5703_A2: + case BGE_CHIPID_BCM5704_A0: return(0); } @@ -937,12 +937,12 @@ CSR_WRITE_4(sc, BGE_MBX_TX_HOST_PROD0_LO, 0); /* 5700 b2 errata */ - if (BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5700) + if (sc->bge_chiprev == BGE_CHIPREV_5700_BX) CSR_WRITE_4(sc, BGE_MBX_TX_HOST_PROD0_LO, 0); CSR_WRITE_4(sc, BGE_MBX_TX_NIC_PROD0_LO, 0); /* 5700 b2 errata */ - if (BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5700) + if (sc->bge_chiprev == BGE_CHIPREV_5700_BX) CSR_WRITE_4(sc, BGE_MBX_TX_NIC_PROD0_LO, 0); return(0); @@ -1061,7 +1061,7 @@ * The 5704 uses a different encoding of read/write * watermarks. */ - if (BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5704) + if (sc->bge_asicrev == BGE_ASICREV_BCM5704) dma_rw_ctl = BGE_PCI_READ_CMD|BGE_PCI_WRITE_CMD | (0x7 << BGE_PCIDMARWCTL_RD_WAT_SHIFT) | (0x3 << BGE_PCIDMARWCTL_WR_WAT_SHIFT); @@ -1075,8 +1075,8 @@ * 5703 and 5704 need ONEDMA_AT_ONCE as a workaround * for hardware bugs. */ - if (BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5703 || - BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5704) { + if (sc->bge_asicrev == BGE_ASICREV_BCM5703 || + sc->bge_asicrev == BGE_ASICREV_BCM5704) { u_int32_t tmp; tmp = CSR_READ_4(sc, BGE_PCI_CLKCTL) & 0x1f; @@ -1085,8 +1085,8 @@ } } - if (BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5703 || - BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5704) + if (sc->bge_asicrev == BGE_ASICREV_BCM5703 || + sc->bge_asicrev == BGE_ASICREV_BCM5704) dma_rw_ctl &= ~BGE_PCIDMARWCTL_MINDMA; pci_write_config(sc->bge_dev, BGE_PCI_DMA_RW_CTL, dma_rw_ctl, 4); @@ -1442,9 +1442,6 @@ CSR_WRITE_4(sc, BGE_SDI_STATS_CTL, BGE_SDISTATSCTL_ENABLE|BGE_SDISTATSCTL_FASTER); - /* init LED register */ - CSR_WRITE_4(sc, BGE_MAC_LED_CTL, 0x00000000); - /* ack/clear link change events */ CSR_WRITE_4(sc, BGE_MAC_STS, BGE_MACSTAT_SYNC_CHANGED| BGE_MACSTAT_CFG_CHANGED); @@ -1455,7 +1452,7 @@ CSR_WRITE_4(sc, BGE_MI_STS, BGE_MISTS_LINK); } else { BGE_SETBIT(sc, BGE_MI_MODE, BGE_MIMODE_AUTOPOLL|10<<16); - if (BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5700) + if (sc->bge_asicrev == BGE_ASICREV_BCM5700) CSR_WRITE_4(sc, BGE_MAC_EVT_ENB, BGE_EVTENB_MI_INTERRUPT); } @@ -1656,9 +1653,11 @@ /* Save ASIC rev. */ - sc->bge_asicrev = + sc->bge_chipid = pci_read_config(dev, BGE_PCI_MISC_CTL, 4) & BGE_PCIMISCCTL_ASICREV; + sc->bge_asicrev = BGE_ASICREV(sc->bge_chipid); + sc->bge_chiprev = BGE_CHIPREV(sc->bge_chipid); /* * Figure out what sort of media we have by checking the @@ -1714,11 +1713,11 @@ * which do not support unaligned accesses, we will realign the * payloads by copying the received packets. */ - switch (sc->bge_asicrev) { - case BGE_ASICREV_BCM5701_A0: - case BGE_ASICREV_BCM5701_B0: - case BGE_ASICREV_BCM5701_B2: - case BGE_ASICREV_BCM5701_B5: + switch (sc->bge_chipid) { + case BGE_CHIPID_BCM5701_A0: + case BGE_CHIPID_BCM5701_B0: + case BGE_CHIPID_BCM5701_B2: + case BGE_CHIPID_BCM5701_B5: /* If in PCI-X mode, work around the alignment bug. */ if ((pci_read_config(dev, BGE_PCI_PCISTATE, 4) & (BGE_PCISTATE_PCI_BUSMODE | BGE_PCISTATE_PCI_BUSSPEED)) == @@ -2073,7 +2072,7 @@ * the interrupt handler. */ - if (BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5700) { + if (sc->bge_asicrev == BGE_ASICREV_BCM5700) { u_int32_t status; status = CSR_READ_4(sc, BGE_MAC_STS); @@ -2353,7 +2352,7 @@ /* Transmit */ CSR_WRITE_4(sc, BGE_MBX_TX_HOST_PROD0_LO, prodidx); /* 5700 b2 errata */ - if (BGE_ASICREV(sc->bge_asicrev) == BGE_ASICREV_BCM5700) + if (sc->bge_chiprev == BGE_CHIPREV_5700_BX) CSR_WRITE_4(sc, BGE_MBX_TX_HOST_PROD0_LO, prodidx); /* ==== //depot/projects/smpng/sys/dev/bge/if_bgereg.h#14 (text+ko) ==== @@ -30,7 +30,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.15 2003/05/03 22:58:45 ps Exp $ + * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.16 2003/05/07 21:51:13 ps Exp $ */ /* @@ -212,23 +212,23 @@ (BGE_PCIMISCCTL_CLEAR_INTA|BGE_PCIMISCCTL_MASK_PCI_INTR| \ BGE_PCIMISCCTL_ENDIAN_WORDSWAP|BGE_PCIMISCCTL_INDIRECT_ACCESS) -#define BGE_ASICREV_TIGON_I 0x40000000 -#define BGE_ASICREV_TIGON_II 0x60000000 -#define BGE_ASICREV_BCM5700_B0 0x71000000 -#define BGE_ASICREV_BCM5700_B1 0x71020000 -#define BGE_ASICREV_BCM5700_B2 0x71030000 -#define BGE_ASICREV_BCM5700_ALTIMA 0x71040000 -#define BGE_ASICREV_BCM5700_C0 0x72000000 -#define BGE_ASICREV_BCM5701_A0 0x00000000 /* grrrr */ -#define BGE_ASICREV_BCM5701_B0 0x01000000 -#define BGE_ASICREV_BCM5701_B2 0x01020000 -#define BGE_ASICREV_BCM5701_B5 0x01050000 -#define BGE_ASICREV_BCM5703_A0 0x10000000 -#define BGE_ASICREV_BCM5703_A1 0x10010000 -#define BGE_ASICREV_BCM5703_A2 0x10020000 -#define BGE_ASICREV_BCM5704_A0 0x20000000 -#define BGE_ASICREV_BCM5704_A1 0x20010000 -#define BGE_ASICREV_BCM5704_A2 0x20020000 +#define BGE_CHIPID_TIGON_I 0x40000000 +#define BGE_CHIPID_TIGON_II 0x60000000 +#define BGE_CHIPID_BCM5700_B0 0x71000000 +#define BGE_CHIPID_BCM5700_B1 0x71020000 +#define BGE_CHIPID_BCM5700_B2 0x71030000 +#define BGE_CHIPID_BCM5700_ALTIMA 0x71040000 +#define BGE_CHIPID_BCM5700_C0 0x72000000 +#define BGE_CHIPID_BCM5701_A0 0x00000000 /* grrrr */ +#define BGE_CHIPID_BCM5701_B0 0x01000000 +#define BGE_CHIPID_BCM5701_B2 0x01020000 +#define BGE_CHIPID_BCM5701_B5 0x01050000 +#define BGE_CHIPID_BCM5703_A0 0x10000000 +#define BGE_CHIPID_BCM5703_A1 0x10010000 +#define BGE_CHIPID_BCM5703_A2 0x10020000 +#define BGE_CHIPID_BCM5704_A0 0x20000000 +#define BGE_CHIPID_BCM5704_A1 0x20010000 +#define BGE_CHIPID_BCM5704_A2 0x20020000 /* shorthand one */ #define BGE_ASICREV(x) ((x) >> 28) @@ -237,6 +237,13 @@ #define BGE_ASICREV_BCM5703 0x01 #define BGE_ASICREV_BCM5704 0x02 +/* chip revisions */ +#define BGE_CHIPREV(x) ((x) >> 24) +#define BGE_CHIPREV_5700_AX 0x70 +#define BGE_CHIPREV_5700_BX 0x71 +#define BGE_CHIPREV_5700_CX 0x72 +#define BGE_CHIPREV_5701_AX 0x00 + /* PCI DMA Read/Write Control register */ #define BGE_PCIDMARWCTL_MINDMA 0x000000FF #define BGE_PCIDMARWCTL_RDADRR_BNDRY 0x00000700 @@ -2135,7 +2142,9 @@ u_int8_t bge_extram; /* has external SSRAM */ u_int8_t bge_tbi; u_int8_t bge_rx_alignment_bug; - u_int32_t bge_asicrev; + u_int32_t bge_chipid; + u_int8_t bge_asicrev; + u_int8_t bge_chiprev; struct bge_ring_data *bge_rdata; /* rings */ struct bge_chain_data bge_cdata; /* mbufs */ u_int16_t bge_tx_saved_considx; ==== //depot/projects/smpng/sys/dev/vinum/vinumioctl.c#13 (text+ko) ==== @@ -41,8 +41,8 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: vinumioctl.c,v 1.21 2003/05/04 05:23:09 grog Exp grog $ - * $FreeBSD: src/sys/dev/vinum/vinumioctl.c,v 1.45 2003/05/05 08:41:53 grog Exp $ + * $Id: vinumioctl.c,v 1.22 2003/05/07 03:31:45 grog Exp grog $ + * $FreeBSD: src/sys/dev/vinum/vinumioctl.c,v 1.46 2003/05/08 00:36:20 grog Exp $ */ #include @@ -303,9 +303,6 @@ return error; case VINUM_READCONFIG: - error = lock_config(); /* get the config for us alone */ - if (error) /* can't do it, */ - return error; /* give up */ if (((char *) data)[0] == '\0') ioctl_reply->error = vinum_scandisk(NULL); /* built your own list */ else @@ -317,7 +314,6 @@ strcpy(ioctl_reply->msg, "no drives found"); } else if (ioctl_reply->error) strcpy(ioctl_reply->msg, "can't read configuration information, see log file"); - unlock_config(); return 0; /* must be 0 to return the real error info */ case VINUM_INIT: ==== //depot/projects/smpng/sys/kern/kern_mac.c#25 (text+ko) ==== @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_mac.c,v 1.89 2003/05/07 17:49:24 rwatson Exp $ + * $FreeBSD: src/sys/kern/kern_mac.c,v 1.90 2003/05/08 19:49:42 rwatson Exp $ */ /* * Developed by the TrustedBSD Project. @@ -98,14 +98,14 @@ SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0, "TrustedBSD MAC policy controls"); -#if MAC_MAX_POLICIES > 32 -#error "MAC_MAX_POLICIES too large" +#if MAC_MAX_SLOTS > 32 +#error "MAC_MAX_SLOTS too large" #endif -static unsigned int mac_max_policies = MAC_MAX_POLICIES; -static unsigned int mac_policy_offsets_free = (1 << MAC_MAX_POLICIES) - 1; -SYSCTL_UINT(_security_mac, OID_AUTO, max_policies, CTLFLAG_RD, - &mac_max_policies, 0, ""); +static unsigned int mac_max_slots = MAC_MAX_SLOTS; +static unsigned int mac_slot_offsets_free = (1 << MAC_MAX_SLOTS) - 1; +SYSCTL_UINT(_security_mac, OID_AUTO, max_slots, CTLFLAG_RD, + &mac_max_slots, 0, ""); /* * Has the kernel started generating labeled objects yet? All read/write @@ -645,13 +645,13 @@ } } if (mpc->mpc_field_off != NULL) { - slot = ffs(mac_policy_offsets_free); + slot = ffs(mac_slot_offsets_free); if (slot == 0) { error = ENOMEM; goto out; } slot--; - mac_policy_offsets_free &= ~(1 << slot); + mac_slot_offsets_free &= ~(1 << slot); *mpc->mpc_field_off = slot; } mpc->mpc_runtime_flags |= MPC_RUNTIME_FLAG_REGISTERED; ==== //depot/projects/smpng/sys/sys/_label.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/_label.h,v 1.3 2002/11/04 02:35:46 rwatson Exp $ + * $FreeBSD: src/sys/sys/_label.h,v 1.4 2003/05/08 19:49:42 rwatson Exp $ */ #ifndef _SYS__LABEL_H #define _SYS__LABEL_H @@ -41,7 +41,7 @@ * and various other messes. */ -#define MAC_MAX_POLICIES 4 +#define MAC_MAX_SLOTS 4 #define MAC_FLAG_INITIALIZED 0x0000001 /* Is initialized for use. */ @@ -50,7 +50,7 @@ union { void *l_ptr; long l_long; - } l_perpolicy[MAC_MAX_POLICIES]; + } l_perpolicy[MAC_MAX_SLOTS]; }; #endif /* !_SYS__LABEL_H */ ==== //depot/projects/smpng/sys/sys/mbuf.h#24 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mbuf.h 8.5 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/mbuf.h,v 1.121 2003/05/02 03:43:40 silby Exp $ + * $FreeBSD: src/sys/sys/mbuf.h,v 1.122 2003/05/09 02:15:52 silby Exp $ */ #ifndef _SYS_MBUF_H_ @@ -153,7 +153,7 @@ #define M_PROTO3 0x0040 /* protocol-specific */ #define M_PROTO4 0x0080 /* protocol-specific */ #define M_PROTO5 0x0100 /* protocol-specific */ -#define M_FREELIST 0x4000 /* mbuf is on the free list */ +#define M_FREELIST 0x8000 /* mbuf is on the free list */ /* * mbuf pkthdr flags (also stored in m_flags). ==== //depot/projects/smpng/sys/vm/vm_object.c#35 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_object.c,v 1.286 2003/05/06 02:45:28 alc Exp $ + * $FreeBSD: src/sys/vm/vm_object.c,v 1.287 2003/05/09 02:13:23 alc Exp $ */ /* @@ -238,8 +238,13 @@ _vm_object_allocate(OBJT_DEFAULT, OFF_TO_IDX(VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS), kernel_object); + /* + * The kmem object's mutex is given a unique name, instead of + * "vm object", to avoid false reports of lock-order reversal + * with a system map mutex. + */ kmem_object = &kmem_object_store; - VM_OBJECT_LOCK_INIT(&kmem_object_store); + mtx_init(VM_OBJECT_MTX(kmem_object), "kmem object", NULL, MTX_DEF); _vm_object_allocate(OBJT_DEFAULT, OFF_TO_IDX(VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS), kmem_object); From owner-p4-projects@FreeBSD.ORG Fri May 9 10:53:11 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 52E9A37B404; Fri, 9 May 2003 10:53:11 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DDB8437B401 for ; Fri, 9 May 2003 10:53:10 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 731E843FAF for ; Fri, 9 May 2003 10:53:10 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h49HrA0U075734 for ; Fri, 9 May 2003 10:53:10 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h49Hr9Zw075731 for perforce@freebsd.org; Fri, 9 May 2003 10:53:09 -0700 (PDT) Date: Fri, 9 May 2003 10:53:09 -0700 (PDT) Message-Id: <200305091753.h49Hr9Zw075731@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30853 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 17:53:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=30853 Change 30853 by jmallett@jmallett_dalek on 2003/05/09 10:52:57 Trace sysinit. Affected files ... .. //depot/projects/mips/sys/kern/init_main.c#11 edit Differences ... ==== //depot/projects/mips/sys/kern/init_main.c#11 (text+ko) ==== @@ -210,6 +210,9 @@ if ((*sipp)->subsystem == SI_SUB_DONE) continue; + printf("SYSINIT[%8x] = %p:%p\n", (*sipp)->subsystem, + sipp, *sipp); + /* Call function */ (*((*sipp)->func))((*sipp)->udata); From owner-p4-projects@FreeBSD.ORG Fri May 9 10:58:18 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE97437B404; Fri, 9 May 2003 10:58:17 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A0CA037B401 for ; Fri, 9 May 2003 10:58:17 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4AD1543F3F for ; Fri, 9 May 2003 10:58:17 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h49HwH0U075951 for ; Fri, 9 May 2003 10:58:17 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h49HwGkG075948 for perforce@freebsd.org; Fri, 9 May 2003 10:58:16 -0700 (PDT) Date: Fri, 9 May 2003 10:58:16 -0700 (PDT) Message-Id: <200305091758.h49HwGkG075948@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30854 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 17:58:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=30854 Change 30854 by jmallett@jmallett_dalek on 2003/05/09 10:57:31 page zeroing from alpha. Affected files ... .. //depot/projects/mips/sys/mips/mips/pmap.c#11 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/pmap.c#11 (text+ko) ==== @@ -304,16 +304,33 @@ return (0); } +/* + * pmap_zero_page zeros the specified hardware page by + * mapping it into virtual memory and using bzero to clear + * its contents. + */ + void pmap_zero_page(vm_page_t m) { - UNIMPL(); + vm_offset_t va = MIPS_PHYS_TO_KSEG0(VM_PAGE_TO_PHYS(m)); + bzero((caddr_t) va, PAGE_SIZE); } + +/* + * pmap_zero_page_area zeros the specified hardware page by + * mapping it into virtual memory and using bzero to clear + * its contents. + * + * off and size must reside within a single page. + */ + void -pmap_zero_page_area(vm_page_t pa, int off, int size) +pmap_zero_page_area(vm_page_t m, int off, int size) { - UNIMPL(); + vm_offset_t va = MIPS_PHYS_TO_KSEG0(VM_PAGE_TO_PHYS(m)); + bzero((char *)(caddr_t)va + off, size); } void From owner-p4-projects@FreeBSD.ORG Fri May 9 11:11:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9CDB37B404; Fri, 9 May 2003 11:11:34 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6B38C37B401 for ; Fri, 9 May 2003 11:11:34 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id EB8B143F93 for ; Fri, 9 May 2003 11:11:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h49IBX0U077379 for ; Fri, 9 May 2003 11:11:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h49IBXoR077376 for perforce@freebsd.org; Fri, 9 May 2003 11:11:33 -0700 (PDT) Date: Fri, 9 May 2003 11:11:33 -0700 (PDT) Message-Id: <200305091811.h49IBXoR077376@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30855 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 18:11:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=30855 Change 30855 by peter@peter_daintree on 2003/05/09 11:11:25 Fix syscons as a console on amd64. It was a simple case of adding __amd64__ to the ifdefs Affected files ... .. //depot/projects/hammer/sys/dev/syscons/syscons.c#7 edit Differences ... ==== //depot/projects/hammer/sys/dev/syscons/syscons.c#7 (text+ko) ==== @@ -145,7 +145,7 @@ static int scparam(struct tty *tp, struct termios *t); static void scstart(struct tty *tp); static void scinit(int unit, int flags); -#if __i386__ || __ia64__ +#if __i386__ || __ia64__ || __amd64__ static void scterm(int unit, int flags); #endif static void scshutdown(void *arg, int howto); @@ -1361,7 +1361,7 @@ static void sccnprobe(struct consdev *cp) { -#if __i386__ || __ia64__ +#if __i386__ || __ia64__ || __amd64__ int unit; int flags; @@ -1379,7 +1379,7 @@ /* initialize required fields */ cp->cn_dev = makedev(CDEV_MAJOR, SC_CONSOLECTL); -#endif /* __i386__ || __ia64__ */ +#endif /* __i386__ || __ia64__ || __amd64__ */ #if __alpha__ /* @@ -1394,7 +1394,7 @@ static void sccninit(struct consdev *cp) { -#if __i386__ || __ia64__ +#if __i386__ || __ia64__ || __amd64__ int unit; int flags; @@ -1402,7 +1402,7 @@ scinit(unit, flags | SC_KERNEL_CONSOLE); sc_console_unit = unit; sc_console = SC_STAT(sc_get_softc(unit, SC_KERNEL_CONSOLE)->dev[0]); -#endif /* __i386__ */ +#endif /* __i386__ || __ia64__ || __amd64__ */ #if __alpha__ /* SHOULDN'T REACH HERE */ @@ -1417,7 +1417,7 @@ if (sc_console_unit < 0) return; /* shouldn't happen */ -#if __i386__ || __ia64__ +#if __i386__ || __ia64__ || __amd64__ #if 0 /* XXX */ sc_clear_screen(sc_console); sccnupdate(sc_console); @@ -1425,7 +1425,7 @@ scterm(sc_console_unit, SC_KERNEL_CONSOLE); sc_console_unit = -1; sc_console = NULL; -#endif /* __i386__ */ +#endif /* __i386__ || __ia64__ || __amd64__ */ #if __alpha__ /* do nothing XXX */ @@ -2806,7 +2806,7 @@ sc->flags |= SC_INIT_DONE; } -#if __i386__ || __ia64__ +#if __i386__ || __ia64__ || __amd64__ static void scterm(int unit, int flags) { @@ -2862,7 +2862,7 @@ sc->keyboard = -1; sc->adapter = -1; } -#endif +#endif /* __i386__ || __ia64__ || __amd64__ */ static void scshutdown(void *arg, int howto) From owner-p4-projects@FreeBSD.ORG Fri May 9 11:13:38 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D910937B404; Fri, 9 May 2003 11:13:37 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 731DA37B401 for ; Fri, 9 May 2003 11:13:37 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1826B43F85 for ; Fri, 9 May 2003 11:13:37 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h49IDa0U077487 for ; Fri, 9 May 2003 11:13:36 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h49IDaMZ077484 for perforce@freebsd.org; Fri, 9 May 2003 11:13:36 -0700 (PDT) Date: Fri, 9 May 2003 11:13:36 -0700 (PDT) Message-Id: <200305091813.h49IDaMZ077484@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30856 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 18:13:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=30856 Change 30856 by peter@peter_daintree on 2003/05/09 11:12:41 Turn syscons back on. It works as a console now and can do the keyboard probe thing like i386 does. Affected files ... .. //depot/projects/hammer/sys/amd64/conf/GENERIC#6 edit Differences ... ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#6 (text+ko) ==== @@ -53,16 +53,16 @@ options KTRACE # atkbdc0 controls both the keyboard and the PS/2 mouse -#device atkbdc # AT keyboard controller -#device atkbd # AT keyboard -#device psm # PS/2 mouse +device atkbdc # AT keyboard controller +device atkbd # AT keyboard +device psm # PS/2 mouse -#device vga # VGA video card driver +device vga # VGA video card driver -#device splash # Splash screen and screen saver support +device splash # Splash screen and screen saver support # syscons is the default console driver, resembling an SCO console -#device sc +device sc #device agp # support several AGP chipsets From owner-p4-projects@FreeBSD.ORG Fri May 9 11:14:40 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC8A837B404; Fri, 9 May 2003 11:14:39 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5A6B937B401 for ; Fri, 9 May 2003 11:14:39 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0534C43F3F for ; Fri, 9 May 2003 11:14:39 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h49IEc0U077525 for ; Fri, 9 May 2003 11:14:38 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h49IEcBw077522 for perforce@freebsd.org; Fri, 9 May 2003 11:14:38 -0700 (PDT) Date: Fri, 9 May 2003 11:14:38 -0700 (PDT) Message-Id: <200305091814.h49IEcBw077522@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30857 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 18:14:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=30857 Change 30857 by peter@peter_daintree on 2003/05/09 11:14:12 This is not for commit to cvs. Print some info about page fault traps. This is a poor substitute for gdb, but helped me a lot. And if I dont submit it on its own soon, I'm going to accidently include it in another submit without comment. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/trap.c#8 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#8 (text+ko) ==== @@ -551,6 +551,11 @@ return (-1); } +printf("trap_pfault: pid %d %s %s %s eva %p, rip %p, rax %p, rbx %p, rcx %p, rdx %p, rsp %p, rvp %p, rsi %p, rdi %p\n", p->p_pid, + frame->tf_err & PGEX_U ? "user" : "supervisor", + frame->tf_err & PGEX_W ? "write" : "read", + frame->tf_err & PGEX_P ? "protection violation" : "page not present", +eva, frame->tf_rip, frame->tf_rax, frame->tf_rbx, frame->tf_rcx, frame->tf_rdx, frame->tf_rsp, frame->tf_rbp, frame->tf_rsi, frame->tf_rdi); /* kludge to pass faulting virtual address to sendsig */ frame->tf_err = eva; From owner-p4-projects@FreeBSD.ORG Fri May 9 11:17:45 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB73937B404; Fri, 9 May 2003 11:17:44 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4D8B837B401 for ; Fri, 9 May 2003 11:17:44 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6CF9443F93 for ; Fri, 9 May 2003 11:17:43 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h49IHh0U077674 for ; Fri, 9 May 2003 11:17:43 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h49IHgEm077671 for perforce@freebsd.org; Fri, 9 May 2003 11:17:42 -0700 (PDT) Date: Fri, 9 May 2003 11:17:42 -0700 (PDT) Message-Id: <200305091817.h49IHgEm077671@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30858 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 18:17:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=30858 Change 30858 by peter@peter_daintree on 2003/05/09 11:17:03 IFC @30847 Affected files ... .. //depot/projects/hammer/bin/echo/echo.1#3 integrate .. //depot/projects/hammer/contrib/gcc/config/i386/freebsd.h#5 integrate .. //depot/projects/hammer/etc/devd.conf#4 integrate .. //depot/projects/hammer/lib/libc/alpha/arith.h#2 integrate .. //depot/projects/hammer/lib/libc/amd64/arith.h#7 integrate .. //depot/projects/hammer/lib/libc/amd64/gen/setjmp.S#6 integrate .. //depot/projects/hammer/lib/libc/i386/arith.h#2 integrate .. //depot/projects/hammer/lib/libc/ia64/arith.h#2 integrate .. //depot/projects/hammer/lib/libc/powerpc/arith.h#2 integrate .. //depot/projects/hammer/lib/libc/sparc64/arith.h#2 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#22 integrate .. //depot/projects/hammer/release/scripts/doFS.sh#8 integrate .. //depot/projects/hammer/release/scripts/print-cdrom-packages.sh#7 integrate .. //depot/projects/hammer/sbin/ldconfig/ldconfig.8#3 integrate .. //depot/projects/hammer/share/man/man5/procfs.5#3 integrate .. //depot/projects/hammer/share/man/man9/Makefile#9 integrate .. //depot/projects/hammer/sys/dev/ata/ata-raid.c#10 integrate .. //depot/projects/hammer/sys/kern/kern_mac.c#16 integrate .. //depot/projects/hammer/sys/sys/_label.h#4 integrate .. //depot/projects/hammer/sys/sys/mbuf.h#11 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#19 integrate .. //depot/projects/hammer/usr.bin/sockstat/sockstat.c#3 integrate Differences ... ==== //depot/projects/hammer/bin/echo/echo.1#3 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)echo.1 8.1 (Berkeley) 7/22/93 -.\" $FreeBSD: src/bin/echo/echo.1,v 1.14 2003/04/12 03:49:28 tjr Exp $ +.\" $FreeBSD: src/bin/echo/echo.1,v 1.15 2003/05/08 17:47:28 schweikh Exp $ .\" .Dd April 12, 2003 .Dt ECHO 1 @@ -58,11 +58,20 @@ The following option is available: .Bl -tag -width flag .It Fl n -Do not print the trailing newline character. This may also be -achieved by appending +Do not print the trailing newline character. +This may also be achieved by appending .Ql \ec to the end of the string, as is done by iBCS2 compatible systems. +Note that this option as well as the effect of +.Ql \ec +are implementation-defined in +.St -p1003.1-2001 +as amended by Cor. 1-2002. +Applications aiming for maximum +portability are strongly encouraged to use +.Xr printf 1 +to suppress the newline character. .El .Pp Some shells may provide a builtin ==== //depot/projects/hammer/contrib/gcc/config/i386/freebsd.h#5 (text+ko) ==== @@ -22,7 +22,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.61 2003/04/26 19:16:54 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.62 2003/05/08 16:02:22 obrien Exp $ */ #undef CC1_SPEC #define CC1_SPEC "%(cc1_cpu) %{profile:-p}" @@ -135,7 +135,7 @@ #define FUNCTION_PROFILER(FILE, LABELNO) \ do { \ if (flag_pic) \ - fprintf ((FILE), "\tcall *.mcount%s@GOT(%%ebx)\n"); \ + fprintf ((FILE), "\tcall *.mcount@GOT(%%ebx)\n"); \ else \ fprintf ((FILE), "\tcall .mcount\n"); \ } while (0) ==== //depot/projects/hammer/etc/devd.conf#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.4 2003/05/07 15:48:20 imp Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.5 2003/05/09 05:58:22 imp Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -66,9 +66,9 @@ # Don't even try to second guess what to do about drivers that don't # match here. Instead, pass it off to syslog. Commented out for the # moment, as pnpinfo isn't set in devd yet -nomatch 0 { - // action "logger Unknown device: $pnpinfo $location $bus"; -}; +#nomatch 0 { +# action "logger Unknown device: $pnpinfo $location $bus"; +#}; /* EXAMPLES TO END OF FILE ==== //depot/projects/hammer/lib/libc/alpha/arith.h#2 (text+ko) ==== @@ -1,7 +1,14 @@ /* * MD header for contrib/netlib/gdtoa * - * $FreeBSD: src/lib/libc/alpha/arith.h,v 1.1 2003/03/12 20:29:58 das Exp $ + * $FreeBSD: src/lib/libc/alpha/arith.h,v 1.2 2003/05/08 13:50:43 das Exp $ + */ + +/* + * NOTE: The definitions in this file must be correct or strtod(3) and + * floating point formats in printf(3) will break! The file can be + * generated by running contrib/gdtoa/arithchk.c on the target + * architecture. See contrib/gdtoa/gdtoaimp.h for details. */ #define IEEE_8087 ==== //depot/projects/hammer/lib/libc/amd64/arith.h#7 (text+ko) ==== @@ -1,7 +1,14 @@ /* * MD header for contrib/gdtoa * - * $FreeBSD: src/lib/libc/amd64/arith.h,v 1.2 2003/05/07 23:48:05 peter Exp $ + * $FreeBSD: src/lib/libc/amd64/arith.h,v 1.3 2003/05/08 13:50:43 das Exp $ + */ + +/* + * NOTE: The definitions in this file must be correct or strtod(3) and + * floating point formats in printf(3) will break! The file can be + * generated by running contrib/gdtoa/arithchk.c on the target + * architecture. See contrib/gdtoa/gdtoaimp.h for details. */ #define IEEE_8087 ==== //depot/projects/hammer/lib/libc/amd64/gen/setjmp.S#6 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)setjmp.s 5.1 (Berkeley) 4/23/90" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.24 2003/05/08 06:25:03 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.25 2003/05/08 07:41:24 peter Exp $"); /* * C library -- _setjmp, _longjmp @@ -80,7 +80,7 @@ pushq %rdi pushq %rsi movq %rdi,%rdx - movq $1,%rdi /* SIG_SETMASK */ + movq $3,%rdi /* SIG_SETMASK */ leaq 72(%rdx),%rsi /* (sigset_t*)set */ movq $0,%rdx /* (sigset_t*)oset */ call PIC_PLT(CNAME(_sigprocmask)) ==== //depot/projects/hammer/lib/libc/i386/arith.h#2 (text+ko) ==== @@ -1,7 +1,14 @@ /* * MD header for contrib/gdtoa * - * $FreeBSD: src/lib/libc/i386/arith.h,v 1.1 2003/03/12 20:29:59 das Exp $ + * $FreeBSD: src/lib/libc/i386/arith.h,v 1.2 2003/05/08 13:50:43 das Exp $ + */ + +/* + * NOTE: The definitions in this file must be correct or strtod(3) and + * floating point formats in printf(3) will break! The file can be + * generated by running contrib/gdtoa/arithchk.c on the target + * architecture. See contrib/gdtoa/gdtoaimp.h for details. */ #define IEEE_8087 ==== //depot/projects/hammer/lib/libc/ia64/arith.h#2 (text+ko) ==== @@ -1,7 +1,14 @@ /* * MD header for contrib/gdtoa * - * $FreeBSD: src/lib/libc/ia64/arith.h,v 1.1 2003/03/12 20:29:59 das Exp $ + * $FreeBSD: src/lib/libc/ia64/arith.h,v 1.2 2003/05/08 13:50:43 das Exp $ + */ + +/* + * NOTE: The definitions in this file must be correct or strtod(3) and + * floating point formats in printf(3) will break! The file can be + * generated by running contrib/gdtoa/arithchk.c on the target + * architecture. See contrib/gdtoa/gdtoaimp.h for details. */ #include ==== //depot/projects/hammer/lib/libc/powerpc/arith.h#2 (text+ko) ==== @@ -1,7 +1,14 @@ /* * MD header for contrib/gdtoa * - * $FreeBSD: src/lib/libc/powerpc/arith.h,v 1.1 2003/03/12 20:29:59 das Exp $ + * $FreeBSD: src/lib/libc/powerpc/arith.h,v 1.2 2003/05/08 13:50:44 das Exp $ + */ + +/* + * NOTE: The definitions in this file must be correct or strtod(3) and + * floating point formats in printf(3) will break! The file can be + * generated by running contrib/gdtoa/arithchk.c on the target + * architecture. See contrib/gdtoa/gdtoaimp.h for details. */ #define IEEE_MC68k ==== //depot/projects/hammer/lib/libc/sparc64/arith.h#2 (text+ko) ==== @@ -1,7 +1,14 @@ /* * MD header for contrib/gdtoa * - * $FreeBSD: src/lib/libc/sparc64/arith.h,v 1.1 2003/03/12 20:29:59 das Exp $ + * $FreeBSD: src/lib/libc/sparc64/arith.h,v 1.2 2003/05/08 13:50:44 das Exp $ + */ + +/* + * NOTE: The definitions in this file must be correct or strtod(3) and + * floating point formats in printf(3) will break! The file can be + * generated by running contrib/gdtoa/arithchk.c on the target + * architecture. See contrib/gdtoa/gdtoaimp.h for details. */ #define IEEE_MC68k ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#22 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.563 2003/05/07 04:15:57 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.566 2003/05/08 22:31:00 bmah Exp $ 2000 @@ -504,6 +504,14 @@ &man.adduser.8; now supports a option to set a user's default login group. + The &man.bsdlabel.8; utility is a replacement for the older + disklabel utility. Like its predecessor, it installs, examines, + or modifies the BSD label on a disk partition, and can install + bootstrap code. Compared to disklabel, a number of obsolete + options and parameters have been retired. A new + option instructs &man.bsdlabel.8; to use the + layout suitable for a specific machine. + The compat4x distribution now includes the libcrypto.so.2, @@ -526,16 +534,10 @@ information about a disk device and optionally to run a naive performance test. - The and flags to - &man.disklabel.8; have been retired. - - &man.disklabel.8; is now only built for architectures where - it is useful (i386, pc98, alpha, and ia64). + The disklabel utility has been replaced by &man.bsdlabel.8;. + On the alpha, i386, and pc98 platforms, disklabel is a link to + &man.bsdlabel.8;. - The option to &man.disklabel.8; has been - removed because the i386 boot loader now resides in a single - file. - &man.dump.8; now supports caching of disk blocks with the option. This can improve dump performance at the cost of possibly missing file system updates that occur @@ -655,12 +657,47 @@ unless UFS1 is specifically requested with the option. - &man.newsyslog.8; now supports a W flag - to force previously-started compression jobs for an entry (or - group of entries specified with the G flag) - to finish before beginning a new one. This feature is designed - to prevent system overloads caused by starting several - compression jobs on big files simultaneously. &merged; + &man.newsyslog.8; has a number of new features. Among them: + + + + A W flag forces previously-started + compression jobs for an entry (or group of entries + specified with the G flag) to finish + before beginning a new one. This feature is designed to + prevent system overloads caused by starting several + compression jobs on big files + simultaneously. &merged; + + + + A default rotate action, to be used for + files specified for rotation but not specified in the + configuration file. &merged; + + + + A command-line flag to disable + sending signals to processes when rotating + files. &merged; + + + + A N configuration file flag to + indicate that no process needs to be signaled when + rotating a file. &merged; + + + + A U configuration file flag to + specify that a process group (rather than a single + process) should be signaled when rotating + files. &merged; + + + + + &man.nsdispatch.3; is now thread-safe and implements support for Name Service Switch (NSS) modules. NSS modules may be @@ -719,7 +756,7 @@ strengthened. The sunlabel utility, a program analogous to - &man.disklabel.8; that works on Sun disk labels, has been + &man.bsdlabel.8; that works on Sun disk labels, has been added. &man.sysinstall.8; will now ==== //depot/projects/hammer/release/scripts/doFS.sh#8 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/release/scripts/doFS.sh,v 1.49 2003/05/03 19:23:10 scottl Exp $ +# $FreeBSD: src/release/scripts/doFS.sh,v 1.50 2003/05/09 09:41:18 scottl Exp $ # set -ex ==== //depot/projects/hammer/release/scripts/print-cdrom-packages.sh#7 (text+ko) ==== @@ -2,7 +2,7 @@ # # Author: Jordan Hubbard # Date: Mon Jul 10 01:18:20 2000 -# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.41 2003/03/03 03:28:30 murray Exp $ +# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.42 2003/05/09 09:41:18 scottl Exp $ # # MAINTAINER: re # @@ -145,7 +145,6 @@ CDROM_SET_1="${CDROM_SET_1} www/netscape-remote" CDROM_SET_1="${CDROM_SET_1} www/netscape-wrapper" CDROM_SET_1="${CDROM_SET_1} www/netscape48-communicator" -CDROM_SET_1="${CDROM_SET_1} www/netscape48-navigator" CDROM_SET_1="${CDROM_SET_1} www/opera" CDROM_SET_1="${CDROM_SET_1} x11/rxvt" ==== //depot/projects/hammer/sbin/ldconfig/ldconfig.8#3 (text+ko) ==== @@ -27,7 +27,7 @@ .\" (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: src/sbin/ldconfig/ldconfig.8,v 1.31 2002/08/18 18:11:38 jdp Exp $ +.\" $FreeBSD: src/sbin/ldconfig/ldconfig.8,v 1.32 2003/05/08 17:25:41 trhodes Exp $ .\" .Dd October 3, 1993 .Dt LDCONFIG 8 @@ -61,6 +61,9 @@ line. Blank lines and lines starting with the comment character .Ql \&# are ignored. +Filenames must conform to the +.Pa lib*.so.[0-9] +pattern in order to be added to the hints file. .Pp For security reasons, directories which are world or group-writable or which are not owned by root produce warning messages and are skipped, unless ==== //depot/projects/hammer/share/man/man5/procfs.5#3 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/share/man/man5/procfs.5,v 1.26 2002/12/12 17:25:57 ru Exp $ +.\" $FreeBSD: src/share/man/man5/procfs.5,v 1.27 2003/05/09 09:20:26 hmp Exp $ .\" Written by Garrett Wollman .\" This file is in the public domain. .\" @@ -171,6 +171,10 @@ and the list of groups (whose first member is the effective group id) all comma separated. +.It +the hostname of the jail in which the process runs, or +.Sq Li - +to indicate that the process is not running within a jail. .El .El .Pp ==== //depot/projects/hammer/share/man/man9/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.187 2003/04/22 03:43:44 imp Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.188 2003/05/09 09:12:10 hmp Exp $ MAN= BUF_LOCK.9 BUF_LOCKFREE.9 BUF_LOCKINIT.9 BUF_REFCNT.9 \ BUF_TIMELOCK.9 BUF_UNLOCK.9 BUS_PRINT_CHILD.9 BUS_READ_IVAR.9 \ @@ -174,6 +174,7 @@ MLINKS+=pfind.9 zpfind.9 MLINKS+=psignal.9 gsignal.9 psignal.9 pgsignal.9 MLINKS+=random.9 srandom.9 random.9 arc4random.9 random.9 read_random.9 +MLINKS+=random.9 arc4rand.9 MLINKS+=rtalloc.9 rtalloc1.9 rtalloc.9 rtalloc_ign.9 MLINKS+=runqueue.9 chooseproc.9 runqueue.9 procrunnable.9 MLINKS+=runqueue.9 remrunqueue.9 runqueue.9 setrunqueue.9 ==== //depot/projects/hammer/sys/dev/ata/ata-raid.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ * (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: src/sys/dev/ata/ata-raid.c,v 1.64 2003/05/04 16:17:54 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-raid.c,v 1.65 2003/05/08 16:38:14 jhb Exp $ */ #include "opt_ata.h" @@ -969,6 +969,7 @@ int disk, s, count = 0, error = 0; caddr_t buffer; + mtx_lock(&Giant); if ((rdp->flags & (AR_F_READY|AR_F_DEGRADED)) != (AR_F_READY|AR_F_DEGRADED)) kthread_exit(EEXIST); ==== //depot/projects/hammer/sys/kern/kern_mac.c#16 (text+ko) ==== @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_mac.c,v 1.89 2003/05/07 17:49:24 rwatson Exp $ + * $FreeBSD: src/sys/kern/kern_mac.c,v 1.90 2003/05/08 19:49:42 rwatson Exp $ */ /* * Developed by the TrustedBSD Project. @@ -98,14 +98,14 @@ SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0, "TrustedBSD MAC policy controls"); -#if MAC_MAX_POLICIES > 32 -#error "MAC_MAX_POLICIES too large" +#if MAC_MAX_SLOTS > 32 +#error "MAC_MAX_SLOTS too large" #endif -static unsigned int mac_max_policies = MAC_MAX_POLICIES; -static unsigned int mac_policy_offsets_free = (1 << MAC_MAX_POLICIES) - 1; -SYSCTL_UINT(_security_mac, OID_AUTO, max_policies, CTLFLAG_RD, - &mac_max_policies, 0, ""); +static unsigned int mac_max_slots = MAC_MAX_SLOTS; +static unsigned int mac_slot_offsets_free = (1 << MAC_MAX_SLOTS) - 1; +SYSCTL_UINT(_security_mac, OID_AUTO, max_slots, CTLFLAG_RD, + &mac_max_slots, 0, ""); /* * Has the kernel started generating labeled objects yet? All read/write @@ -645,13 +645,13 @@ } } if (mpc->mpc_field_off != NULL) { - slot = ffs(mac_policy_offsets_free); + slot = ffs(mac_slot_offsets_free); if (slot == 0) { error = ENOMEM; goto out; } slot--; - mac_policy_offsets_free &= ~(1 << slot); + mac_slot_offsets_free &= ~(1 << slot); *mpc->mpc_field_off = slot; } mpc->mpc_runtime_flags |= MPC_RUNTIME_FLAG_REGISTERED; ==== //depot/projects/hammer/sys/sys/_label.h#4 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/_label.h,v 1.3 2002/11/04 02:35:46 rwatson Exp $ + * $FreeBSD: src/sys/sys/_label.h,v 1.4 2003/05/08 19:49:42 rwatson Exp $ */ #ifndef _SYS__LABEL_H #define _SYS__LABEL_H @@ -41,7 +41,7 @@ * and various other messes. */ -#define MAC_MAX_POLICIES 4 +#define MAC_MAX_SLOTS 4 #define MAC_FLAG_INITIALIZED 0x0000001 /* Is initialized for use. */ @@ -50,7 +50,7 @@ union { void *l_ptr; long l_long; - } l_perpolicy[MAC_MAX_POLICIES]; + } l_perpolicy[MAC_MAX_SLOTS]; }; #endif /* !_SYS__LABEL_H */ ==== //depot/projects/hammer/sys/sys/mbuf.h#11 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mbuf.h 8.5 (Berkeley) 2/19/95 - * $FreeBSD: src/sys/sys/mbuf.h,v 1.121 2003/05/02 03:43:40 silby Exp $ + * $FreeBSD: src/sys/sys/mbuf.h,v 1.122 2003/05/09 02:15:52 silby Exp $ */ #ifndef _SYS_MBUF_H_ @@ -153,7 +153,7 @@ #define M_PROTO3 0x0040 /* protocol-specific */ #define M_PROTO4 0x0080 /* protocol-specific */ #define M_PROTO5 0x0100 /* protocol-specific */ -#define M_FREELIST 0x4000 /* mbuf is on the free list */ +#define M_FREELIST 0x8000 /* mbuf is on the free list */ /* * mbuf pkthdr flags (also stored in m_flags). ==== //depot/projects/hammer/sys/vm/vm_object.c#19 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_object.c,v 1.286 2003/05/06 02:45:28 alc Exp $ + * $FreeBSD: src/sys/vm/vm_object.c,v 1.287 2003/05/09 02:13:23 alc Exp $ */ /* @@ -238,8 +238,13 @@ _vm_object_allocate(OBJT_DEFAULT, OFF_TO_IDX(VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS), kernel_object); + /* + * The kmem object's mutex is given a unique name, instead of + * "vm object", to avoid false reports of lock-order reversal + * with a system map mutex. + */ kmem_object = &kmem_object_store; - VM_OBJECT_LOCK_INIT(&kmem_object_store); + mtx_init(VM_OBJECT_MTX(kmem_object), "kmem object", NULL, MTX_DEF); _vm_object_allocate(OBJT_DEFAULT, OFF_TO_IDX(VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS), kmem_object); ==== //depot/projects/hammer/usr.bin/sockstat/sockstat.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.bin/sockstat/sockstat.c,v 1.6 2003/01/13 00:28:56 dillon Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/sockstat/sockstat.c,v 1.7 2003/05/09 09:11:27 robert Exp $"); #include #include @@ -111,7 +111,7 @@ int port, end; if (ports == NULL) - if ((ports = calloc(1, 65536 / INT_BIT)) == NULL) + if ((ports = calloc(65536 / INT_BIT, sizeof(int))) == NULL) err(1, "calloc()"); p = portspec; while (*p != '\0') { From owner-p4-projects@FreeBSD.ORG Fri May 9 11:30:02 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49F8B37B404; Fri, 9 May 2003 11:30:02 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7FD9637B401 for ; Fri, 9 May 2003 11:30:00 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1EB3D43F3F for ; Fri, 9 May 2003 11:30:00 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h49ITx0U078244 for ; Fri, 9 May 2003 11:29:59 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h49ITxFo078241 for perforce@freebsd.org; Fri, 9 May 2003 11:29:59 -0700 (PDT) Date: Fri, 9 May 2003 11:29:59 -0700 (PDT) Message-Id: <200305091829.h49ITxFo078241@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30861 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 18:30:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=30861 Change 30861 by peter@peter_daintree on 2003/05/09 11:29:56 IFC @30860 Affected files ... .. //depot/projects/hammer/sys/amd64/conf/GENERIC#7 integrate .. //depot/projects/hammer/sys/amd64/include/npx.h#7 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.c#8 integrate Differences ... ==== //depot/projects/hammer/sys/amd64/conf/GENERIC#7 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.383 2003/05/01 01:05:22 peter Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.384 2003/05/09 18:26:06 peter Exp $ machine amd64 cpu HAMMER ==== //depot/projects/hammer/sys/amd64/include/npx.h#7 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)npx.h 5.3 (Berkeley) 1/18/91 - * $FreeBSD: src/sys/amd64/include/npx.h,v 1.27 2003/05/01 01:05:23 peter Exp $ + * $FreeBSD: src/sys/amd64/include/npx.h,v 1.28 2003/05/09 18:28:05 peter Exp $ */ /* ==== //depot/projects/hammer/sys/dev/syscons/syscons.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ * (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: src/sys/dev/syscons/syscons.c,v 1.401 2003/03/25 00:07:01 jake Exp $ + * $FreeBSD: src/sys/dev/syscons/syscons.c,v 1.402 2003/05/09 18:24:40 peter Exp $ */ #include "opt_syscons.h" From owner-p4-projects@FreeBSD.ORG Fri May 9 11:36:10 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1FBA437B404; Fri, 9 May 2003 11:36:10 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B21CD37B401 for ; Fri, 9 May 2003 11:36:09 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5E14C43F85 for ; Fri, 9 May 2003 11:36:09 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h49Ia90U078534 for ; Fri, 9 May 2003 11:36:09 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h49Ia8ua078531 for perforce@freebsd.org; Fri, 9 May 2003 11:36:08 -0700 (PDT) Date: Fri, 9 May 2003 11:36:08 -0700 (PDT) Message-Id: <200305091836.h49Ia8ua078531@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30863 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 18:36:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=30863 Change 30863 by peter@peter_daintree on 2003/05/09 11:35:32 revert to vendor. If this causes a compile error, it is because cc is misconfigured about the sizeof ptrdiff_t and size_t. Affected files ... .. //depot/projects/hammer/sys/vm/vm_pager.c#6 edit Differences ... ==== //depot/projects/hammer/sys/vm/vm_pager.c#6 (text+ko) ==== @@ -340,7 +340,8 @@ bp->b_rcred = NOCRED; bp->b_wcred = NOCRED; bp->b_qindex = 0; /* On no queue (QUEUE_NONE) */ - bp->b_data = (caddr_t) ((MAXPHYS * (bp - swbuf)) + swapbkva); + /* If you get a compile error here, it is because your cc is misconfigured */ + bp->b_data = (caddr_t) (MAXPHYS * (bp - swbuf)) + swapbkva; bp->b_kvabase = bp->b_data; bp->b_kvasize = MAXPHYS; bp->b_xflags = 0; From owner-p4-projects@FreeBSD.ORG Fri May 9 11:41:18 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0DC7637B404; Fri, 9 May 2003 11:41:18 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B814337B401 for ; Fri, 9 May 2003 11:41:17 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 619DD43F75 for ; Fri, 9 May 2003 11:41:17 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h49IfH0U078793 for ; Fri, 9 May 2003 11:41:17 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h49IfGmb078790 for perforce@freebsd.org; Fri, 9 May 2003 11:41:16 -0700 (PDT) Date: Fri, 9 May 2003 11:41:16 -0700 (PDT) Message-Id: <200305091841.h49IfGmb078790@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30865 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 18:41:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=30865 Change 30865 by peter@peter_daintree on 2003/05/09 11:40:35 bracket the bug workarounds with #ifdef BUG. This seems to be fixed in gcc-3.3, or its related to the ptrdiff_t size bug somehow. Affected files ... .. //depot/projects/hammer/sys/kern/subr_scanf.c#5 edit .. //depot/projects/hammer/sys/net/radix.c#5 edit Differences ... ==== //depot/projects/hammer/sys/kern/subr_scanf.c#5 (text+ko) ==== @@ -498,7 +498,11 @@ } goto match_failure; } +#ifdef BUG + c = ((u_char *)p)[-1]; +#else c = (((u_char *)p) - 1)[0]; +#endif if (c == 'x' || c == 'X') { --p; inp--; ==== //depot/projects/hammer/sys/net/radix.c#5 (text+ko) ==== @@ -451,7 +451,11 @@ /* * Trim trailing zeroes. */ +#ifdef BUG + for (cp = addmask_key + mlen; (cp > addmask_key) && cp[-1] == 0;) +#else for (cp = addmask_key + mlen; (cp > addmask_key) && *(cp - 1) == 0;) +#endif cp--; mlen = cp - addmask_key; if (mlen <= skip) { From owner-p4-projects@FreeBSD.ORG Fri May 9 12:08:53 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8503037B404; Fri, 9 May 2003 12:08:52 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 37F4237B401 for ; Fri, 9 May 2003 12:08:52 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D0E8F43F75 for ; Fri, 9 May 2003 12:08:51 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h49J8p0U081275 for ; Fri, 9 May 2003 12:08:51 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h49J8ptO081272 for perforce@freebsd.org; Fri, 9 May 2003 12:08:51 -0700 (PDT) Date: Fri, 9 May 2003 12:08:51 -0700 (PDT) Message-Id: <200305091908.h49J8ptO081272@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30867 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 19:08:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=30867 Change 30867 by peter@peter_daintree on 2003/05/09 12:08:21 revert the #ifdef BUG code to the vendor. With the ptrdiff_t fixes, it seems to work. Add a big flashing warning about vm/vm_pager.c since that seems to be a good indicator. Affected files ... .. //depot/projects/hammer/sys/kern/subr_scanf.c#6 edit .. //depot/projects/hammer/sys/net/radix.c#6 edit .. //depot/projects/hammer/sys/vm/vm_pager.c#7 edit Differences ... ==== //depot/projects/hammer/sys/kern/subr_scanf.c#6 (text+ko) ==== @@ -498,11 +498,7 @@ } goto match_failure; } -#ifdef BUG c = ((u_char *)p)[-1]; -#else - c = (((u_char *)p) - 1)[0]; -#endif if (c == 'x' || c == 'X') { --p; inp--; ==== //depot/projects/hammer/sys/net/radix.c#6 (text+ko) ==== @@ -451,11 +451,7 @@ /* * Trim trailing zeroes. */ -#ifdef BUG for (cp = addmask_key + mlen; (cp > addmask_key) && cp[-1] == 0;) -#else - for (cp = addmask_key + mlen; (cp > addmask_key) && *(cp - 1) == 0;) -#endif cp--; mlen = cp - addmask_key; if (mlen <= skip) { ==== //depot/projects/hammer/sys/vm/vm_pager.c#7 (text+ko) ==== @@ -340,7 +340,15 @@ bp->b_rcred = NOCRED; bp->b_wcred = NOCRED; bp->b_qindex = 0; /* On no queue (QUEUE_NONE) */ - /* If you get a compile error here, it is because your cc is misconfigured */ +#ifdef __amd64__ + /* + * If you get a compile error here, it is because your gcc is + * misconfigured. Do *NOT* bandaid it, because this is a mine + * canary. If this fails to compile, then gcc will generate + * invalid code in kern/subr_scanf.c and net/radix.c. + * Fix your gcc, do not not this line. + */ +#endif bp->b_data = (caddr_t) (MAXPHYS * (bp - swbuf)) + swapbkva; bp->b_kvabase = bp->b_data; bp->b_kvasize = MAXPHYS; From owner-p4-projects@FreeBSD.ORG Fri May 9 12:44:39 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD9BD37B407; Fri, 9 May 2003 12:44:38 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8FA4037B405 for ; Fri, 9 May 2003 12:44:38 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1AF4343FA3 for ; Fri, 9 May 2003 12:44:38 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h49Jib0U082732 for ; Fri, 9 May 2003 12:44:37 -0700 (PDT) (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h49Jibg0082729 for perforce@freebsd.org; Fri, 9 May 2003 12:44:37 -0700 (PDT) Date: Fri, 9 May 2003 12:44:37 -0700 (PDT) Message-Id: <200305091944.h49Jibg0082729@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Subject: PERFORCE change 30871 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 19:44:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=30871 Change 30871 by jhb@jhb_laptop on 2003/05/09 12:44:30 IFC @30870. Affected files ... .. //depot/projects/smpng/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/smpng/sys/amd64/include/npx.h#2 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#29 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#66 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#2 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.383 2003/05/01 01:05:22 peter Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.384 2003/05/09 18:26:06 peter Exp $ machine amd64 cpu HAMMER @@ -52,16 +52,16 @@ options KTRACE # atkbdc0 controls both the keyboard and the PS/2 mouse -#device atkbdc # AT keyboard controller -#device atkbd # AT keyboard -#device psm # PS/2 mouse +device atkbdc # AT keyboard controller +device atkbd # AT keyboard +device psm # PS/2 mouse -#device vga # VGA video card driver +device vga # VGA video card driver -#device splash # Splash screen and screen saver support +device splash # Splash screen and screen saver support # syscons is the default console driver, resembling an SCO console -#device sc +device sc #device agp # support several AGP chipsets ==== //depot/projects/smpng/sys/amd64/include/npx.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)npx.h 5.3 (Berkeley) 1/18/91 - * $FreeBSD: src/sys/amd64/include/npx.h,v 1.27 2003/05/01 01:05:23 peter Exp $ + * $FreeBSD: src/sys/amd64/include/npx.h,v 1.28 2003/05/09 18:28:05 peter Exp $ */ /* @@ -95,6 +95,8 @@ * intermediate values are stored in memory or in FPU registers. */ #define __INITIAL_NPXCW__ 0x127F +#define __INITIAL_MXCSR__ 0x1F80 +#define __INITIAL_MXCSR_MASK__ 0xFFBF #ifdef _KERNEL int npxdna(void); ==== //depot/projects/smpng/sys/dev/syscons/syscons.c#29 (text+ko) ==== @@ -25,7 +25,7 @@ * (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: src/sys/dev/syscons/syscons.c,v 1.401 2003/03/25 00:07:01 jake Exp $ + * $FreeBSD: src/sys/dev/syscons/syscons.c,v 1.402 2003/05/09 18:24:40 peter Exp $ */ #include "opt_syscons.h" @@ -145,7 +145,7 @@ static int scparam(struct tty *tp, struct termios *t); static void scstart(struct tty *tp); static void scinit(int unit, int flags); -#if __i386__ || __ia64__ +#if __i386__ || __ia64__ || __amd64__ static void scterm(int unit, int flags); #endif static void scshutdown(void *arg, int howto); @@ -1361,7 +1361,7 @@ static void sccnprobe(struct consdev *cp) { -#if __i386__ || __ia64__ +#if __i386__ || __ia64__ || __amd64__ int unit; int flags; @@ -1379,7 +1379,7 @@ /* initialize required fields */ cp->cn_dev = makedev(CDEV_MAJOR, SC_CONSOLECTL); -#endif /* __i386__ || __ia64__ */ +#endif /* __i386__ || __ia64__ || __amd64__ */ #if __alpha__ /* @@ -1394,7 +1394,7 @@ static void sccninit(struct consdev *cp) { -#if __i386__ || __ia64__ +#if __i386__ || __ia64__ || __amd64__ int unit; int flags; @@ -1402,7 +1402,7 @@ scinit(unit, flags | SC_KERNEL_CONSOLE); sc_console_unit = unit; sc_console = SC_STAT(sc_get_softc(unit, SC_KERNEL_CONSOLE)->dev[0]); -#endif /* __i386__ */ +#endif /* __i386__ || __ia64__ || __amd64__ */ #if __alpha__ /* SHOULDN'T REACH HERE */ @@ -1417,7 +1417,7 @@ if (sc_console_unit < 0) return; /* shouldn't happen */ -#if __i386__ || __ia64__ +#if __i386__ || __ia64__ || __amd64__ #if 0 /* XXX */ sc_clear_screen(sc_console); sccnupdate(sc_console); @@ -1425,7 +1425,7 @@ scterm(sc_console_unit, SC_KERNEL_CONSOLE); sc_console_unit = -1; sc_console = NULL; -#endif /* __i386__ */ +#endif /* __i386__ || __ia64__ || __amd64__ */ #if __alpha__ /* do nothing XXX */ @@ -2806,7 +2806,7 @@ sc->flags |= SC_INIT_DONE; } -#if __i386__ || __ia64__ +#if __i386__ || __ia64__ || __amd64__ static void scterm(int unit, int flags) { @@ -2862,7 +2862,7 @@ sc->keyboard = -1; sc->adapter = -1; } -#endif +#endif /* __i386__ || __ia64__ || __amd64__ */ static void scshutdown(void *arg, int howto) ==== //depot/projects/smpng/sys/kern/kern_sig.c#66 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_sig.c 8.7 (Berkeley) 4/18/94 - * $FreeBSD: src/sys/kern/kern_sig.c,v 1.236 2003/05/05 21:26:25 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_sig.c,v 1.237 2003/05/09 19:11:32 jhb Exp $ */ #include "opt_compat.h" @@ -1072,7 +1072,6 @@ kern_sigsuspend(struct thread *td, sigset_t mask) { struct proc *p = td->td_proc; - register struct sigacts *ps; /* * When returning from sigsuspend, we want @@ -1081,9 +1080,7 @@ * save it here and mark the sigacts structure * to indicate this. */ - mtx_lock(&Giant); PROC_LOCK(p); - ps = p->p_sigacts; td->td_oldsigmask = td->td_sigmask; mtx_lock_spin(&sched_lock); td->td_flags |= TDF_OLDMASK; @@ -1091,10 +1088,9 @@ SIG_CANTMASK(mask); td->td_sigmask = mask; signotify(td); - while (msleep(ps, &p->p_mtx, PPAUSE|PCATCH, "pause", 0) == 0) + while (msleep(p->p_sigacts, &p->p_mtx, PPAUSE|PCATCH, "pause", 0) == 0) /* void */; PROC_UNLOCK(p); - mtx_unlock(&Giant); /* always return EINTR rather than ERESTART... */ return (EINTR); } @@ -1116,11 +1112,8 @@ { struct proc *p = td->td_proc; sigset_t mask; - register struct sigacts *ps; - mtx_lock(&Giant); PROC_LOCK(p); - ps = p->p_sigacts; td->td_oldsigmask = td->td_sigmask; mtx_lock_spin(&sched_lock); td->td_flags |= TDF_OLDMASK; @@ -1129,10 +1122,9 @@ SIG_CANTMASK(mask); SIGSETLO(td->td_sigmask, mask); signotify(td); - while (msleep(ps, &p->p_mtx, PPAUSE|PCATCH, "opause", 0) == 0) + while (msleep(p->p_sigacts, &p->p_mtx, PPAUSE|PCATCH, "opause", 0) == 0) /* void */; PROC_UNLOCK(p); - mtx_unlock(&Giant); /* always return EINTR rather than ERESTART... */ return (EINTR); } From owner-p4-projects@FreeBSD.ORG Fri May 9 13:15:18 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A30B37B401; Fri, 9 May 2003 13:15:17 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2DAB837B404 for ; Fri, 9 May 2003 13:15:17 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C862343F93 for ; Fri, 9 May 2003 13:15:16 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h49KFG0U090140 for ; Fri, 9 May 2003 13:15:16 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h49KFGFp090132 for perforce@freebsd.org; Fri, 9 May 2003 13:15:16 -0700 (PDT) Date: Fri, 9 May 2003 13:15:16 -0700 (PDT) Message-Id: <200305092015.h49KFGFp090132@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30873 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 20:15:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=30873 Change 30873 by peter@peter_daintree on 2003/05/09 13:14:36 Fix for vfprintf.c ICE from rth@redhat.com * config/i386/i386.c (ix86_split_long_move): Fix base register mode for XFmode splits for TARGET_64BIT. In the queue for gcc-3.3.1. Affected files ... .. //depot/projects/hammer/contrib/gcc/config/i386/i386.c#5 edit Differences ... ==== //depot/projects/hammer/contrib/gcc/config/i386/i386.c#5 (text+ko) ==== @@ -8823,15 +8823,24 @@ Do an lea to the last part and use only one colliding move. */ else if (collisions > 1) { + rtx base; + collisions = 1; - emit_insn (gen_rtx_SET (VOIDmode, part[0][nparts - 1], - XEXP (part[1][0], 0))); - part[1][0] = change_address (part[1][0], - TARGET_64BIT ? DImode : SImode, - part[0][nparts - 1]); - part[1][1] = adjust_address (part[1][0], VOIDmode, UNITS_PER_WORD); + + base = part[0][nparts - 1]; + + /* Handle the case when the last part isn't valid for lea. + Happens in 64-bit mode storing the 12-byte XFmode. */ + if (GET_MODE (base) != Pmode) + base = gen_rtx_REG (Pmode, REGNO (base)); + + emit_insn (gen_rtx_SET (VOIDmode, base, XEXP (part[1][0], 0))); + part[1][0] = replace_equiv_address (part[1][0], base); + part[1][1] = replace_equiv_address (part[1][1], + plus_constant (base, UNITS_PER_WORD)); if (nparts == 3) - part[1][2] = adjust_address (part[1][0], VOIDmode, 8); + part[1][2] = replace_equiv_address (part[1][2], + plus_constant (base, 8)); } } From owner-p4-projects@FreeBSD.ORG Fri May 9 13:16:20 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 928C637B405; Fri, 9 May 2003 13:16:19 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2F19A37B401 for ; Fri, 9 May 2003 13:16:19 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id CC53643F93 for ; Fri, 9 May 2003 13:16:18 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h49KGI0U090166 for ; Fri, 9 May 2003 13:16:18 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h49KGI3X090163 for perforce@freebsd.org; Fri, 9 May 2003 13:16:18 -0700 (PDT) Date: Fri, 9 May 2003 13:16:18 -0700 (PDT) Message-Id: <200305092016.h49KGI3X090163@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30874 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 20:16:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=30874 Change 30874 by peter@peter_daintree on 2003/05/09 13:15:22 Kill vfprintf.c workarounds. gcc patch makes it work right now. Affected files ... .. //depot/projects/hammer/lib/libc/stdio/Makefile.inc#9 edit Differences ... ==== //depot/projects/hammer/lib/libc/stdio/Makefile.inc#9 (text+ko) ==== @@ -61,22 +61,3 @@ wprintf.3 vwprintf.3 wprintf.3 vfwprintf.3 wprintf.3 vswprintf.3 MLINKS+=wscanf.3 fwscanf.3 wscanf.3 swscanf.3 wscanf.3 vwscanf.3 \ wscanf.3 vswscanf.3 wscanf.3 vfwscanf.3 - -.if ${MACHINE_ARCH} == "amd64" -.for _file in vfprintf vfwprintf -${_file}.o: ${_file}.c - ${CC} ${CFLAGS:N-O*} -c ${.IMPSRC} -o ${.TARGET} - @${LD} -o ${.TARGET}.tmp -x -r ${.TARGET} - @mv ${.TARGET}.tmp ${.TARGET} - -${_file}.So: ${_file}.c - ${CC} ${PICFLAG} -DPIC ${CFLAGS:N-O*} -c ${.IMPSRC} -o ${.TARGET} - @${LD} ${LDFLAGS} -o ${.TARGET}.tmp -x -r ${.TARGET} - @mv ${.TARGET}.tmp ${.TARGET} - -${_file}.po: ${_file}.c - ${CC} -pg ${CFLAGS:N-O*} -c ${.IMPSRC} -o ${.TARGET} - @${LD} -o ${.TARGET}.tmp -X -r ${.TARGET} - @mv ${.TARGET}.tmp ${.TARGET} -.endfor -.endif From owner-p4-projects@FreeBSD.ORG Fri May 9 14:48:15 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EAE3D37B404; Fri, 9 May 2003 14:48:14 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A14EC37B401 for ; Fri, 9 May 2003 14:48:14 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4CCB843F3F for ; Fri, 9 May 2003 14:48:14 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h49LmE0U094539 for ; Fri, 9 May 2003 14:48:14 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h49LmDhC094536 for perforce@freebsd.org; Fri, 9 May 2003 14:48:13 -0700 (PDT) Date: Fri, 9 May 2003 14:48:13 -0700 (PDT) Message-Id: <200305092148.h49LmDhC094536@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30881 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 21:48:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=30881 Change 30881 by peter@peter_hammer on 2003/05/09 14:47:36 make ppp compile (avoid ICE in gcc-3.2.2) by trivially changing the algorithm to something equivalent. Affected files ... .. //depot/projects/hammer/usr.sbin/ppp/ncpaddr.c#5 edit Differences ... ==== //depot/projects/hammer/usr.sbin/ppp/ncpaddr.c#5 (text+ko) ==== @@ -142,16 +142,16 @@ { const u_char masks[] = { 0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe }; const u_char *c, *p, *end; - int masklen; + int masklen, m; p = (const u_char *)mask; for (masklen = 0, end = p + 16; p < end && *p == 0xff; p++) masklen += 8; if (p < end) { - for (c = masks; c < masks + sizeof masks; c++) + for (c = masks, m = 0; c < masks + sizeof masks; c++, m++) if (*c == *p) { - masklen += c - masks; + masklen += m; break; } } From owner-p4-projects@FreeBSD.ORG Fri May 9 14:50:19 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1FDC937B401; Fri, 9 May 2003 14:50:19 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A855137B404 for ; Fri, 9 May 2003 14:50:17 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F99843F75 for ; Fri, 9 May 2003 14:50:17 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h49LoH0U094652 for ; Fri, 9 May 2003 14:50:17 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h49LoGkd094649 for perforce@freebsd.org; Fri, 9 May 2003 14:50:16 -0700 (PDT) Date: Fri, 9 May 2003 14:50:16 -0700 (PDT) Message-Id: <200305092150.h49LoGkd094649@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30882 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 21:50:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=30882 Change 30882 by peter@peter_hammer on 2003/05/09 14:49:31 make this compile. grr. Affected files ... .. //depot/projects/hammer/usr.sbin/pppd/main.c#2 edit Differences ... ==== //depot/projects/hammer/usr.sbin/pppd/main.c#2 (text+ko) ==== @@ -1530,7 +1530,7 @@ break; case 'r': f = va_arg(args, char *); -#ifndef __powerpc__ +#if !defined(__powerpc__) && !defined(__amd64__) n = vfmtmsg(buf, buflen + 1, f, va_arg(args, va_list)); #else /* On the powerpc, a va_list is an array of 1 structure */ From owner-p4-projects@FreeBSD.ORG Fri May 9 14:54:24 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE2FD37B404; Fri, 9 May 2003 14:54:23 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7615737B401 for ; Fri, 9 May 2003 14:54:23 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0BBDE43F3F for ; Fri, 9 May 2003 14:54:23 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h49LsM0U094792 for ; Fri, 9 May 2003 14:54:22 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h49LsMoc094789 for perforce@freebsd.org; Fri, 9 May 2003 14:54:22 -0700 (PDT) Date: Fri, 9 May 2003 14:54:22 -0700 (PDT) Message-Id: <200305092154.h49LsMoc094789@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30883 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 21:54:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=30883 Change 30883 by peter@peter_hammer on 2003/05/09 14:54:16 add ldexp.c back again Affected files ... .. //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#8 edit .. //depot/projects/hammer/lib/libc/amd64/gen/ldexp.c#3 add Differences ... ==== //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#8 (text+ko) ==== @@ -3,4 +3,4 @@ SRCS+= _setjmp.S setjmp.S sigsetjmp.S \ fabs.S modf.S \ - frexp.c infinity.c isinf.c + frexp.c infinity.c isinf.c ldexp.c From owner-p4-projects@FreeBSD.ORG Fri May 9 15:01:33 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CB3537B404; Fri, 9 May 2003 15:01:33 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B920137B401 for ; Fri, 9 May 2003 15:01:32 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4EE0B43FBD for ; Fri, 9 May 2003 15:01:32 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h49M1W0U095145 for ; Fri, 9 May 2003 15:01:32 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h49M1Vdq095142 for perforce@freebsd.org; Fri, 9 May 2003 15:01:31 -0700 (PDT) Date: Fri, 9 May 2003 15:01:31 -0700 (PDT) Message-Id: <200305092201.h49M1Vdq095142@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30884 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 22:01:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=30884 Change 30884 by peter@peter_hammer on 2003/05/09 15:00:43 ok, turn ppp/pppd back on Affected files ... .. //depot/projects/hammer/usr.sbin/Makefile#12 edit Differences ... ==== //depot/projects/hammer/usr.sbin/Makefile#12 (text+ko) ==== @@ -74,6 +74,8 @@ pciconf \ periodic \ pkg_install \ + ppp \ + pppd \ pppstats \ procctl \ pstat \ @@ -132,11 +134,6 @@ ypset \ zic -.if ${MACHINE_ARCH} != "amd64" -SUBDIR+=ppp \ - pppd -.endif - .if !defined(NO_IPFILTER) SUBDIR+=ipftest \ ipresend \ From owner-p4-projects@FreeBSD.ORG Fri May 9 15:12:47 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3A1E337B404; Fri, 9 May 2003 15:12:47 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CD87D37B401 for ; Fri, 9 May 2003 15:12:46 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7577B43FD7 for ; Fri, 9 May 2003 15:12:46 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h49MCk0U096434 for ; Fri, 9 May 2003 15:12:46 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h49MCkkp096431 for perforce@freebsd.org; Fri, 9 May 2003 15:12:46 -0700 (PDT) Date: Fri, 9 May 2003 15:12:46 -0700 (PDT) Message-Id: <200305092212.h49MCkkp096431@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30885 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 22:12:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=30885 Change 30885 by peter@peter_hammer on 2003/05/09 15:12:05 Provide a fake stdarg implementation for lint's benefit so that it can see how it is supposed to work. lint doesn't know that this is totally bogus though (and doesn't need to). Affected files ... .. //depot/projects/hammer/sys/amd64/include/_types.h#4 edit .. //depot/projects/hammer/sys/amd64/include/stdarg.h#3 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/_types.h#4 (text+ko) ==== @@ -96,7 +96,11 @@ /* * Unusual type definitions. */ +#if defined(__GNUC__) typedef __builtin_va_list __va_list; /* internally known to gcc */ +#elif defined(lint) +typedef char * __va_list; /* pretend */ +#endif #if defined __GNUC__ && !defined(__GNUC_VA_LIST) && !defined(__NO_GNUC_VA_LIST) #define __GNUC_VA_LIST typedef __va_list __gnuc_va_list; /* compatibility w/GNU headers*/ ==== //depot/projects/hammer/sys/amd64/include/stdarg.h#3 (text+ko) ==== @@ -39,6 +39,7 @@ typedef __va_list va_list; #endif +#if defined(__GNUC__) #define va_start(ap, last) \ __builtin_stdarg_start((ap), (last)) @@ -53,4 +54,16 @@ #define va_end(ap) \ __builtin_va_end(ap) +#elif defined(lint) +/* Provide a fake implementation for lint's benefit */ +#define __va_size(type) \ + (((sizeof(type) + sizeof(long) - 1) / sizeof(long)) * sizeof(long)) +#define va_start(ap, last) \ + ((ap) = (va_list)&(last) + __va_size(last)) +#define va_arg(ap, type) \ + (*(type *)((ap) += __va_size(type), (ap) - __va_size(type))) +#define va_end(ap) + +#endif + #endif /* !_MACHINE_STDARG_H_ */ From owner-p4-projects@FreeBSD.ORG Fri May 9 15:27:05 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2F22537B404; Fri, 9 May 2003 15:27:05 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BF51F37B401 for ; Fri, 9 May 2003 15:27:04 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4C42943F93 for ; Fri, 9 May 2003 15:27:04 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h49MR40U096905 for ; Fri, 9 May 2003 15:27:04 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h49MR3KS096902 for perforce@freebsd.org; Fri, 9 May 2003 15:27:03 -0700 (PDT) Date: Fri, 9 May 2003 15:27:03 -0700 (PDT) Message-Id: <200305092227.h49MR3KS096902@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30886 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 22:27:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=30886 Change 30886 by peter@peter_daintree on 2003/05/09 15:26:39 nuke this toxic ARCH_INDIRECT stuff. This is for lib/msun on i386 where it tests for hardware floating point support (versus the math emulator) and decides whether to do hardware or software implementations of the float stuff. Affected files ... .. //depot/projects/hammer/sys/amd64/include/asm.h#6 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/asm.h#6 (text+ko) ==== @@ -91,67 +91,4 @@ #define __FBSDID(s) /* nothing */ #endif /* not lint and not STRIP_FBSDID */ -#ifdef _ARCH_INDIRECT -/* - * Generate code to select between the generic functions and _ARCH_INDIRECT - * specific ones. - * XXX nested __CONCATs don't work with non-ANSI cpp's. - */ -#define ANAME(x) CNAME(__CONCAT(__CONCAT(__,_ARCH_INDIRECT),x)) -#define ASELNAME(x) CNAME(__CONCAT(__arch_select_,x)) -#define AVECNAME(x) CNAME(__CONCAT(__arch_,x)) -#define GNAME(x) CNAME(__CONCAT(__generic_,x)) - -/* Don't bother profiling this. */ -#ifdef PIC -#define ARCH_DISPATCH(x) \ - _START_ENTRY; \ - .globl CNAME(x); .type CNAME(x),@function; CNAME(x): ; \ - movq PIC_GOT(AVECNAME(x)),%rax; \ - jmpq *(%rax) - -#define ARCH_SELECT(x) _START_ENTRY; \ - .type ASELNAME(x),@function; \ - ASELNAME(x): \ - call PIC_PLT(CNAME(__get_hw_float)); \ - testq %rax,%rax; \ - movq PIC_GOT(ANAME(x)),%rax; \ - jne 8f; \ - movq PIC_GOT(GNAME(x)),%rax; \ - 8: \ - movq PIC_GOT(AVECNAME(x)),%rdx; \ - movq %rax,(%rdx); \ - jmpq *%rax -#else /* !PIC */ -#define ARCH_DISPATCH(x) \ - _START_ENTRY; \ - .globl CNAME(x); .type CNAME(x),@function; CNAME(x): ; \ - jmpw *AVECNAME(x) - -#define ARCH_SELECT(x) _START_ENTRY; \ - .type ASELNAME(x),@function; \ - ASELNAME(x): \ - call CNAME(__get_hw_float); \ - testw %rax,%rax; \ - movw $ANAME(x),%rax; \ - jne 8f; \ - movw $GNAME(x),%rax; \ - 8: \ - movw %rax,AVECNAME(x); \ - jmpw *%rax -#endif /* PIC */ - -#define ARCH_VECTOR(x) .data; .p2align 2; \ - .globl AVECNAME(x); \ - .type AVECNAME(x),@object; \ - .size AVECNAME(x),4; \ - AVECNAME(x): .long ASELNAME(x) - -#undef _ENTRY -#define _ENTRY(x) ARCH_VECTOR(x); ARCH_SELECT(x); ARCH_DISPATCH(x); \ - _START_ENTRY; \ - .globl ANAME(x); .type ANAME(x),@function; ANAME(x): - -#endif /* _ARCH_INDIRECT */ - #endif /* !_MACHINE_ASM_H_ */ From owner-p4-projects@FreeBSD.ORG Fri May 9 15:41:23 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3574037B404; Fri, 9 May 2003 15:41:23 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A74C337B401 for ; Fri, 9 May 2003 15:41:22 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3EA6643F85 for ; Fri, 9 May 2003 15:41:22 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h49MfM0U097481 for ; Fri, 9 May 2003 15:41:22 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h49MfL9i097478 for perforce@freebsd.org; Fri, 9 May 2003 15:41:21 -0700 (PDT) Date: Fri, 9 May 2003 15:41:21 -0700 (PDT) Message-Id: <200305092241.h49MfL9i097478@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30887 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 22:41:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=30887 Change 30887 by peter@peter_hammer on 2003/05/09 15:40:29 exclude rtld-elf for NOPIC as well, since -lc_pic wont exist Affected files ... .. //depot/projects/hammer/libexec/Makefile#13 edit Differences ... ==== //depot/projects/hammer/libexec/Makefile#13 (text+ko) ==== @@ -29,7 +29,7 @@ tftpd \ ypxfr -.if ${MACHINE_ARCH} != amd64 +.if ${MACHINE_ARCH} != amd64 && !defined(NOPIC) SUBDIR+=rtld-elf .endif From owner-p4-projects@FreeBSD.ORG Fri May 9 15:46:30 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1B9A037B404; Fri, 9 May 2003 15:46:30 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C7B2237B401 for ; Fri, 9 May 2003 15:46:29 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6FB1A43FBD for ; Fri, 9 May 2003 15:46:29 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h49MkT0U097698 for ; Fri, 9 May 2003 15:46:29 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h49MkSbD097695 for perforce@freebsd.org; Fri, 9 May 2003 15:46:28 -0700 (PDT) Date: Fri, 9 May 2003 15:46:28 -0700 (PDT) Message-Id: <200305092246.h49MkSbD097695@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30888 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 22:46:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=30888 Change 30888 by peter@peter_hammer on 2003/05/09 15:45:40 exclude pam_ssh from the static libpam.a builds because it is such a bad citizen. it exports unprotected global variables like "int debug" which will conflict with an application. Affected files ... .. //depot/projects/hammer/lib/libpam/modules/modules.inc#5 edit .. //depot/projects/hammer/share/mk/bsd.libnames.mk#7 edit Differences ... ==== //depot/projects/hammer/lib/libpam/modules/modules.inc#5 (text+ko) ==== @@ -24,8 +24,10 @@ MODULES += pam_rootok MODULES += pam_securetty MODULES += pam_self +(!defined(NOSHARED) || ( ${NOSHARED} == "no" || ${NOSHARED} == "NO" )) .if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH) && \ - !defined(NOSECURE) + !defined(NOSECURE) && !defined(NOPIC) && \ + (!defined(NOSHARED) || ( ${NOSHARED} == "no" || ${NOSHARED} == "NO" )) MODULES += pam_ssh .endif MODULES += pam_tacplus ==== //depot/projects/hammer/share/mk/bsd.libnames.mk#7 (text+ko) ==== @@ -81,7 +81,9 @@ ${LIBUTIL} ${LIBOPIE} ${LIBMD} ${LIBYPCLNT} MINUSLPAM+= -lradius -lrpcsvc -ltacplus -lcrypt \ -lutil -lopie -lmd -lypclnt -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH) && \ + !defined(NOPIC) && \ + (!defined(NOSHARED) || ( ${NOSHARED} == "no" || ${NOSHARED} == "NO" )) LIBPAM+= ${LIBSSH} ${LIBCRYPTO} MINUSLPAM+= -lssh -lcrypto .endif From owner-p4-projects@FreeBSD.ORG Fri May 9 15:48:33 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 360FA37B404; Fri, 9 May 2003 15:48:33 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E0D9437B401 for ; Fri, 9 May 2003 15:48:32 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7771B43FB1 for ; Fri, 9 May 2003 15:48:32 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h49MmW0U097749 for ; Fri, 9 May 2003 15:48:32 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h49MmWvp097746 for perforce@freebsd.org; Fri, 9 May 2003 15:48:32 -0700 (PDT) Date: Fri, 9 May 2003 15:48:32 -0700 (PDT) Message-Id: <200305092248.h49MmWvp097746@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30889 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 22:48:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=30889 Change 30889 by peter@peter_hammer on 2003/05/09 15:48:24 gah, cut/pasteo Affected files ... .. //depot/projects/hammer/lib/libpam/modules/modules.inc#6 edit Differences ... ==== //depot/projects/hammer/lib/libpam/modules/modules.inc#6 (text+ko) ==== @@ -24,7 +24,6 @@ MODULES += pam_rootok MODULES += pam_securetty MODULES += pam_self -(!defined(NOSHARED) || ( ${NOSHARED} == "no" || ${NOSHARED} == "NO" )) .if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH) && \ !defined(NOSECURE) && !defined(NOPIC) && \ (!defined(NOSHARED) || ( ${NOSHARED} == "no" || ${NOSHARED} == "NO" )) From owner-p4-projects@FreeBSD.ORG Fri May 9 15:50:37 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 46F4B37B401; Fri, 9 May 2003 15:50:37 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D989937B404 for ; Fri, 9 May 2003 15:50:36 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F30A743FBD for ; Fri, 9 May 2003 15:50:35 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h49MoZ0U097911 for ; Fri, 9 May 2003 15:50:35 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h49MoZiS097908 for perforce@freebsd.org; Fri, 9 May 2003 15:50:35 -0700 (PDT) Date: Fri, 9 May 2003 15:50:35 -0700 (PDT) Message-Id: <200305092250.h49MoZiS097908@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30890 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 22:50:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=30890 Change 30890 by peter@peter_hammer on 2003/05/09 15:49:52 revert to vendor now that pam_ssh has been identified as a culprit Affected files ... .. //depot/projects/hammer/crypto/heimdal/appl/telnet/telnetd/telnetd.c#4 edit .. //depot/projects/hammer/crypto/telnet/telnetd/telnetd.c#4 edit .. //depot/projects/hammer/libexec/telnetd/telnetd.c#3 edit Differences ... ==== //depot/projects/hammer/crypto/heimdal/appl/telnet/telnetd/telnetd.c#4 (text+ko) ==== @@ -116,7 +116,7 @@ int lowpty = 0, highpty; /* low, high pty numbers */ #endif /* CRAY */ -static int debug = 0; +int debug = 0; int keepalive = 1; char *progname; ==== //depot/projects/hammer/crypto/telnet/telnetd/telnetd.c#4 (text+ko) ==== @@ -78,7 +78,7 @@ int hostinfo = 1; /* do we print login banner? */ -static int debug = 0; +int debug = 0; int keepalive = 1; const char *altlogin; ==== //depot/projects/hammer/libexec/telnetd/telnetd.c#3 (text+ko) ==== @@ -71,7 +71,7 @@ int hostinfo = 1; /* do we print login banner? */ -debug int debug = 0; +int debug = 0; int keepalive = 1; const char *altlogin; From owner-p4-projects@FreeBSD.ORG Fri May 9 15:58:47 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E38237B404; Fri, 9 May 2003 15:58:47 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B19A137B401 for ; Fri, 9 May 2003 15:58:46 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 48B6243F85 for ; Fri, 9 May 2003 15:58:46 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h49Mwk0U098198 for ; Fri, 9 May 2003 15:58:46 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h49MwjsY098195 for perforce@freebsd.org; Fri, 9 May 2003 15:58:45 -0700 (PDT) Date: Fri, 9 May 2003 15:58:45 -0700 (PDT) Message-Id: <200305092258.h49MwjsY098195@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30891 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 22:58:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=30891 Change 30891 by peter@peter_daintree on 2003/05/09 15:58:20 no need for bcopyb() - no pcvt Affected files ... .. //depot/projects/hammer/sys/amd64/include/md_var.h#6 edit Differences ... ==== //depot/projects/hammer/sys/amd64/include/md_var.h#6 (text+ko) ==== @@ -57,7 +57,6 @@ struct fpreg; struct dbreg; -void bcopyb(const void *from, void *to, size_t len); void busdma_swi(void); void cpu_halt(void); void cpu_reset(void); From owner-p4-projects@FreeBSD.ORG Fri May 9 16:45:45 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27B6337B404; Fri, 9 May 2003 16:45:45 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BAF4C37B401 for ; Fri, 9 May 2003 16:45:44 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 64DE443F93 for ; Fri, 9 May 2003 16:45:44 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h49Nji0U001045 for ; Fri, 9 May 2003 16:45:44 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h49NjhiN001042 for perforce@freebsd.org; Fri, 9 May 2003 16:45:43 -0700 (PDT) Date: Fri, 9 May 2003 16:45:43 -0700 (PDT) Message-Id: <200305092345.h49NjhiN001042@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30893 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 May 2003 23:45:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=30893 Change 30893 by peter@peter_hammer on 2003/05/09 16:45:04 Use the in-tree compiler now (yay!) Affected files ... .. //depot/projects/hammer/sys/conf/Makefile.amd64#8 edit Differences ... ==== //depot/projects/hammer/sys/conf/Makefile.amd64#8 (text+ko) ==== @@ -17,19 +17,6 @@ # after which config should be rerun for all machines. # -# The FSF cross tools don't understand -fformat-extensions -CWARNFLAGS= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ - -Wmissing-prototypes -Wpointer-arith -Wcast-qual \ - -ffreestanding -Wno-format -Wno-sign-compare -CC= x86_64-unknown-freebsd5.0-gcc -D__amd64__ -LD= x86_64-unknown-freebsd5.0-ld -NM= x86_64-unknown-freebsd5.0-nm -SIZE= x86_64-unknown-freebsd5.0-size -OBJCOPY= x86_64-unknown-freebsd5.0-objcopy -OBJDUMP= x86_64-unknown-freebsd5.0-objdump -MACHINE_ARCH= amd64 -NO_CPU_COPTFLAGS= true # minimize cross compile pain - # Which version of config(8) is required. %VERSREQ= 500012 From owner-p4-projects@FreeBSD.ORG Fri May 9 17:07:13 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E8E6037B404; Fri, 9 May 2003 17:07:12 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 852F637B401 for ; Fri, 9 May 2003 17:07:12 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 50A8C43FB1 for ; Fri, 9 May 2003 17:07:11 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4A07B0U007943 for ; Fri, 9 May 2003 17:07:11 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4A07APj007940 for perforce@freebsd.org; Fri, 9 May 2003 17:07:10 -0700 (PDT) Date: Fri, 9 May 2003 17:07:10 -0700 (PDT) Message-Id: <200305100007.h4A07APj007940@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 30894 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 May 2003 00:07:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=30894 Change 30894 by rwatson@rwatson_tislabs on 2003/05/09 17:06:54 Integrate the TrustedBSD base branch from the FreeBSD vendor branch; loop back MAC Framework policy/slot rename. Various other FreeBSD bugfixes from 5.1-BETA. Affected files ... .. //depot/projects/trustedbsd/base/bin/echo/echo.1#3 integrate .. //depot/projects/trustedbsd/base/contrib/gcc/config/i386/freebsd.h#13 integrate .. //depot/projects/trustedbsd/base/etc/devd.conf#5 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libbinutils/Makefile#6 integrate .. //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libopcodes/Makefile.amd64#1 branch .. //depot/projects/trustedbsd/base/lib/libc/alpha/arith.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/_fpmath.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/arith.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/alloca.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/modf.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/setjmp.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/amd64/gen/sigsetjmp.S#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/i386/arith.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/ia64/arith.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/powerpc/arith.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libc/sparc64/arith.h#2 integrate .. //depot/projects/trustedbsd/base/libexec/Makefile#10 integrate .. //depot/projects/trustedbsd/base/libexec/rtld-elf/rtld.c#14 integrate .. //depot/projects/trustedbsd/base/release/Makefile#42 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#39 integrate .. //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#65 integrate .. //depot/projects/trustedbsd/base/release/scripts/doFS.sh#12 integrate .. //depot/projects/trustedbsd/base/release/scripts/print-cdrom-packages.sh#16 integrate .. //depot/projects/trustedbsd/base/sbin/bsdlabel/bsdlabel.c#3 integrate .. //depot/projects/trustedbsd/base/sbin/dumpon/dumpon.8#8 integrate .. //depot/projects/trustedbsd/base/sbin/ldconfig/ldconfig.8#4 integrate .. //depot/projects/trustedbsd/base/sbin/vinum/commands.c#10 integrate .. //depot/projects/trustedbsd/base/share/man/man5/disktab.5#4 integrate .. //depot/projects/trustedbsd/base/share/man/man5/procfs.5#6 integrate .. //depot/projects/trustedbsd/base/share/man/man9/Makefile#27 integrate .. //depot/projects/trustedbsd/base/sys/Makefile#3 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/base/sys/amd64/include/npx.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/ata/ata-raid.c#18 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bge.c#21 integrate .. //depot/projects/trustedbsd/base/sys/dev/bge/if_bgereg.h#14 integrate .. //depot/projects/trustedbsd/base/sys/dev/syscons/syscons.c#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/vinum/vinumioctl.c#13 integrate .. //depot/projects/trustedbsd/base/sys/geom/geom_dev.c#27 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#42 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_sig.c#33 integrate .. //depot/projects/trustedbsd/base/sys/sys/_label.h#4 integrate .. //depot/projects/trustedbsd/base/sys/sys/mbuf.h#23 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_object.c#33 integrate .. //depot/projects/trustedbsd/base/usr.bin/Makefile#26 integrate .. //depot/projects/trustedbsd/base/usr.bin/sockstat/sockstat.c#6 integrate .. //depot/projects/trustedbsd/base/usr.bin/xlint/lint1/param.h#4 integrate .. //depot/projects/trustedbsd/base/usr.sbin/Makefile#23 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pw/pw.8#7 integrate Differences ... ==== //depot/projects/trustedbsd/base/bin/echo/echo.1#3 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)echo.1 8.1 (Berkeley) 7/22/93 -.\" $FreeBSD: src/bin/echo/echo.1,v 1.14 2003/04/12 03:49:28 tjr Exp $ +.\" $FreeBSD: src/bin/echo/echo.1,v 1.15 2003/05/08 17:47:28 schweikh Exp $ .\" .Dd April 12, 2003 .Dt ECHO 1 @@ -58,11 +58,20 @@ The following option is available: .Bl -tag -width flag .It Fl n -Do not print the trailing newline character. This may also be -achieved by appending +Do not print the trailing newline character. +This may also be achieved by appending .Ql \ec to the end of the string, as is done by iBCS2 compatible systems. +Note that this option as well as the effect of +.Ql \ec +are implementation-defined in +.St -p1003.1-2001 +as amended by Cor. 1-2002. +Applications aiming for maximum +portability are strongly encouraged to use +.Xr printf 1 +to suppress the newline character. .El .Pp Some shells may provide a builtin ==== //depot/projects/trustedbsd/base/contrib/gcc/config/i386/freebsd.h#13 (text+ko) ==== @@ -22,7 +22,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.61 2003/04/26 19:16:54 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.62 2003/05/08 16:02:22 obrien Exp $ */ #undef CC1_SPEC #define CC1_SPEC "%(cc1_cpu) %{profile:-p}" @@ -135,7 +135,7 @@ #define FUNCTION_PROFILER(FILE, LABELNO) \ do { \ if (flag_pic) \ - fprintf ((FILE), "\tcall *.mcount%s@GOT(%%ebx)\n"); \ + fprintf ((FILE), "\tcall *.mcount@GOT(%%ebx)\n"); \ else \ fprintf ((FILE), "\tcall .mcount\n"); \ } while (0) ==== //depot/projects/trustedbsd/base/etc/devd.conf#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.4 2003/05/07 15:48:20 imp Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.5 2003/05/09 05:58:22 imp Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -66,9 +66,9 @@ # Don't even try to second guess what to do about drivers that don't # match here. Instead, pass it off to syslog. Commented out for the # moment, as pnpinfo isn't set in devd yet -nomatch 0 { - // action "logger Unknown device: $pnpinfo $location $bus"; -}; +#nomatch 0 { +# action "logger Unknown device: $pnpinfo $location $bus"; +#}; /* EXAMPLES TO END OF FILE ==== //depot/projects/trustedbsd/base/gnu/usr.bin/binutils/libbinutils/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbinutils/Makefile,v 1.18 2002/10/11 06:28:05 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbinutils/Makefile,v 1.19 2003/05/08 06:39:31 peter Exp $ .include "../Makefile.inc0" @@ -9,7 +9,12 @@ ieee.c rdcoff.c rddbg.c rename.c stabs.c unwind-ia64.c \ wrstabs.c version.c binemul.c budemang.c emul_vanilla.c WARNS= 0 -CFLAGS+= -DTARGET=\"${TARGET_ARCH}-unknown-freebsd\" +.if ${TARGET_ARCH} == "amd64" +BINUTILS_ARCH=x86_64 +.else +BINUTILS_ARCH=${TARGET_ARCH} +.endif +CFLAGS+= -DTARGET=\"${BINUTILS_ARCH}-unknown-freebsd\" CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\" CFLAGS+= -I${SRCDIR}/binutils CFLAGS+= -I${SRCDIR}/bfd ==== //depot/projects/trustedbsd/base/lib/libc/alpha/arith.h#2 (text+ko) ==== @@ -1,7 +1,14 @@ /* * MD header for contrib/netlib/gdtoa * - * $FreeBSD: src/lib/libc/alpha/arith.h,v 1.1 2003/03/12 20:29:58 das Exp $ + * $FreeBSD: src/lib/libc/alpha/arith.h,v 1.2 2003/05/08 13:50:43 das Exp $ + */ + +/* + * NOTE: The definitions in this file must be correct or strtod(3) and + * floating point formats in printf(3) will break! The file can be + * generated by running contrib/gdtoa/arithchk.c on the target + * architecture. See contrib/gdtoa/gdtoaimp.h for details. */ #define IEEE_8087 ==== //depot/projects/trustedbsd/base/lib/libc/amd64/_fpmath.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/amd64/_fpmath.h,v 1.2 2003/04/05 22:10:13 das Exp $ + * $FreeBSD: src/lib/libc/amd64/_fpmath.h,v 1.3 2003/05/08 00:02:03 peter Exp $ */ union IEEEl2bits { @@ -33,7 +33,8 @@ unsigned int manh :32; unsigned int exp :15; unsigned int sign :1; - unsigned int junk :16; + unsigned int junkl :16; + unsigned int junkh :32; } bits; }; ==== //depot/projects/trustedbsd/base/lib/libc/amd64/arith.h#2 (text+ko) ==== @@ -1,8 +1,19 @@ /* * MD header for contrib/gdtoa * - * $FreeBSD: src/lib/libc/amd64/arith.h,v 1.1 2003/03/12 20:29:59 das Exp $ + * $FreeBSD: src/lib/libc/amd64/arith.h,v 1.3 2003/05/08 13:50:43 das Exp $ + */ + +/* + * NOTE: The definitions in this file must be correct or strtod(3) and + * floating point formats in printf(3) will break! The file can be + * generated by running contrib/gdtoa/arithchk.c on the target + * architecture. See contrib/gdtoa/gdtoaimp.h for details. */ #define IEEE_8087 #define Arith_Kind_ASL 1 +#define Long int +#define Intcast (int)(long) +#define Double_Align +#define X64_bit_pointers ==== //depot/projects/trustedbsd/base/lib/libc/amd64/gen/Makefile.inc#2 (text+ko) ==== @@ -1,6 +1,6 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.19 2003/04/30 18:08:01 peter Exp $ +# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.20 2003/05/07 23:49:24 peter Exp $ -SRCS+= _setjmp.S setjmp.S sigsetjmp.S alloca.S \ +SRCS+= _setjmp.S setjmp.S sigsetjmp.S \ fabs.S modf.S \ frexp.c infinity.c isinf.c ==== //depot/projects/trustedbsd/base/lib/libc/amd64/gen/alloca.S#2 (text+ko) ==== @@ -38,14 +38,14 @@ .asciz "@(#)alloca.s 5.2 (Berkeley) 5/14/90" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/alloca.S,v 1.1 2003/05/01 16:04:38 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/alloca.S,v 1.2 2003/05/08 00:02:47 peter Exp $"); /* like alloc, but automatic automatic free in return */ ENTRY(alloca) popq %rdx /* pop return addr */ - movl %rsp,%rcx + movq %rsp,%rcx addq $15,%rdi /* round amount to allocate up to 16 bytes */ andq $~15,%rdi subq %rdi,%rsp ==== //depot/projects/trustedbsd/base/lib/libc/amd64/gen/modf.S#2 (text+ko) ==== @@ -40,7 +40,7 @@ #if defined(LIBC_SCCS) RCSID("$NetBSD: modf.S,v 1.5 1997/07/16 14:37:18 christos Exp $") #endif -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/modf.S,v 1.1 2003/04/30 16:21:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/modf.S,v 1.2 2003/05/08 03:19:37 peter Exp $"); /* * modf(value, iptr): return fractional part of value, and stores the @@ -52,44 +52,41 @@ /* With CHOP mode on, frndint behaves as TRUNC does. Useful. */ ENTRY(modf) - pushq %rbp - movq %rsp,%rbp - subq $24,%rsp /* * Set chop mode. */ - fnstcw -12(%rbp) - movw -12(%rbp),%dx + fnstcw -12(%rsp) + movw -12(%rsp),%dx orw $3072,%dx - movw %dx,-16(%rbp) - fldcw -16(%rbp) + movw %dx,-16(%rsp) + fldcw -16(%rsp) /* * Get integral part. */ - movsd %xmm0,-24(%rbp) - fldl -24(%rbp) + movsd %xmm0,-24(%rsp) + fldl -24(%rsp) frndint - fstpl -8(%rbp) + fstpl -8(%rsp) /* * Restore control word. */ - fldcw -12(%rbp) + fldcw -12(%rsp) /* * Store integral part. */ - movsd -8(%rbp),%xmm0 + movsd -8(%rsp),%xmm0 movsd %xmm0,(%rdi) /* * Get fractional part and return it. */ - fldl -24(%rbp) - fsubl -8(%rbp) - movsd -8(%rbp),%xmm0 + fldl -24(%rsp) + fsubl -8(%rsp) + fstpl -8(%rsp) + movsd -8(%rsp),%xmm0 - leave ret ==== //depot/projects/trustedbsd/base/lib/libc/amd64/gen/setjmp.S#2 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)setjmp.s 5.1 (Berkeley) 4/23/90" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.23 2003/04/30 18:09:33 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.25 2003/05/08 07:41:24 peter Exp $"); /* * C library -- _setjmp, _longjmp @@ -55,9 +55,9 @@ ENTRY(setjmp) pushq %rdi movq %rdi,%rcx - leaq 72(%rcx),%rdi /* (sigset_t*)oset */ + movq $1,%rdi /* SIG_BLOCK */ movq $0,%rsi /* (sigset_t*)set */ - movq $1,%rdx /* SIG_BLOCK */ + leaq 72(%rcx),%rdx /* (sigset_t*)oset */ call PIC_PLT(CNAME(_sigprocmask)) popq %rdi movq %rdi,%rcx @@ -80,9 +80,9 @@ pushq %rdi pushq %rsi movq %rdi,%rdx - movq $0,%rdi /* (sigset_t*)oset */ + movq $3,%rdi /* SIG_SETMASK */ leaq 72(%rdx),%rsi /* (sigset_t*)set */ - movq $3,%rdx /* SIG_SETMASK */ + movq $0,%rdx /* (sigset_t*)oset */ call PIC_PLT(CNAME(_sigprocmask)) popq %rsi popq %rdi /* jmpbuf */ ==== //depot/projects/trustedbsd/base/lib/libc/amd64/gen/sigsetjmp.S#2 (text+ko) ==== @@ -41,7 +41,7 @@ .asciz "$Id: sigsetjmp.S,v 1.1 1993/12/05 13:01:05 ats Exp $" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/sigsetjmp.S,v 1.25 2003/04/30 18:09:33 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/sigsetjmp.S,v 1.26 2003/05/08 06:25:03 peter Exp $"); #include "SYS.h" @@ -58,18 +58,17 @@ */ ENTRY(sigsetjmp) - pushq %rdi - movq %rdi,%rcx - movl %esi,88(%rcx) + movl %esi,88(%rdi) testl %esi,%esi jz 2f - leaq 72(%rcx),%rdi /* (sigset_t*)oset */ + pushq %rdi + movq $1,%rdi /* SIG_BLOCK */ movq $0,%rsi /* (sigset_t*)set */ - movq $1,%rdx /* SIG_BLOCK */ + leaq 72(%rcx),%rdx /* (sigset_t*)oset */ call PIC_PLT(CNAME(_sigprocmask)) popq %rdi - movq %rdi,%rcx -2: movq 0(%rsp),%rdx /* retval */ +2: movq %rdi,%rcx + movq 0(%rsp),%rdx /* retval */ movq %rdx, 0(%rcx) /* retval */ movq %rbx, 8(%rcx) movq %rsp,16(%rcx) @@ -90,9 +89,9 @@ movq %rdi,%rdx pushq %rdi pushq %rsi - movq $0,%rdi /* (sigset_t*)oset */ + movq $3,%rdi /* SIG_SETMASK */ leaq 72(%rdx),%rsi /* (sigset_t*)set */ - movq $3,%rdx /* SIG_SETMASK */ + movq $0,%rdx /* (sigset_t*)oset */ call PIC_PLT(CNAME(_sigprocmask)) popq %rsi popq %rdi /* jmpbuf */ ==== //depot/projects/trustedbsd/base/lib/libc/i386/arith.h#2 (text+ko) ==== @@ -1,7 +1,14 @@ /* * MD header for contrib/gdtoa * - * $FreeBSD: src/lib/libc/i386/arith.h,v 1.1 2003/03/12 20:29:59 das Exp $ + * $FreeBSD: src/lib/libc/i386/arith.h,v 1.2 2003/05/08 13:50:43 das Exp $ + */ + +/* + * NOTE: The definitions in this file must be correct or strtod(3) and + * floating point formats in printf(3) will break! The file can be + * generated by running contrib/gdtoa/arithchk.c on the target + * architecture. See contrib/gdtoa/gdtoaimp.h for details. */ #define IEEE_8087 ==== //depot/projects/trustedbsd/base/lib/libc/ia64/arith.h#2 (text+ko) ==== @@ -1,7 +1,14 @@ /* * MD header for contrib/gdtoa * - * $FreeBSD: src/lib/libc/ia64/arith.h,v 1.1 2003/03/12 20:29:59 das Exp $ + * $FreeBSD: src/lib/libc/ia64/arith.h,v 1.2 2003/05/08 13:50:43 das Exp $ + */ + +/* + * NOTE: The definitions in this file must be correct or strtod(3) and + * floating point formats in printf(3) will break! The file can be + * generated by running contrib/gdtoa/arithchk.c on the target + * architecture. See contrib/gdtoa/gdtoaimp.h for details. */ #include ==== //depot/projects/trustedbsd/base/lib/libc/powerpc/arith.h#2 (text+ko) ==== @@ -1,7 +1,14 @@ /* * MD header for contrib/gdtoa * - * $FreeBSD: src/lib/libc/powerpc/arith.h,v 1.1 2003/03/12 20:29:59 das Exp $ + * $FreeBSD: src/lib/libc/powerpc/arith.h,v 1.2 2003/05/08 13:50:44 das Exp $ + */ + +/* + * NOTE: The definitions in this file must be correct or strtod(3) and + * floating point formats in printf(3) will break! The file can be + * generated by running contrib/gdtoa/arithchk.c on the target + * architecture. See contrib/gdtoa/gdtoaimp.h for details. */ #define IEEE_MC68k ==== //depot/projects/trustedbsd/base/lib/libc/sparc64/arith.h#2 (text+ko) ==== @@ -1,7 +1,14 @@ /* * MD header for contrib/gdtoa * - * $FreeBSD: src/lib/libc/sparc64/arith.h,v 1.1 2003/03/12 20:29:59 das Exp $ + * $FreeBSD: src/lib/libc/sparc64/arith.h,v 1.2 2003/05/08 13:50:44 das Exp $ + */ + +/* + * NOTE: The definitions in this file must be correct or strtod(3) and + * floating point formats in printf(3) will break! The file can be + * generated by running contrib/gdtoa/arithchk.c on the target + * architecture. See contrib/gdtoa/gdtoaimp.h for details. */ #define IEEE_MC68k ==== //depot/projects/trustedbsd/base/libexec/Makefile#10 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/libexec/Makefile,v 1.58 2003/05/05 07:58:42 markm Exp $ +# $FreeBSD: src/libexec/Makefile,v 1.59 2003/05/08 06:37:12 peter Exp $ # Present but disabled: kpasswdd SUBDIR= atrun \ @@ -23,13 +23,16 @@ rpc.rwalld \ rpc.sprayd \ rshd \ - rtld-elf \ save-entropy \ talkd \ tcpd \ tftpd \ ypxfr +.if ${MACHINE_ARCH} != amd64 +SUBDIR+=rtld-elf +.endif + .if !defined(NO_BIND) SUBDIR+=named-xfer .endif ==== //depot/projects/trustedbsd/base/libexec/rtld-elf/rtld.c#14 (text+ko) ==== @@ -23,7 +23,7 @@ * (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: src/libexec/rtld-elf/rtld.c,v 1.78 2003/05/04 00:56:00 obrien Exp $ + * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.79 2003/05/08 01:31:36 kan Exp $ */ /* @@ -126,6 +126,7 @@ static void unlink_object(Obj_Entry *); static void unload_object(Obj_Entry *); static void unref_dag(Obj_Entry *); +static void ref_dag(Obj_Entry *); void r_debug_state(struct r_debug*, struct link_map*); @@ -361,7 +362,6 @@ *obj_tail = obj_main; obj_tail = &obj_main->next; obj_count++; - obj_main->refcount++; /* Make sure we don't call the main program's init and fini functions. */ obj_main->init = obj_main->fini = NULL; @@ -383,8 +383,10 @@ die(); /* Make a list of all objects loaded at startup. */ - for (obj = obj_list; obj != NULL; obj = obj->next) + for (obj = obj_list; obj != NULL; obj = obj->next) { objlist_push_tail(&list_main, obj); + obj->refcount++; + } if (ld_tracing) { /* We're done */ trace_loaded_objects(obj_main); @@ -970,6 +972,8 @@ if (donelist_check(dlp, obj)) return; + + obj->refcount++; objlist_push_tail(&obj->dldags, root); objlist_push_tail(&root->dagmembers, obj); for (needed = obj->needed; needed != NULL; needed = needed->next) @@ -1223,7 +1227,6 @@ } else free(path); - obj->refcount++; return obj; } @@ -1579,6 +1582,7 @@ /* Unreference the object and its dependencies. */ root->dl_refcount--; + unref_dag(root); if (root->refcount == 0) { @@ -1682,8 +1686,14 @@ /* Make list of init functions to call. */ initlist_add_objects(obj, &obj->next, &initlist); } - } else if (ld_tracing) - goto trace; + } else { + + /* Bump the reference counts for objects on this DAG. */ + ref_dag(obj); + + if (ld_tracing) + goto trace; + } } GDB_STATE(RT_CONSISTENT,obj ? &obj->linkmap : NULL); @@ -2405,7 +2415,6 @@ static void unlink_object(Obj_Entry *root) { - const Needed_Entry *needed; Objlist_Entry *elm; if (root->refcount == 0) { @@ -2413,25 +2422,28 @@ objlist_remove(&list_global, root); /* Remove the object from all objects' DAG lists. */ - STAILQ_FOREACH(elm, &root->dagmembers , link) + STAILQ_FOREACH(elm, &root->dagmembers , link) { objlist_remove(&elm->obj->dldags, root); + if (elm->obj != root) + unlink_object(elm->obj); + } } +} - for (needed = root->needed; needed != NULL; needed = needed->next) - if (needed->obj != NULL) - unlink_object(needed->obj); +static void +ref_dag(Obj_Entry *root) +{ + Objlist_Entry *elm; + + STAILQ_FOREACH(elm, &root->dagmembers , link) + elm->obj->refcount++; } static void unref_dag(Obj_Entry *root) { - const Needed_Entry *needed; + Objlist_Entry *elm; - if (root->refcount == 0) - return; - root->refcount--; - if (root->refcount == 0) - for (needed = root->needed; needed != NULL; needed = needed->next) - if (needed->obj != NULL) - unref_dag(needed->obj); + STAILQ_FOREACH(elm, &root->dagmembers , link) + elm->obj->refcount--; } ==== //depot/projects/trustedbsd/base/release/Makefile#42 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.774 2003/05/05 07:58:42 markm Exp $ +# $FreeBSD: src/release/Makefile,v 1.775 2003/05/08 03:25:17 obrien Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -756,6 +756,117 @@ .endif touch release.9 +release.9.alpha: +.if ${TARGET_ARCH} != "ia64" || ${TARGET_ARCH} == ${MACHINE_ARCH} + cp ${RD}/trees/base/etc/disktab /etc + rm -rf ${RD}/mfsfd + mkdir ${RD}/mfsfd + cd ${RD}/mfsfd && \ + mkdir -p etc/defaults dev mnt stand/etc/defaults stand/help + @cd ${.CURDIR} && $(MAKE) installCRUNCH CRUNCH=boot \ + DIR=${RD}/mfsfd/stand ZIP=false + ( cd ${RD}/mfsfd && \ + for dir in bin sbin ; do \ + ln -sf /stand $$dir; \ + done ) + cp ${RD}/trees/base/sbin/dhclient-script ${RD}/mfsfd/stand +.if ${TARGET} == "pc98" + cp ${.CURDIR}/../etc/defaults/pccard.conf ${RD}/mfsfd/etc/defaults/pccard.conf +.endif + cp ${.CURDIR}/../etc/usbd.conf ${RD}/mfsfd/etc/usbd.conf + ( for F in defaults/rc.conf netconfig protocols ; do \ + sed -e '/^#.*$$/d' -e 's/[:space:]*#.*$$//g' \ + ${RD}/trees/base/etc/$$F > ${RD}/mfsfd/stand/etc/$$F ; \ + done ) + grep -E '^(ftp|nameserver|domain|sunrpc|cmd|nfsd)[^-\w]' \ + ${RD}/trees/base/etc/services | \ + sed -e '/^#.*$$/d' -e 's/[:space:]*#.*$$//g' \ + > ${RD}/mfsfd/stand/etc/services + ln ${RD}/mfsfd/stand/etc/services ${RD}/mfsfd/etc/services + ln ${RD}/mfsfd/stand/etc/netconfig ${RD}/mfsfd/etc/netconfig + cp ${RD}/trees/base/COPYRIGHT ${RD}/mfsfd/stand/help/COPYRIGHT.hlp +.if !defined(NODOC) + @for i in ${DIST_DOCS_ARCH_INDEP}; do \ + cp ${RND}/${RELNOTES_LANG}/$$i/article.txt ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \ + done + @for i in ${DIST_DOCS_ARCH_DEP}; do \ + cp ${RND}/${RELNOTES_LANG}/$$i/${TARGET}/article.txt ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \ + done + @mv ${RD}/mfsfd/stand/help/INSTALLATION.TXT ${RD}/mfsfd/stand/help/INSTALL.TXT + @mv ${RD}/mfsfd/stand/help/EARLY-ADOPTER.TXT ${RD}/mfsfd/stand/help/EARLY.TXT +.endif + -test -f ${.CURDIR}/install.cfg && cp ${.CURDIR}/install.cfg ${RD}/mfsfd + @mkdir -p ${RD}/mfsfd/boot +.if ${TARGET_ARCH} != "ia64" + @cp ${RD}/trees/base/boot/boot* ${RD}/mfsfd/boot +.endif +.if ${TARGET} == "i386" + @cp ${RD}/trees/base/boot/mbr ${RD}/mfsfd/boot +.endif + @echo "Making the regular boot floppy." + @tar --exclude CVS -cf - -C ${.CURDIR}/../usr.sbin/sysinstall help | \ + tar xf - -C ${RD}/mfsfd/stand +.if ${TARGET_ARCH} == "alpha" && !defined(NO_FLOPPIES) + rm -rf ${RD}/mfsfd/stand/help/* +.endif +.if defined(SMALLBOOTSIZE) +.if exists(${.CURDIR}/${TARGET}/drivers-small.conf) + @rm -rf ${RD}/mfsfd/modules + @mkdir -p ${RD}/mfsfd/modules + @awk -f ${.CURDIR}/scripts/driver-copy2.awk 2 \ + ${.CURDIR}/${TARGET}/drivers-small.conf \ + ${RD}/trees/base/boot/kernel ${RD}/mfsfd/modules +.endif + sh -e ${DOFS_SH} mfsroot ${RD} ${MNT} \ + ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL} + @gzip -9vc mfsroot > mfsroot.gz + @sh -e ${DOFS_SH} ${RD}/floppies/mfsroot-small.flp \ + ${RD} ${MNT} ${SMALLBOOTSIZE} mfsroot.gz \ + ${BOOTINODE} ${SMALLBOOTLABEL} +.endif +.if exists(${.CURDIR}/${TARGET}/drivers.conf) + @rm -rf ${RD}/mfsfd/modules + @mkdir -p ${RD}/mfsfd/modules + @awk -f ${.CURDIR}/scripts/driver-copy2.awk 2 \ + ${.CURDIR}/${TARGET}/drivers.conf \ + ${RD}/trees/base/boot/kernel ${RD}/mfsfd/modules + @rm -rf ${RD}/driversfd + @mkdir ${RD}/driversfd + @awk -f ${.CURDIR}/scripts/driver-copy2.awk 3 \ + ${.CURDIR}/${TARGET}/drivers.conf \ + ${RD}/trees/base/boot/kernel ${RD}/driversfd + -@rmdir ${RD}/driversfd + if [ -d ${RD}/driversfd ]; then \ + sh -e ${DOFS_SH} \ + ${RD}/floppies/drivers.flp ${RD} ${MNT} ${DRIVERSIZE} \ + ${RD}/driversfd ${DRIVERINODE} ${DRIVERLABEL}; \ + cd ${RD}/driversfd && awk -f ${.CURDIR}/scripts/driver-desc.awk \ + *.dsc >> ${RD}/floppies/DRIVERS.TXT; \ + fi +.endif + sh -e ${DOFS_SH} mfsroot ${RD} ${MNT} \ + ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL} + @gzip -9vc mfsroot > mfsroot.gz + @mkdir -p ${RD}/mfsroot + @cp mfsroot.gz ${RD}/mfsroot +.if !defined(NO_FLOPPIES) +.if defined(BOOTSIZE) + @sh -e ${DOFS_SH} ${RD}/floppies/mfsroot.flp \ + ${RD} ${MNT} ${BOOTSIZE} mfsroot.gz ${BOOTINODE} ${BOOTLABEL} + @cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern +.endif +.if defined(SMALLBOOTSIZE) + @cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern-small FDSIZE=SMALL +.endif +.if defined(BIGBOOTSIZE) + @cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=boot FDSIZE=BIG +.endif +.endif + @rm mfsroot mfsroot.gz + @echo "Regular and MFS boot floppies made." +.endif + touch release.9.alpha + # # --==## Create a fixit floppy ##==-- # @@ -972,8 +1083,14 @@ md5 * > CHECKSUM.MD5) \ ) +.if ${TARGET_ARCH} == "alpha" +RELEASE9=release.9.${TARGET_ARCH} +.else +RELEASE9=release.9 +.endif + doRELEASE: release.1 release.2 release.3 ${DOCREL} release.4 release.5 \ - release.6 release.7 release.8 release.9 ${FIXIT_TARGET} + release.6 release.7 release.8 ${RELEASE9} ${FIXIT_TARGET} @cd ${.CURDIR} && ${MAKE} ${EXTRAS} @echo "Release done" ==== //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#39 (text+ko) ==== @@ -31,7 +31,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.146 2003/05/03 23:47:21 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.147 2003/05/09 23:14:02 bmah Exp $ Supported Devices @@ -3397,13 +3397,26 @@ Floppy drives (&man.fdc.4; driver) Genius and Mustek hand scanners GPB and Transputer drivers + + VGA-compatible video cards + (&man.vga.4; driver) + + + Information regarding specific video cards and + compatibility with XFree86 can be + found at . + + + + Keyboards including: - AT-style keyboards + AT-style keyboards (&man.atkbd.4; driver) - PS/2 keyboards + PS/2 keyboards (&man.atkbd.4; driver) Standard keyboards @@ -3415,22 +3428,30 @@ Loran-C receiver (Dave Mills experimental hardware, loran driver). - Mice including: + Pointing devices including: - Bus mice (&man.mse.4; driver) + Bus mice and compatible devices (&man.mse.4; driver) - PS/2 mice (&man.psm.4; driver) + PS/2 mice and compatible devices, including many laptop + pointing devices (&man.psm.4; driver) - Serial mice + Serial mice and compatible devices USB mice (specific instances are listed in the section describing USB devices) + + + &man.moused.8; has more information on using pointing + devices with &os;. Information on using pointing devices + with XFree86 can be found at + . + PC standard parallel ports (&man.ppc.4; driver) ==== //depot/projects/trustedbsd/base/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#65 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.563 2003/05/07 04:15:57 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.566 2003/05/08 22:31:00 bmah Exp $ 2000 @@ -504,6 +504,14 @@ &man.adduser.8; now supports a option to set a user's default login group. + The &man.bsdlabel.8; utility is a replacement for the older + disklabel utility. Like its predecessor, it installs, examines, + or modifies the BSD label on a disk partition, and can install + bootstrap code. Compared to disklabel, a number of obsolete + options and parameters have been retired. A new + option instructs &man.bsdlabel.8; to use the + layout suitable for a specific machine. + The compat4x distribution now includes the libcrypto.so.2, @@ -526,16 +534,10 @@ information about a disk device and optionally to run a naive performance test. - The and flags to - &man.disklabel.8; have been retired. - - &man.disklabel.8; is now only built for architectures where - it is useful (i386, pc98, alpha, and ia64). + The disklabel utility has been replaced by &man.bsdlabel.8;. + On the alpha, i386, and pc98 platforms, disklabel is a link to + &man.bsdlabel.8;. - The option to &man.disklabel.8; has been - removed because the i386 boot loader now resides in a single - file. - &man.dump.8; now supports caching of disk blocks with the option. This can improve dump performance at the cost of possibly missing file system updates that occur @@ -655,12 +657,47 @@ unless UFS1 is specifically requested with the option. - &man.newsyslog.8; now supports a W flag - to force previously-started compression jobs for an entry (or - group of entries specified with the G flag) - to finish before beginning a new one. This feature is designed - to prevent system overloads caused by starting several - compression jobs on big files simultaneously. &merged; + &man.newsyslog.8; has a number of new features. Among them: + + + + A W flag forces previously-started + compression jobs for an entry (or group of entries + specified with the G flag) to finish + before beginning a new one. This feature is designed to + prevent system overloads caused by starting several + compression jobs on big files + simultaneously. &merged; + + + + A default rotate action, to be used for + files specified for rotation but not specified in the + configuration file. &merged; + + + + A command-line flag to disable + sending signals to processes when rotating + files. &merged; + + + + A N configuration file flag to + indicate that no process needs to be signaled when + rotating a file. &merged; + + + + A U configuration file flag to + specify that a process group (rather than a single + process) should be signaled when rotating + files. &merged; + + + + + &man.nsdispatch.3; is now thread-safe and implements support for Name Service Switch (NSS) modules. NSS modules may be @@ -719,7 +756,7 @@ strengthened. The sunlabel utility, a program analogous to - &man.disklabel.8; that works on Sun disk labels, has been + &man.bsdlabel.8; that works on Sun disk labels, has been added. &man.sysinstall.8; will now ==== //depot/projects/trustedbsd/base/release/scripts/doFS.sh#12 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/release/scripts/doFS.sh,v 1.49 2003/05/03 19:23:10 scottl Exp $ +# $FreeBSD: src/release/scripts/doFS.sh,v 1.50 2003/05/09 09:41:18 scottl Exp $ # set -ex ==== //depot/projects/trustedbsd/base/release/scripts/print-cdrom-packages.sh#16 (text+ko) ==== @@ -2,7 +2,7 @@ # # Author: Jordan Hubbard # Date: Mon Jul 10 01:18:20 2000 -# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.41 2003/03/03 03:28:30 murray Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri May 9 17:12:20 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E89437B404; Fri, 9 May 2003 17:12:20 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BD83A37B401 for ; Fri, 9 May 2003 17:12:19 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 88A7743F3F for ; Fri, 9 May 2003 17:12:18 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4A0CI0U008939 for ; Fri, 9 May 2003 17:12:18 -0700 (PDT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4A0CH4A008936 for perforce@freebsd.org; Fri, 9 May 2003 17:12:17 -0700 (PDT) Date: Fri, 9 May 2003 17:12:17 -0700 (PDT) Message-Id: <200305100012.h4A0CH4A008936@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 30895 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 May 2003 00:12:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=30895 Change 30895 by rwatson@rwatson_tislabs on 2003/05/09 17:11:17 Integrate the TrustedBSD MAC branch from the TrustedBSD base branch. Loop back the policies/slots rename for kern_mac.c; various other bugfixes/etc from 5.1-BETA. Affected files ... .. //depot/projects/trustedbsd/mac/bin/echo/echo.1#4 integrate .. //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/freebsd.h#13 integrate .. //depot/projects/trustedbsd/mac/etc/devd.conf#5 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/libbinutils/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/libopcodes/Makefile.amd64#1 branch .. //depot/projects/trustedbsd/mac/lib/libc/alpha/arith.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/amd64/_fpmath.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/amd64/arith.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/amd64/gen/Makefile.inc#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/amd64/gen/alloca.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/amd64/gen/modf.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/amd64/gen/setjmp.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/amd64/gen/sigsetjmp.S#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/i386/arith.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/ia64/arith.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/powerpc/arith.h#2 integrate .. //depot/projects/trustedbsd/mac/lib/libc/sparc64/arith.h#2 integrate .. //depot/projects/trustedbsd/mac/libexec/Makefile#9 integrate .. //depot/projects/trustedbsd/mac/libexec/rtld-elf/rtld.c#13 integrate .. //depot/projects/trustedbsd/mac/release/Makefile#43 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#35 integrate .. //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#56 integrate .. //depot/projects/trustedbsd/mac/release/scripts/doFS.sh#11 integrate .. //depot/projects/trustedbsd/mac/release/scripts/print-cdrom-packages.sh#16 integrate .. //depot/projects/trustedbsd/mac/sbin/bsdlabel/bsdlabel.c#2 integrate .. //depot/projects/trustedbsd/mac/sbin/dumpon/dumpon.8#7 integrate .. //depot/projects/trustedbsd/mac/sbin/ldconfig/ldconfig.8#4 integrate .. //depot/projects/trustedbsd/mac/sbin/vinum/commands.c#9 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/disktab.5#4 integrate .. //depot/projects/trustedbsd/mac/share/man/man5/procfs.5#6 integrate .. //depot/projects/trustedbsd/mac/share/man/man9/Makefile#27 integrate .. //depot/projects/trustedbsd/mac/sys/Makefile#6 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/amd64/trap.c#2 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/trustedbsd/mac/sys/amd64/include/npx.h#2 integrate .. //depot/projects/trustedbsd/mac/sys/dev/ata/ata-raid.c#16 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bge.c#21 integrate .. //depot/projects/trustedbsd/mac/sys/dev/bge/if_bgereg.h#14 integrate .. //depot/projects/trustedbsd/mac/sys/dev/syscons/syscons.c#15 integrate .. //depot/projects/trustedbsd/mac/sys/dev/vinum/vinumioctl.c#12 integrate .. //depot/projects/trustedbsd/mac/sys/geom/geom_dev.c#24 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#387 integrate .. //depot/projects/trustedbsd/mac/sys/kern/kern_sig.c#30 integrate .. //depot/projects/trustedbsd/mac/sys/sys/_label.h#8 integrate .. //depot/projects/trustedbsd/mac/sys/sys/mbuf.h#29 integrate .. //depot/projects/trustedbsd/mac/sys/vm/vm_object.c#28 integrate .. //depot/projects/trustedbsd/mac/usr.bin/Makefile#21 integrate .. //depot/projects/trustedbsd/mac/usr.bin/sockstat/sockstat.c#6 integrate .. //depot/projects/trustedbsd/mac/usr.bin/xlint/lint1/param.h#4 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/Makefile#26 integrate .. //depot/projects/trustedbsd/mac/usr.sbin/pw/pw.8#7 integrate Differences ... ==== //depot/projects/trustedbsd/mac/bin/echo/echo.1#4 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)echo.1 8.1 (Berkeley) 7/22/93 -.\" $FreeBSD: src/bin/echo/echo.1,v 1.14 2003/04/12 03:49:28 tjr Exp $ +.\" $FreeBSD: src/bin/echo/echo.1,v 1.15 2003/05/08 17:47:28 schweikh Exp $ .\" .Dd April 12, 2003 .Dt ECHO 1 @@ -58,11 +58,20 @@ The following option is available: .Bl -tag -width flag .It Fl n -Do not print the trailing newline character. This may also be -achieved by appending +Do not print the trailing newline character. +This may also be achieved by appending .Ql \ec to the end of the string, as is done by iBCS2 compatible systems. +Note that this option as well as the effect of +.Ql \ec +are implementation-defined in +.St -p1003.1-2001 +as amended by Cor. 1-2002. +Applications aiming for maximum +portability are strongly encouraged to use +.Xr printf 1 +to suppress the newline character. .El .Pp Some shells may provide a builtin ==== //depot/projects/trustedbsd/mac/contrib/gcc/config/i386/freebsd.h#13 (text+ko) ==== @@ -22,7 +22,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.61 2003/04/26 19:16:54 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/i386/freebsd.h,v 1.62 2003/05/08 16:02:22 obrien Exp $ */ #undef CC1_SPEC #define CC1_SPEC "%(cc1_cpu) %{profile:-p}" @@ -135,7 +135,7 @@ #define FUNCTION_PROFILER(FILE, LABELNO) \ do { \ if (flag_pic) \ - fprintf ((FILE), "\tcall *.mcount%s@GOT(%%ebx)\n"); \ + fprintf ((FILE), "\tcall *.mcount@GOT(%%ebx)\n"); \ else \ fprintf ((FILE), "\tcall .mcount\n"); \ } while (0) ==== //depot/projects/trustedbsd/mac/etc/devd.conf#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/devd.conf,v 1.4 2003/05/07 15:48:20 imp Exp $ +# $FreeBSD: src/etc/devd.conf,v 1.5 2003/05/09 05:58:22 imp Exp $ # # Refer to devd.conf(5) and devd(8) man pages for the details on how to # run and configure devd. @@ -66,9 +66,9 @@ # Don't even try to second guess what to do about drivers that don't # match here. Instead, pass it off to syslog. Commented out for the # moment, as pnpinfo isn't set in devd yet -nomatch 0 { - // action "logger Unknown device: $pnpinfo $location $bus"; -}; +#nomatch 0 { +# action "logger Unknown device: $pnpinfo $location $bus"; +#}; /* EXAMPLES TO END OF FILE ==== //depot/projects/trustedbsd/mac/gnu/usr.bin/binutils/libbinutils/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/binutils/libbinutils/Makefile,v 1.18 2002/10/11 06:28:05 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/binutils/libbinutils/Makefile,v 1.19 2003/05/08 06:39:31 peter Exp $ .include "../Makefile.inc0" @@ -9,7 +9,12 @@ ieee.c rdcoff.c rddbg.c rename.c stabs.c unwind-ia64.c \ wrstabs.c version.c binemul.c budemang.c emul_vanilla.c WARNS= 0 -CFLAGS+= -DTARGET=\"${TARGET_ARCH}-unknown-freebsd\" +.if ${TARGET_ARCH} == "amd64" +BINUTILS_ARCH=x86_64 +.else +BINUTILS_ARCH=${TARGET_ARCH} +.endif +CFLAGS+= -DTARGET=\"${BINUTILS_ARCH}-unknown-freebsd\" CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\" CFLAGS+= -I${SRCDIR}/binutils CFLAGS+= -I${SRCDIR}/bfd ==== //depot/projects/trustedbsd/mac/lib/libc/alpha/arith.h#2 (text+ko) ==== @@ -1,7 +1,14 @@ /* * MD header for contrib/netlib/gdtoa * - * $FreeBSD: src/lib/libc/alpha/arith.h,v 1.1 2003/03/12 20:29:58 das Exp $ + * $FreeBSD: src/lib/libc/alpha/arith.h,v 1.2 2003/05/08 13:50:43 das Exp $ + */ + +/* + * NOTE: The definitions in this file must be correct or strtod(3) and + * floating point formats in printf(3) will break! The file can be + * generated by running contrib/gdtoa/arithchk.c on the target + * architecture. See contrib/gdtoa/gdtoaimp.h for details. */ #define IEEE_8087 ==== //depot/projects/trustedbsd/mac/lib/libc/amd64/_fpmath.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc/amd64/_fpmath.h,v 1.2 2003/04/05 22:10:13 das Exp $ + * $FreeBSD: src/lib/libc/amd64/_fpmath.h,v 1.3 2003/05/08 00:02:03 peter Exp $ */ union IEEEl2bits { @@ -33,7 +33,8 @@ unsigned int manh :32; unsigned int exp :15; unsigned int sign :1; - unsigned int junk :16; + unsigned int junkl :16; + unsigned int junkh :32; } bits; }; ==== //depot/projects/trustedbsd/mac/lib/libc/amd64/arith.h#2 (text+ko) ==== @@ -1,8 +1,19 @@ /* * MD header for contrib/gdtoa * - * $FreeBSD: src/lib/libc/amd64/arith.h,v 1.1 2003/03/12 20:29:59 das Exp $ + * $FreeBSD: src/lib/libc/amd64/arith.h,v 1.3 2003/05/08 13:50:43 das Exp $ + */ + +/* + * NOTE: The definitions in this file must be correct or strtod(3) and + * floating point formats in printf(3) will break! The file can be + * generated by running contrib/gdtoa/arithchk.c on the target + * architecture. See contrib/gdtoa/gdtoaimp.h for details. */ #define IEEE_8087 #define Arith_Kind_ASL 1 +#define Long int +#define Intcast (int)(long) +#define Double_Align +#define X64_bit_pointers ==== //depot/projects/trustedbsd/mac/lib/libc/amd64/gen/Makefile.inc#2 (text+ko) ==== @@ -1,6 +1,6 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.19 2003/04/30 18:08:01 peter Exp $ +# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.20 2003/05/07 23:49:24 peter Exp $ -SRCS+= _setjmp.S setjmp.S sigsetjmp.S alloca.S \ +SRCS+= _setjmp.S setjmp.S sigsetjmp.S \ fabs.S modf.S \ frexp.c infinity.c isinf.c ==== //depot/projects/trustedbsd/mac/lib/libc/amd64/gen/alloca.S#2 (text+ko) ==== @@ -38,14 +38,14 @@ .asciz "@(#)alloca.s 5.2 (Berkeley) 5/14/90" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/alloca.S,v 1.1 2003/05/01 16:04:38 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/alloca.S,v 1.2 2003/05/08 00:02:47 peter Exp $"); /* like alloc, but automatic automatic free in return */ ENTRY(alloca) popq %rdx /* pop return addr */ - movl %rsp,%rcx + movq %rsp,%rcx addq $15,%rdi /* round amount to allocate up to 16 bytes */ andq $~15,%rdi subq %rdi,%rsp ==== //depot/projects/trustedbsd/mac/lib/libc/amd64/gen/modf.S#2 (text+ko) ==== @@ -40,7 +40,7 @@ #if defined(LIBC_SCCS) RCSID("$NetBSD: modf.S,v 1.5 1997/07/16 14:37:18 christos Exp $") #endif -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/modf.S,v 1.1 2003/04/30 16:21:03 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/modf.S,v 1.2 2003/05/08 03:19:37 peter Exp $"); /* * modf(value, iptr): return fractional part of value, and stores the @@ -52,44 +52,41 @@ /* With CHOP mode on, frndint behaves as TRUNC does. Useful. */ ENTRY(modf) - pushq %rbp - movq %rsp,%rbp - subq $24,%rsp /* * Set chop mode. */ - fnstcw -12(%rbp) - movw -12(%rbp),%dx + fnstcw -12(%rsp) + movw -12(%rsp),%dx orw $3072,%dx - movw %dx,-16(%rbp) - fldcw -16(%rbp) + movw %dx,-16(%rsp) + fldcw -16(%rsp) /* * Get integral part. */ - movsd %xmm0,-24(%rbp) - fldl -24(%rbp) + movsd %xmm0,-24(%rsp) + fldl -24(%rsp) frndint - fstpl -8(%rbp) + fstpl -8(%rsp) /* * Restore control word. */ - fldcw -12(%rbp) + fldcw -12(%rsp) /* * Store integral part. */ - movsd -8(%rbp),%xmm0 + movsd -8(%rsp),%xmm0 movsd %xmm0,(%rdi) /* * Get fractional part and return it. */ - fldl -24(%rbp) - fsubl -8(%rbp) - movsd -8(%rbp),%xmm0 + fldl -24(%rsp) + fsubl -8(%rsp) + fstpl -8(%rsp) + movsd -8(%rsp),%xmm0 - leave ret ==== //depot/projects/trustedbsd/mac/lib/libc/amd64/gen/setjmp.S#2 (text+ko) ==== @@ -38,7 +38,7 @@ .asciz "@(#)setjmp.s 5.1 (Berkeley) 4/23/90" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.23 2003/04/30 18:09:33 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/setjmp.S,v 1.25 2003/05/08 07:41:24 peter Exp $"); /* * C library -- _setjmp, _longjmp @@ -55,9 +55,9 @@ ENTRY(setjmp) pushq %rdi movq %rdi,%rcx - leaq 72(%rcx),%rdi /* (sigset_t*)oset */ + movq $1,%rdi /* SIG_BLOCK */ movq $0,%rsi /* (sigset_t*)set */ - movq $1,%rdx /* SIG_BLOCK */ + leaq 72(%rcx),%rdx /* (sigset_t*)oset */ call PIC_PLT(CNAME(_sigprocmask)) popq %rdi movq %rdi,%rcx @@ -80,9 +80,9 @@ pushq %rdi pushq %rsi movq %rdi,%rdx - movq $0,%rdi /* (sigset_t*)oset */ + movq $3,%rdi /* SIG_SETMASK */ leaq 72(%rdx),%rsi /* (sigset_t*)set */ - movq $3,%rdx /* SIG_SETMASK */ + movq $0,%rdx /* (sigset_t*)oset */ call PIC_PLT(CNAME(_sigprocmask)) popq %rsi popq %rdi /* jmpbuf */ ==== //depot/projects/trustedbsd/mac/lib/libc/amd64/gen/sigsetjmp.S#2 (text+ko) ==== @@ -41,7 +41,7 @@ .asciz "$Id: sigsetjmp.S,v 1.1 1993/12/05 13:01:05 ats Exp $" #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/sigsetjmp.S,v 1.25 2003/04/30 18:09:33 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/sigsetjmp.S,v 1.26 2003/05/08 06:25:03 peter Exp $"); #include "SYS.h" @@ -58,18 +58,17 @@ */ ENTRY(sigsetjmp) - pushq %rdi - movq %rdi,%rcx - movl %esi,88(%rcx) + movl %esi,88(%rdi) testl %esi,%esi jz 2f - leaq 72(%rcx),%rdi /* (sigset_t*)oset */ + pushq %rdi + movq $1,%rdi /* SIG_BLOCK */ movq $0,%rsi /* (sigset_t*)set */ - movq $1,%rdx /* SIG_BLOCK */ + leaq 72(%rcx),%rdx /* (sigset_t*)oset */ call PIC_PLT(CNAME(_sigprocmask)) popq %rdi - movq %rdi,%rcx -2: movq 0(%rsp),%rdx /* retval */ +2: movq %rdi,%rcx + movq 0(%rsp),%rdx /* retval */ movq %rdx, 0(%rcx) /* retval */ movq %rbx, 8(%rcx) movq %rsp,16(%rcx) @@ -90,9 +89,9 @@ movq %rdi,%rdx pushq %rdi pushq %rsi - movq $0,%rdi /* (sigset_t*)oset */ + movq $3,%rdi /* SIG_SETMASK */ leaq 72(%rdx),%rsi /* (sigset_t*)set */ - movq $3,%rdx /* SIG_SETMASK */ + movq $0,%rdx /* (sigset_t*)oset */ call PIC_PLT(CNAME(_sigprocmask)) popq %rsi popq %rdi /* jmpbuf */ ==== //depot/projects/trustedbsd/mac/lib/libc/i386/arith.h#2 (text+ko) ==== @@ -1,7 +1,14 @@ /* * MD header for contrib/gdtoa * - * $FreeBSD: src/lib/libc/i386/arith.h,v 1.1 2003/03/12 20:29:59 das Exp $ + * $FreeBSD: src/lib/libc/i386/arith.h,v 1.2 2003/05/08 13:50:43 das Exp $ + */ + +/* + * NOTE: The definitions in this file must be correct or strtod(3) and + * floating point formats in printf(3) will break! The file can be + * generated by running contrib/gdtoa/arithchk.c on the target + * architecture. See contrib/gdtoa/gdtoaimp.h for details. */ #define IEEE_8087 ==== //depot/projects/trustedbsd/mac/lib/libc/ia64/arith.h#2 (text+ko) ==== @@ -1,7 +1,14 @@ /* * MD header for contrib/gdtoa * - * $FreeBSD: src/lib/libc/ia64/arith.h,v 1.1 2003/03/12 20:29:59 das Exp $ + * $FreeBSD: src/lib/libc/ia64/arith.h,v 1.2 2003/05/08 13:50:43 das Exp $ + */ + +/* + * NOTE: The definitions in this file must be correct or strtod(3) and + * floating point formats in printf(3) will break! The file can be + * generated by running contrib/gdtoa/arithchk.c on the target + * architecture. See contrib/gdtoa/gdtoaimp.h for details. */ #include ==== //depot/projects/trustedbsd/mac/lib/libc/powerpc/arith.h#2 (text+ko) ==== @@ -1,7 +1,14 @@ /* * MD header for contrib/gdtoa * - * $FreeBSD: src/lib/libc/powerpc/arith.h,v 1.1 2003/03/12 20:29:59 das Exp $ + * $FreeBSD: src/lib/libc/powerpc/arith.h,v 1.2 2003/05/08 13:50:44 das Exp $ + */ + +/* + * NOTE: The definitions in this file must be correct or strtod(3) and + * floating point formats in printf(3) will break! The file can be + * generated by running contrib/gdtoa/arithchk.c on the target + * architecture. See contrib/gdtoa/gdtoaimp.h for details. */ #define IEEE_MC68k ==== //depot/projects/trustedbsd/mac/lib/libc/sparc64/arith.h#2 (text+ko) ==== @@ -1,7 +1,14 @@ /* * MD header for contrib/gdtoa * - * $FreeBSD: src/lib/libc/sparc64/arith.h,v 1.1 2003/03/12 20:29:59 das Exp $ + * $FreeBSD: src/lib/libc/sparc64/arith.h,v 1.2 2003/05/08 13:50:44 das Exp $ + */ + +/* + * NOTE: The definitions in this file must be correct or strtod(3) and + * floating point formats in printf(3) will break! The file can be + * generated by running contrib/gdtoa/arithchk.c on the target + * architecture. See contrib/gdtoa/gdtoaimp.h for details. */ #define IEEE_MC68k ==== //depot/projects/trustedbsd/mac/libexec/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/libexec/Makefile,v 1.58 2003/05/05 07:58:42 markm Exp $ +# $FreeBSD: src/libexec/Makefile,v 1.59 2003/05/08 06:37:12 peter Exp $ # Present but disabled: kpasswdd SUBDIR= atrun \ @@ -23,13 +23,16 @@ rpc.rwalld \ rpc.sprayd \ rshd \ - rtld-elf \ save-entropy \ talkd \ tcpd \ tftpd \ ypxfr +.if ${MACHINE_ARCH} != amd64 +SUBDIR+=rtld-elf +.endif + .if !defined(NO_BIND) SUBDIR+=named-xfer .endif ==== //depot/projects/trustedbsd/mac/libexec/rtld-elf/rtld.c#13 (text+ko) ==== @@ -23,7 +23,7 @@ * (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: src/libexec/rtld-elf/rtld.c,v 1.78 2003/05/04 00:56:00 obrien Exp $ + * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.79 2003/05/08 01:31:36 kan Exp $ */ /* @@ -126,6 +126,7 @@ static void unlink_object(Obj_Entry *); static void unload_object(Obj_Entry *); static void unref_dag(Obj_Entry *); +static void ref_dag(Obj_Entry *); void r_debug_state(struct r_debug*, struct link_map*); @@ -361,7 +362,6 @@ *obj_tail = obj_main; obj_tail = &obj_main->next; obj_count++; - obj_main->refcount++; /* Make sure we don't call the main program's init and fini functions. */ obj_main->init = obj_main->fini = NULL; @@ -383,8 +383,10 @@ die(); /* Make a list of all objects loaded at startup. */ - for (obj = obj_list; obj != NULL; obj = obj->next) + for (obj = obj_list; obj != NULL; obj = obj->next) { objlist_push_tail(&list_main, obj); + obj->refcount++; + } if (ld_tracing) { /* We're done */ trace_loaded_objects(obj_main); @@ -970,6 +972,8 @@ if (donelist_check(dlp, obj)) return; + + obj->refcount++; objlist_push_tail(&obj->dldags, root); objlist_push_tail(&root->dagmembers, obj); for (needed = obj->needed; needed != NULL; needed = needed->next) @@ -1223,7 +1227,6 @@ } else free(path); - obj->refcount++; return obj; } @@ -1579,6 +1582,7 @@ /* Unreference the object and its dependencies. */ root->dl_refcount--; + unref_dag(root); if (root->refcount == 0) { @@ -1682,8 +1686,14 @@ /* Make list of init functions to call. */ initlist_add_objects(obj, &obj->next, &initlist); } - } else if (ld_tracing) - goto trace; + } else { + + /* Bump the reference counts for objects on this DAG. */ + ref_dag(obj); + + if (ld_tracing) + goto trace; + } } GDB_STATE(RT_CONSISTENT,obj ? &obj->linkmap : NULL); @@ -2405,7 +2415,6 @@ static void unlink_object(Obj_Entry *root) { - const Needed_Entry *needed; Objlist_Entry *elm; if (root->refcount == 0) { @@ -2413,25 +2422,28 @@ objlist_remove(&list_global, root); /* Remove the object from all objects' DAG lists. */ - STAILQ_FOREACH(elm, &root->dagmembers , link) + STAILQ_FOREACH(elm, &root->dagmembers , link) { objlist_remove(&elm->obj->dldags, root); + if (elm->obj != root) + unlink_object(elm->obj); + } } +} - for (needed = root->needed; needed != NULL; needed = needed->next) - if (needed->obj != NULL) - unlink_object(needed->obj); +static void +ref_dag(Obj_Entry *root) +{ + Objlist_Entry *elm; + + STAILQ_FOREACH(elm, &root->dagmembers , link) + elm->obj->refcount++; } static void unref_dag(Obj_Entry *root) { - const Needed_Entry *needed; + Objlist_Entry *elm; - if (root->refcount == 0) - return; - root->refcount--; - if (root->refcount == 0) - for (needed = root->needed; needed != NULL; needed = needed->next) - if (needed->obj != NULL) - unref_dag(needed->obj); + STAILQ_FOREACH(elm, &root->dagmembers , link) + elm->obj->refcount--; } ==== //depot/projects/trustedbsd/mac/release/Makefile#43 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.774 2003/05/05 07:58:42 markm Exp $ +# $FreeBSD: src/release/Makefile,v 1.775 2003/05/08 03:25:17 obrien Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -757,6 +757,117 @@ .endif touch release.9 +release.9.alpha: +.if ${TARGET_ARCH} != "ia64" || ${TARGET_ARCH} == ${MACHINE_ARCH} + cp ${RD}/trees/base/etc/disktab /etc + rm -rf ${RD}/mfsfd + mkdir ${RD}/mfsfd + cd ${RD}/mfsfd && \ + mkdir -p etc/defaults dev mnt stand/etc/defaults stand/help + @cd ${.CURDIR} && $(MAKE) installCRUNCH CRUNCH=boot \ + DIR=${RD}/mfsfd/stand ZIP=false + ( cd ${RD}/mfsfd && \ + for dir in bin sbin ; do \ + ln -sf /stand $$dir; \ + done ) + cp ${RD}/trees/base/sbin/dhclient-script ${RD}/mfsfd/stand +.if ${TARGET} == "pc98" + cp ${.CURDIR}/../etc/defaults/pccard.conf ${RD}/mfsfd/etc/defaults/pccard.conf +.endif + cp ${.CURDIR}/../etc/usbd.conf ${RD}/mfsfd/etc/usbd.conf + ( for F in defaults/rc.conf netconfig protocols ; do \ + sed -e '/^#.*$$/d' -e 's/[:space:]*#.*$$//g' \ + ${RD}/trees/base/etc/$$F > ${RD}/mfsfd/stand/etc/$$F ; \ + done ) + grep -E '^(ftp|nameserver|domain|sunrpc|cmd|nfsd)[^-\w]' \ + ${RD}/trees/base/etc/services | \ + sed -e '/^#.*$$/d' -e 's/[:space:]*#.*$$//g' \ + > ${RD}/mfsfd/stand/etc/services + ln ${RD}/mfsfd/stand/etc/services ${RD}/mfsfd/etc/services + ln ${RD}/mfsfd/stand/etc/netconfig ${RD}/mfsfd/etc/netconfig + cp ${RD}/trees/base/COPYRIGHT ${RD}/mfsfd/stand/help/COPYRIGHT.hlp +.if !defined(NODOC) + @for i in ${DIST_DOCS_ARCH_INDEP}; do \ + cp ${RND}/${RELNOTES_LANG}/$$i/article.txt ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \ + done + @for i in ${DIST_DOCS_ARCH_DEP}; do \ + cp ${RND}/${RELNOTES_LANG}/$$i/${TARGET}/article.txt ${RD}/mfsfd/stand/help/`echo $${i} | tr 'a-z' 'A-Z'`.TXT; \ + done + @mv ${RD}/mfsfd/stand/help/INSTALLATION.TXT ${RD}/mfsfd/stand/help/INSTALL.TXT + @mv ${RD}/mfsfd/stand/help/EARLY-ADOPTER.TXT ${RD}/mfsfd/stand/help/EARLY.TXT +.endif + -test -f ${.CURDIR}/install.cfg && cp ${.CURDIR}/install.cfg ${RD}/mfsfd + @mkdir -p ${RD}/mfsfd/boot +.if ${TARGET_ARCH} != "ia64" + @cp ${RD}/trees/base/boot/boot* ${RD}/mfsfd/boot +.endif +.if ${TARGET} == "i386" + @cp ${RD}/trees/base/boot/mbr ${RD}/mfsfd/boot +.endif + @echo "Making the regular boot floppy." + @tar --exclude CVS -cf - -C ${.CURDIR}/../usr.sbin/sysinstall help | \ + tar xf - -C ${RD}/mfsfd/stand +.if ${TARGET_ARCH} == "alpha" && !defined(NO_FLOPPIES) + rm -rf ${RD}/mfsfd/stand/help/* +.endif +.if defined(SMALLBOOTSIZE) +.if exists(${.CURDIR}/${TARGET}/drivers-small.conf) + @rm -rf ${RD}/mfsfd/modules + @mkdir -p ${RD}/mfsfd/modules + @awk -f ${.CURDIR}/scripts/driver-copy2.awk 2 \ + ${.CURDIR}/${TARGET}/drivers-small.conf \ + ${RD}/trees/base/boot/kernel ${RD}/mfsfd/modules +.endif + sh -e ${DOFS_SH} mfsroot ${RD} ${MNT} \ + ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL} + @gzip -9vc mfsroot > mfsroot.gz + @sh -e ${DOFS_SH} ${RD}/floppies/mfsroot-small.flp \ + ${RD} ${MNT} ${SMALLBOOTSIZE} mfsroot.gz \ + ${BOOTINODE} ${SMALLBOOTLABEL} +.endif +.if exists(${.CURDIR}/${TARGET}/drivers.conf) + @rm -rf ${RD}/mfsfd/modules + @mkdir -p ${RD}/mfsfd/modules + @awk -f ${.CURDIR}/scripts/driver-copy2.awk 2 \ + ${.CURDIR}/${TARGET}/drivers.conf \ + ${RD}/trees/base/boot/kernel ${RD}/mfsfd/modules + @rm -rf ${RD}/driversfd + @mkdir ${RD}/driversfd + @awk -f ${.CURDIR}/scripts/driver-copy2.awk 3 \ + ${.CURDIR}/${TARGET}/drivers.conf \ + ${RD}/trees/base/boot/kernel ${RD}/driversfd + -@rmdir ${RD}/driversfd + if [ -d ${RD}/driversfd ]; then \ + sh -e ${DOFS_SH} \ + ${RD}/floppies/drivers.flp ${RD} ${MNT} ${DRIVERSIZE} \ + ${RD}/driversfd ${DRIVERINODE} ${DRIVERLABEL}; \ + cd ${RD}/driversfd && awk -f ${.CURDIR}/scripts/driver-desc.awk \ + *.dsc >> ${RD}/floppies/DRIVERS.TXT; \ + fi +.endif + sh -e ${DOFS_SH} mfsroot ${RD} ${MNT} \ + ${MFSSIZE} ${RD}/mfsfd ${MFSINODE} ${MFSLABEL} + @gzip -9vc mfsroot > mfsroot.gz + @mkdir -p ${RD}/mfsroot + @cp mfsroot.gz ${RD}/mfsroot +.if !defined(NO_FLOPPIES) +.if defined(BOOTSIZE) + @sh -e ${DOFS_SH} ${RD}/floppies/mfsroot.flp \ + ${RD} ${MNT} ${BOOTSIZE} mfsroot.gz ${BOOTINODE} ${BOOTLABEL} + @cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern +.endif +.if defined(SMALLBOOTSIZE) + @cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=kern-small FDSIZE=SMALL +.endif +.if defined(BIGBOOTSIZE) + @cd ${.CURDIR} && ${MAKE} doMFSKERN FSIMAGE=boot FDSIZE=BIG +.endif +.endif + @rm mfsroot mfsroot.gz + @echo "Regular and MFS boot floppies made." +.endif + touch release.9.alpha + # # --==## Create a fixit floppy ##==-- # @@ -973,8 +1084,14 @@ md5 * > CHECKSUM.MD5) \ ) +.if ${TARGET_ARCH} == "alpha" +RELEASE9=release.9.${TARGET_ARCH} +.else +RELEASE9=release.9 +.endif + doRELEASE: release.1 release.2 release.3 ${DOCREL} release.4 release.5 \ - release.6 release.7 release.8 release.9 ${FIXIT_TARGET} + release.6 release.7 release.8 ${RELEASE9} ${FIXIT_TARGET} @cd ${.CURDIR} && ${MAKE} ${EXTRAS} @echo "Release done" ==== //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#35 (text+ko) ==== @@ -31,7 +31,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.146 2003/05/03 23:47:21 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.147 2003/05/09 23:14:02 bmah Exp $ Supported Devices @@ -3397,13 +3397,26 @@ Floppy drives (&man.fdc.4; driver) Genius and Mustek hand scanners GPB and Transputer drivers + + VGA-compatible video cards + (&man.vga.4; driver) + + + Information regarding specific video cards and + compatibility with XFree86 can be + found at . + + + + Keyboards including: - AT-style keyboards + AT-style keyboards (&man.atkbd.4; driver) - PS/2 keyboards + PS/2 keyboards (&man.atkbd.4; driver) Standard keyboards @@ -3415,22 +3428,30 @@ Loran-C receiver (Dave Mills experimental hardware, loran driver). - Mice including: + Pointing devices including: - Bus mice (&man.mse.4; driver) + Bus mice and compatible devices (&man.mse.4; driver) - PS/2 mice (&man.psm.4; driver) + PS/2 mice and compatible devices, including many laptop + pointing devices (&man.psm.4; driver) - Serial mice + Serial mice and compatible devices USB mice (specific instances are listed in the section describing USB devices) + + + &man.moused.8; has more information on using pointing + devices with &os;. Information on using pointing devices + with XFree86 can be found at + . + PC standard parallel ports (&man.ppc.4; driver) ==== //depot/projects/trustedbsd/mac/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#56 (text+ko) ==== @@ -3,7 +3,7 @@ The FreeBSD Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.563 2003/05/07 04:15:57 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.566 2003/05/08 22:31:00 bmah Exp $ 2000 @@ -504,6 +504,14 @@ &man.adduser.8; now supports a option to set a user's default login group. + The &man.bsdlabel.8; utility is a replacement for the older + disklabel utility. Like its predecessor, it installs, examines, + or modifies the BSD label on a disk partition, and can install + bootstrap code. Compared to disklabel, a number of obsolete + options and parameters have been retired. A new + option instructs &man.bsdlabel.8; to use the + layout suitable for a specific machine. + The compat4x distribution now includes the libcrypto.so.2, @@ -526,16 +534,10 @@ information about a disk device and optionally to run a naive performance test. - The and flags to - &man.disklabel.8; have been retired. - - &man.disklabel.8; is now only built for architectures where - it is useful (i386, pc98, alpha, and ia64). + The disklabel utility has been replaced by &man.bsdlabel.8;. + On the alpha, i386, and pc98 platforms, disklabel is a link to + &man.bsdlabel.8;. - The option to &man.disklabel.8; has been - removed because the i386 boot loader now resides in a single - file. - &man.dump.8; now supports caching of disk blocks with the option. This can improve dump performance at the cost of possibly missing file system updates that occur @@ -655,12 +657,47 @@ unless UFS1 is specifically requested with the option. - &man.newsyslog.8; now supports a W flag - to force previously-started compression jobs for an entry (or - group of entries specified with the G flag) - to finish before beginning a new one. This feature is designed - to prevent system overloads caused by starting several - compression jobs on big files simultaneously. &merged; + &man.newsyslog.8; has a number of new features. Among them: + + + + A W flag forces previously-started + compression jobs for an entry (or group of entries + specified with the G flag) to finish + before beginning a new one. This feature is designed to + prevent system overloads caused by starting several + compression jobs on big files + simultaneously. &merged; + + + + A default rotate action, to be used for + files specified for rotation but not specified in the + configuration file. &merged; + + + + A command-line flag to disable + sending signals to processes when rotating + files. &merged; + + + + A N configuration file flag to + indicate that no process needs to be signaled when + rotating a file. &merged; + + + + A U configuration file flag to + specify that a process group (rather than a single + process) should be signaled when rotating + files. &merged; + + + + + &man.nsdispatch.3; is now thread-safe and implements support for Name Service Switch (NSS) modules. NSS modules may be @@ -719,7 +756,7 @@ strengthened. The sunlabel utility, a program analogous to - &man.disklabel.8; that works on Sun disk labels, has been + &man.bsdlabel.8; that works on Sun disk labels, has been added. &man.sysinstall.8; will now ==== //depot/projects/trustedbsd/mac/release/scripts/doFS.sh#11 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/release/scripts/doFS.sh,v 1.49 2003/05/03 19:23:10 scottl Exp $ +# $FreeBSD: src/release/scripts/doFS.sh,v 1.50 2003/05/09 09:41:18 scottl Exp $ # set -ex ==== //depot/projects/trustedbsd/mac/release/scripts/print-cdrom-packages.sh#16 (text+ko) ==== @@ -2,7 +2,7 @@ # # Author: Jordan Hubbard # Date: Mon Jul 10 01:18:20 2000 -# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.41 2003/03/03 03:28:30 murray Exp $ +# Version: $FreeBSD: src/release/scripts/print-cdrom-packages.sh,v 1.42 2003/05/09 09:41:18 scottl Exp $ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri May 9 17:17:27 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8CC9C37B401; Fri, 9 May 2003 17:17:26 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 276F437B404 for ; Fri, 9 May 2003 17:17:26 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9ECA643FBF for ; Fri, 9 May 2003 17:17:25 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4A0HP0U009908 for ; Fri, 9 May 2003 17:17:25 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4A0HOqG009905 for perforce@freebsd.org; Fri, 9 May 2003 17:17:24 -0700 (PDT) Date: Fri, 9 May 2003 17:17:24 -0700 (PDT) Message-Id: <200305100017.h4A0HOqG009905@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30896 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 May 2003 00:17:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=30896 Change 30896 by peter@peter_hammer on 2003/05/09 17:17:08 translate remaining i386/support.s code into amd64 asm code. Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#14 edit .. //depot/projects/hammer/sys/amd64/amd64/support.S#2 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#14 (text+ko) ==== @@ -1697,64 +1697,3 @@ } #endif /* DDB */ - -void -bcopy(const void *src, void *dest, size_t len) -{ - const char *csrc; - char *cdest; - size_t i; - - csrc = (const char *)src; - cdest = (char *)dest; - if (src < dest) { - for (i = len - 1; i != (size_t)-1; i--) - cdest[i] = csrc[i]; - } else { - for (i = 0; i < len; i++) - cdest[i] = csrc[i]; - } -} - -void * -memcpy(void *dest, const void *src, size_t len) -{ - - bcopy(src, dest, len); - return dest; -} - -void -bzero(void *buf, size_t len) -{ - char *cbuf; - size_t i; - - cbuf = (char *)buf; - for (i = 0; i < len; i++) - cbuf[i] = 0; -} - -void -pagezero(void *buf) -{ - - bzero(buf, PAGE_SIZE); -} - -int -bcmp(const void *s1, const void *s2, size_t len) -{ - const char *cs1, *cs2; - int diff; - size_t i; - - cs1 = (const char *)s1; - cs2 = (const char *)s2; - for (i = 0; i < len; i++) { - diff = cs2[i] - cs1[i]; - if (diff) - return diff; - } - return 0; -} ==== //depot/projects/hammer/sys/amd64/amd64/support.S#2 (text+ko) ==== @@ -34,15 +34,153 @@ */ #include -#include #include -#include #include "assym.s" .text +/* + * bcopy family + * void bzero(void *buf, u_int len) + */ + +/* done */ +ENTRY(bzero) + movq %rsi,%rcx + xorq %rax,%rax + shrq $3,%rcx + cld + rep + stosq + movq %rsi,%rcx + andq $7,%rcx + rep + stosb + ret + +/* Address: %rdi */ +ENTRY(pagezero) + movq $512, %rcx + cld + + ALIGN_TEXT +1: + xorq %rax, %rax + repe + scasq + jnz 2f + + ret + + ALIGN_TEXT + +2: + incq %rcx + subq $8, %rdi + + movq %rcx, %rdx + cmpq $16, %rcx + + jge 3f + + movq %rdi, %r8 + andq $0x7f, %r8 + shrq $3, %r8 + movq $16, %rcx + subq %r8, %rcx + +3: + subq %rcx, %rdx + rep + stosq + + movq %rdx, %rcx + testq %rdx, %rdx + jnz 1b + + ret + + +ENTRY(bcmp) + xorq %rax,%rax + + movq %rdx,%rcx + shrq $3,%rcx + cld /* compare forwards */ + repe + cmpsq + jne 1f + + movq %rdx,%rcx + andq $7,%rcx + repe + cmpsb + je 2f +1: + incq %rax +2: + ret + +/* + * bcopy(src, dst, cnt) + * rdi, rsi, rdx + * ws@tools.de (Wolfgang Solfrank, TooLs GmbH) +49-228-985800 + */ +ENTRY(bcopy) + xchgq %rsi,%rdi + movq %rdx,%rcx + + movq %rdi,%rax + subq %rsi,%rax + cmpq %rcx,%rax /* overlapping && src < dst? */ + jb 1f + + shrq $3,%rcx /* copy by 64-bit words */ + cld /* nope, copy forwards */ + rep + movsq + movq %rdx,%rcx + andq $7,%rcx /* any bytes left? */ + rep + movsb + ret + + /* ALIGN_TEXT */ +1: + addq %rcx,%rdi /* copy backwards */ + addq %rcx,%rsi + decq %rdi + decq %rsi + andq $7,%rcx /* any fractional bytes? */ + std + rep + movsb + movq %rdx,%rcx /* copy remainder by 32-bit words */ + shrq $3,%rcx + subq $7,%rsi + subq $7,%rdi + rep + movsq + cld + ret + +/* + * Note: memcpy does not support overlapping copies + */ +ENTRY(memcpy) + movq %rdx,%rcx + shrq $3,%rcx /* copy by 64-bit words */ + cld /* copy forwards */ + rep + movsq + movq %rdx,%rcx + andq $7,%rcx /* any bytes left? */ + rep + movsb + ret + /* fillw(pat, base, cnt) */ /* %rdi,%rsi, %rdx */ ENTRY(fillw) From owner-p4-projects@FreeBSD.ORG Fri May 9 18:10:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4495E37B404; Fri, 9 May 2003 18:10:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E931C37B401 for ; Fri, 9 May 2003 18:10:34 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4DEE443FCB for ; Fri, 9 May 2003 18:10:34 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4A1AY0U013891 for ; Fri, 9 May 2003 18:10:34 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4A1AXpG013888 for perforce@freebsd.org; Fri, 9 May 2003 18:10:33 -0700 (PDT) Date: Fri, 9 May 2003 18:10:33 -0700 (PDT) Message-Id: <200305100110.h4A1AXpG013888@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30901 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 May 2003 01:10:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=30901 Change 30901 by peter@peter_daintree on 2003/05/09 18:10:22 IFC @30900 Affected files ... .. //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#9 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#16 integrate .. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#5 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#15 integrate .. //depot/projects/hammer/sys/amd64/amd64/support.S#3 integrate .. //depot/projects/hammer/sys/amd64/include/_types.h#5 integrate .. //depot/projects/hammer/sys/amd64/include/asm.h#7 integrate .. //depot/projects/hammer/sys/amd64/include/md_var.h#7 integrate .. //depot/projects/hammer/sys/amd64/include/stdarg.h#4 integrate .. //depot/projects/hammer/sys/geom/geom_dev.c#14 integrate .. //depot/projects/hammer/sys/kern/kern_sig.c#13 integrate .. //depot/projects/hammer/usr.sbin/Makefile#13 integrate Differences ... ==== //depot/projects/hammer/lib/libc/amd64/gen/Makefile.inc#9 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile.inc 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.20 2003/05/07 23:49:24 peter Exp $ +# $FreeBSD: src/lib/libc/amd64/gen/Makefile.inc,v 1.21 2003/05/10 00:47:52 peter Exp $ SRCS+= _setjmp.S setjmp.S sigsetjmp.S \ fabs.S modf.S \ ==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#16 (text+ko) ==== @@ -31,7 +31,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.146 2003/05/03 23:47:21 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.147 2003/05/09 23:14:02 bmah Exp $ Supported Devices @@ -3397,13 +3397,26 @@ Floppy drives (&man.fdc.4; driver) Genius and Mustek hand scanners GPB and Transputer drivers + + VGA-compatible video cards + (&man.vga.4; driver) + + + Information regarding specific video cards and + compatibility with XFree86 can be + found at . + + + + Keyboards including: - AT-style keyboards + AT-style keyboards (&man.atkbd.4; driver) - PS/2 keyboards + PS/2 keyboards (&man.atkbd.4; driver) Standard keyboards @@ -3415,22 +3428,30 @@ Loran-C receiver (Dave Mills experimental hardware, loran driver). - Mice including: + Pointing devices including: - Bus mice (&man.mse.4; driver) + Bus mice and compatible devices (&man.mse.4; driver) - PS/2 mice (&man.psm.4; driver) + PS/2 mice and compatible devices, including many laptop + pointing devices (&man.psm.4; driver) - Serial mice + Serial mice and compatible devices USB mice (specific instances are listed in the section describing USB devices) + + + &man.moused.8; has more information on using pointing + devices with &os;. Information on using pointing devices + with XFree86 can be found at + . + PC standard parallel ports (&man.ppc.4; driver) ==== //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#5 (text+ko) ==== @@ -54,7 +54,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/sbin/bsdlabel/bsdlabel.c,v 1.90 2003/05/04 19:27:22 phk Exp $"); +__FBSDID("$FreeBSD: src/sbin/bsdlabel/bsdlabel.c,v 1.92 2003/05/09 20:26:17 phk Exp $"); #include #include @@ -308,18 +308,17 @@ if (fd < 0) err(1, "cannot open %s", xxboot); fstat(fd, &st); - if (st.st_size == BBSIZE) { - i = read(fd, bootarea, BBSIZE); - if (i != BBSIZE) + if (alphacksum && st.st_size <= BBSIZE - 512) { + i = read(fd, bootarea + 512, st.st_size); + if (i != st.st_size) err(1, "read error %s", xxboot); return; - } - if (alphacksum && st.st_size == BBSIZE - 512) { - i = read(fd, bootarea + 512, BBSIZE - 512); - if (i != BBSIZE - 512) + } else if ((!alphacksum) && st.st_size <= BBSIZE) { + i = read(fd, bootarea, st.st_size); + if (i != st.st_size) err(1, "read error %s", xxboot); return; - } + } errx(1, "boot code %s is wrong size", xxboot); } @@ -424,7 +423,6 @@ gctl_rw_param(grq, "mbroffset", sizeof(mbroffset), &mbroffset); errstr = gctl_issue(grq); if (errstr != NULL) { - warnx("%s", errstr); mbroffset = 0; gctl_free(grq); return (error); @@ -658,6 +656,7 @@ int lineno = 0, errors = 0; int i; + makelabel("auto", lp); bzero(&part_set, sizeof(part_set)); bzero(&part_size_type, sizeof(part_size_type)); bzero(&part_offset_type, sizeof(part_offset_type)); ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#15 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.568 2003/05/08 08:25:51 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.569 2003/05/10 00:49:56 peter Exp $ */ #include "opt_atalk.h" ==== //depot/projects/hammer/sys/amd64/amd64/support.S#3 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.97 2003/05/01 01:05:21 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/support.S,v 1.98 2003/05/10 00:49:56 peter Exp $ */ #include ==== //depot/projects/hammer/sys/amd64/include/_types.h#5 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/amd64/include/_types.h,v 1.4 2003/05/01 01:05:23 peter Exp $ + * $FreeBSD: src/sys/amd64/include/_types.h,v 1.5 2003/05/10 00:55:15 peter Exp $ */ #ifndef _MACHINE__TYPES_H_ ==== //depot/projects/hammer/sys/amd64/include/asm.h#7 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)DEFS.h 5.1 (Berkeley) 4/23/90 - * $FreeBSD: src/sys/amd64/include/asm.h,v 1.11 2003/05/01 01:05:23 peter Exp $ + * $FreeBSD: src/sys/amd64/include/asm.h,v 1.12 2003/05/10 00:53:34 peter Exp $ */ #ifndef _MACHINE_ASM_H_ ==== //depot/projects/hammer/sys/amd64/include/md_var.h#7 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.63 2003/05/01 01:05:23 peter Exp $ + * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.64 2003/05/10 00:51:29 peter Exp $ */ #ifndef _MACHINE_MD_VAR_H_ ==== //depot/projects/hammer/sys/amd64/include/stdarg.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/stdarg.h,v 1.4 2002/10/06 22:01:07 mike Exp $ + * $FreeBSD: src/sys/amd64/include/stdarg.h,v 1.5 2003/05/10 00:55:15 peter Exp $ */ #ifndef _MACHINE_STDARG_H_ ==== //depot/projects/hammer/sys/geom/geom_dev.c#14 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom_dev.c,v 1.57 2003/05/02 06:42:59 phk Exp $ + * $FreeBSD: src/sys/geom/geom_dev.c,v 1.58 2003/05/09 21:25:28 phk Exp $ */ #include @@ -215,7 +215,7 @@ { struct g_geom *gp; struct g_consumer *cp; - int error, r, w, e; + int error, r, w, e, i; gp = dev->si_drv1; cp = dev->si_drv2; @@ -236,8 +236,20 @@ error = ENXIO; /* We were orphaned */ else error = g_access_rel(cp, r, w, e); - KASSERT((cp->acr || cp->acw) || (cp->nstart == cp->nend), - ("final g_dev_close() with outstanding bios")); + for (i = 0; i < 10 * hz;) { + if (cp->acr != 0 || cp->acw != 0) + break; + if (cp->nstart == cp->nend) + break; + tsleep(&i, PRIBIO, "gdevwclose", hz / 10); + i += hz / 10; + } + if (cp->acr == 0 && cp->acw == 0 && cp->nstart != cp->nend) { + printf("WARNING: Final close of geom_dev(%s) %s %s", + gp->name, + "still has outstanding I/O after 10 seconds.", + "Completing close anyway, panic may happen later."); + } g_topology_unlock(); PICKUP_GIANT(); g_waitidle(); ==== //depot/projects/hammer/sys/kern/kern_sig.c#13 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_sig.c 8.7 (Berkeley) 4/18/94 - * $FreeBSD: src/sys/kern/kern_sig.c,v 1.236 2003/05/05 21:26:25 jhb Exp $ + * $FreeBSD: src/sys/kern/kern_sig.c,v 1.237 2003/05/09 19:11:32 jhb Exp $ */ #include "opt_compat.h" @@ -1072,7 +1072,6 @@ kern_sigsuspend(struct thread *td, sigset_t mask) { struct proc *p = td->td_proc; - register struct sigacts *ps; /* * When returning from sigsuspend, we want @@ -1081,9 +1080,7 @@ * save it here and mark the sigacts structure * to indicate this. */ - mtx_lock(&Giant); PROC_LOCK(p); - ps = p->p_sigacts; td->td_oldsigmask = td->td_sigmask; mtx_lock_spin(&sched_lock); td->td_flags |= TDF_OLDMASK; @@ -1091,10 +1088,9 @@ SIG_CANTMASK(mask); td->td_sigmask = mask; signotify(td); - while (msleep(ps, &p->p_mtx, PPAUSE|PCATCH, "pause", 0) == 0) + while (msleep(p->p_sigacts, &p->p_mtx, PPAUSE|PCATCH, "pause", 0) == 0) /* void */; PROC_UNLOCK(p); - mtx_unlock(&Giant); /* always return EINTR rather than ERESTART... */ return (EINTR); } @@ -1116,11 +1112,8 @@ { struct proc *p = td->td_proc; sigset_t mask; - register struct sigacts *ps; - mtx_lock(&Giant); PROC_LOCK(p); - ps = p->p_sigacts; td->td_oldsigmask = td->td_sigmask; mtx_lock_spin(&sched_lock); td->td_flags |= TDF_OLDMASK; @@ -1129,10 +1122,9 @@ SIG_CANTMASK(mask); SIGSETLO(td->td_sigmask, mask); signotify(td); - while (msleep(ps, &p->p_mtx, PPAUSE|PCATCH, "opause", 0) == 0) + while (msleep(p->p_sigacts, &p->p_mtx, PPAUSE|PCATCH, "opause", 0) == 0) /* void */; PROC_UNLOCK(p); - mtx_unlock(&Giant); /* always return EINTR rather than ERESTART... */ return (EINTR); } ==== //depot/projects/hammer/usr.sbin/Makefile#13 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 5.20 (Berkeley) 6/12/93 -# $FreeBSD: src/usr.sbin/Makefile,v 1.250 2003/04/27 05:42:07 imp Exp $ +# $FreeBSD: src/usr.sbin/Makefile,v 1.251 2003/05/09 21:06:41 peter Exp $ .if ${MACHINE_ARCH} != "powerpc" _sysinstall=sysinstall From owner-p4-projects@FreeBSD.ORG Fri May 9 18:14:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C269337B404; Fri, 9 May 2003 18:14:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5116C37B401 for ; Fri, 9 May 2003 18:14:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC84243FAF for ; Fri, 9 May 2003 18:14:39 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4A1Ed0U014057 for ; Fri, 9 May 2003 18:14:39 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4A1EdMd014054 for perforce@freebsd.org; Fri, 9 May 2003 18:14:39 -0700 (PDT) Date: Fri, 9 May 2003 18:14:39 -0700 (PDT) Message-Id: <200305100114.h4A1EdMd014054@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30902 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 May 2003 01:14:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=30902 Change 30902 by peter@peter_daintree on 2003/05/09 18:14:15 RCSId sync Affected files ... .. //depot/projects/hammer/lib/libc/amd64/gen/ldexp.c#4 edit Differences ... ==== //depot/projects/hammer/lib/libc/amd64/gen/ldexp.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)ldexp.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/i386/gen/ldexp.c,v 1.9 2002/03/23 02:05:17 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/amd64/gen/ldexp.c,v 1.10 2003/05/10 00:47:52 peter Exp $"); /* * ldexp(value, exp): return value * (2 ** exp). From owner-p4-projects@FreeBSD.ORG Fri May 9 19:37:22 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A050A37B404; Fri, 9 May 2003 19:37:21 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2276C37B401 for ; Fri, 9 May 2003 19:37:21 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id AB55243F75 for ; Fri, 9 May 2003 19:37:20 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4A2bK0U018115 for ; Fri, 9 May 2003 19:37:20 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4A2bKtG018112 for perforce@freebsd.org; Fri, 9 May 2003 19:37:20 -0700 (PDT) Date: Fri, 9 May 2003 19:37:20 -0700 (PDT) Message-Id: <200305100237.h4A2bKtG018112@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30904 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 May 2003 02:37:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=30904 Change 30904 by marcel@marcel_nfs on 2003/05/09 19:36:55 Mostly white space reduction. Fix 2 allocs that are harmless but wrong. Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia64/support.s#5 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia64/support.s#5 (text+ko) ==== @@ -69,7 +69,6 @@ * ar.bsp tranlated to new mode */ ENTRY(ia64_change_mode, 0) - rsm psr.i | psr.ic mov r19=ar.rsc // save rsc while we change mode tbit.nz p6,p7=r14,17 // physical or virtual ? @@ -106,7 +105,6 @@ 2: mov ar.rsc=r19 // restore ar.rsc br.ret.sptk.few rp // now in new mode - END(ia64_change_mode) /* @@ -121,7 +119,6 @@ * psr.i cleared */ ENTRY(ia64_physical_mode, 0) - mov r14=psr mov ret0=psr movl r15=(IA64_PSR_I|IA64_PSR_IT|IA64_PSR_DT|IA64_PSR_RT|IA64_PSR_DFL|IA64_PSR_DFH) @@ -133,7 +130,6 @@ or ret0=ret0,r16 // make sure BN=1 br.cond.sptk.many ia64_change_mode - END(ia64_physical_mode) /* @@ -148,7 +144,6 @@ * */ ENTRY(ia64_call_efi_physical, 6) - .prologue .regstk 6,4,5,0 .save ar.pfs,loc0 @@ -183,7 +178,6 @@ mov ar.pfs=loc0 ;; br.ret.sptk.many rp - END(ia64_call_efi_physical) /**************************************************************************/ @@ -194,7 +188,6 @@ ENTRY(suword64, 2) XENTRY(suword) - movl r14=VM_MAX_ADDRESS;; // make sure address is ok cmp.geu p6,p0=in0,r14 (p6) br.dpnt.few fusufault @@ -218,11 +211,9 @@ mov ret0=r0 br.ret.sptk.few rp - END(suword64) ENTRY(suword32, 2) - movl r14=VM_MAX_ADDRESS;; // make sure address is ok cmp.geu p6,p0=in0,r14 (p6) br.dpnt.few fusufault @@ -246,11 +237,9 @@ mov ret0=r0 br.ret.sptk.few rp - END(suword32) ENTRY(subyte, 2) - movl r14=VM_MAX_ADDRESS;; // make sure address is ok cmp.geu p6,p0=in0,r14 (p6) br.dpnt.few fusufault @@ -274,12 +263,10 @@ mov ret0=r0 br.ret.sptk.few rp - END(subyte) ENTRY(fuword64, 1) XENTRY(fuword) - movl r14=VM_MAX_ADDRESS;; // make sure address is ok cmp.geu p6,p0=in0,r14 (p6) br.dpnt.few fusufault @@ -302,11 +289,9 @@ st8 [r15]=r0 // clean up br.ret.sptk.few rp - END(fuword64) ENTRY(fuword32, 1) - movl r14=VM_MAX_ADDRESS;; // make sure address is ok cmp.geu p6,p0=in0,r14 (p6) br.dpnt.few fusufault @@ -329,11 +314,9 @@ st8 [r15]=r0 // clean up br.ret.sptk.few rp - END(fuword32) ENTRY(fubyte, 1) - movl r14=VM_MAX_ADDRESS;; // make sure address is ok cmp.geu p6,p0=in0,r14 (p6) br.dpnt.few fusufault @@ -356,7 +339,6 @@ st8 [r15]=r0 // clean up br.ret.sptk.few rp - END(fubyte) ENTRY(fusufault, 0) @@ -410,7 +392,6 @@ 4: mov ret0=0 // return 0. br.ret.sptk.few rp - END(copystr) ENTRY(copyinstr, 4) @@ -450,14 +431,12 @@ mov ar.pfs=loc0 // restore ar.pfs mov rp=loc1 // restore ra. br.ret.sptk.few rp // ret0 left over from copystr - END(copyinstr) /* * Not the fastest bcopy in the world. */ ENTRY(bcopy, 3) - mov ret0=r0 // return zero for copy{in,out} ;; cmp.le p6,p0=in2,r0 // bail if len <= 0 @@ -519,24 +498,20 @@ (p6) br.cond.spnt.few 6b br.ret.sptk.few rp - END(bcopy) ENTRY(memcpy,3) - mov r14=in0 ;; mov in0=in1 ;; mov in1=r14 br.cond.sptk.few bcopy - END(memcpy) ENTRY(copyin, 3) - .prologue - .regstk 4, 3, 4, 0 + .regstk 3, 3, 3, 0 .save ar.pfs,loc0 - alloc loc0=ar.pfs,4,3,4,0 + alloc loc0=ar.pfs,3,3,3,0 .save rp,loc1 mov loc1=rp .body @@ -568,15 +543,13 @@ mov ar.pfs=loc0 // restore ar.pfs mov rp=loc1 // restore ra. br.ret.sptk.few rp // ret0 left over from bcopy - END(copyin) ENTRY(copyout, 3) - .prologue - .regstk 4, 3, 4, 0 + .regstk 3, 3, 3, 0 .save ar.pfs,loc0 - alloc loc0=ar.pfs,4,3,4,0 + alloc loc0=ar.pfs,3,3,3,0 .save rp,loc1 mov loc1=rp .body @@ -608,11 +581,9 @@ mov ar.pfs=loc0 // restore ar.pfs mov rp=loc1 // restore ra. br.ret.sptk.few rp // ret0 left over from bcopy - END(copyout) ENTRY(copyerr, 0) - add r14=PC_CURTHREAD,r13 ;; // find curthread ld8 r14=[r14] ;; add r14=TD_PCB,r14 ;; // curthread->td_addr @@ -622,5 +593,4 @@ mov ret0=EFAULT // return EFAULT br.ret.sptk.few rp - END(copyerr) From owner-p4-projects@FreeBSD.ORG Fri May 9 21:54:06 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4BE5637B404; Fri, 9 May 2003 21:54:06 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DB04A37B401 for ; Fri, 9 May 2003 21:54:05 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8199143F75 for ; Fri, 9 May 2003 21:54:05 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4A4s50U029891 for ; Fri, 9 May 2003 21:54:05 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4A4s5eq029888 for perforce@freebsd.org; Fri, 9 May 2003 21:54:05 -0700 (PDT) Date: Fri, 9 May 2003 21:54:05 -0700 (PDT) Message-Id: <200305100454.h4A4s5eq029888@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30905 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 May 2003 04:54:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=30905 Change 30905 by jmallett@jmallett_dalek on 2003/05/09 21:54:02 Use an ungodly huge stack, for now, it's doing well here and since that my random problems have gone away, but that may be the result of other things related to mutex_init. Prime the GP, compiler changes going in soon need this to produce a booting kernel. Affected files ... .. //depot/projects/mips/sys/mips/mips/locore.S#6 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/locore.S#6 (text+ko) ==== @@ -33,12 +33,13 @@ #include "assym.s" .data +GLOBAL(stackspace) + .space 131072 +GLOBAL(topstack) /* * Dummy interrupt table to keep sysctl happy until * it's worked out what to do with naming */ -GLOBAL(stackspace) - .space 16384 GLOBAL(intrnames) .asciz "dummy" GLOBAL(eintrnames) @@ -50,7 +51,8 @@ .set noreorder .text -ENTRY(btext) + .globl btext +btext: ENTRY(start) # t0: Bits to preserve if set: # Soft reset @@ -81,14 +83,23 @@ sw t0, cpu_id sw t1, fpu_id + # Set up the GP. + la gp, _gp + # Set up our temporary stack. - la sp, stackspace - addu sp, 16384 + la sp, topstack # Call the platform-specific startup code. jal platform_start nop +#if 0 + # Put thread0 onto our temporary stack. + ld t0, pcpup + ld t0, PC_CURTHREAD(t0) + sd sp, TD_KSTACK(t0) +#endif + # Start MI things rolling. jal mi_startup nop From owner-p4-projects@FreeBSD.ORG Fri May 9 21:56:10 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8353B37B404; Fri, 9 May 2003 21:56:09 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2377537B401 for ; Fri, 9 May 2003 21:56:09 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A236C43FE3 for ; Fri, 9 May 2003 21:56:08 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4A4u80U029998 for ; Fri, 9 May 2003 21:56:08 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4A4u8OQ029995 for perforce@freebsd.org; Fri, 9 May 2003 21:56:08 -0700 (PDT) Date: Fri, 9 May 2003 21:56:08 -0700 (PDT) Message-Id: <200305100456.h4A4u8OQ029995@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30906 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 May 2003 04:56:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=30906 Change 30906 by jmallett@jmallett_dalek on 2003/05/09 21:55:24 Mark temp variables as outputs so it doesn't look like we are getting values from them, and doing something wrong with them uninitialised. The asm doesn't make any use of existing values in them. XXX, need to find a way to just get *A* temporary register in the inline assembler. Maybe just mark $8 as clobbered and use it? Affected files ... .. //depot/projects/mips/sys/mips/include/atomic.h#15 edit Differences ... ==== //depot/projects/mips/sys/mips/include/atomic.h#15 (text+ko) ==== @@ -107,8 +107,8 @@ asmop "\n\t" \ "sc %[temp], %[p]\n\t" \ "beqz %[temp], 1b\n\t" \ - : [val] "=&r"(val), [p] "+m"(*p) \ - : [temp] "r"(temp) \ + : [val] "=&r"(val), [temp] "=&r"(temp), [p] "+m"(*p) \ + : \ : "memory" \ ); \ } @@ -146,8 +146,8 @@ "sc %[temp], %[p]\n\t" "beqz %[temp], 1b\n\t" "2:\n\t" - : [res] "=&r"(res), [p] "+m"(*p) - : [old] "r"(old), [val] "r"(val), [temp] "r"(temp) + : [res] "=&r"(res), [temp] "=&r"(temp), [p] "+m"(*p) + : [old] "r"(old), [val] "r"(val) : "memory" ); @@ -169,8 +169,8 @@ "move %[temp], $0\n\t" "sc %[temp], %[p]\n\t" "beqz %[temp], 1b\n\t" - : [res] "=&r"(res), [p] "+m"(*p) - : [temp] "r"(temp) + : [res] "=&r"(res), [temp] "=&r"(temp), [p] "+m"(*p) + : : "memory" ); @@ -195,8 +195,8 @@ asmop "\n\t" \ "scd %[temp], %[p]\n\t" \ "beqz %[temp], 1b\n\t" \ - : [val] "=&r"(val), [p] "+m"(*p) \ - : [temp] "r"(temp) \ + : [val] "=&r"(val), [temp] "=&r"(temp), [p] "+m"(*p) \ + : \ : "memory" \ ); \ } @@ -234,8 +234,8 @@ "scd %[temp], %[p]\n\t" "beqz %[temp], 1b\n\t" "2:\n\t" - : [res] "=&r"(res), [p] "+m"(*p) - : [old] "r"(old), [val] "r"(val), [temp] "r"(temp) + : [res] "=&r"(res), [temp] "=&r"(temp), [p] "+m"(*p) + : [old] "r"(old), [val] "r"(val) : "memory" ); @@ -257,8 +257,8 @@ "move %[temp], $0\n\t" "scd %[temp], %[p]\n\t" "beqz %[temp], 1b\n\t" - : [res] "=&r"(res), [p] "+m"(*p) - : [temp] "r"(temp) + : [res] "=&r"(res), [temp] "=&r"(temp), [p] "+m"(*p) + : : "memory" ); From owner-p4-projects@FreeBSD.ORG Fri May 9 21:57:11 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 645D837B404; Fri, 9 May 2003 21:57:11 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0526537B401 for ; Fri, 9 May 2003 21:57:11 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9F6EA43FB1 for ; Fri, 9 May 2003 21:57:10 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4A4vA0U030047 for ; Fri, 9 May 2003 21:57:10 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4A4vARk030044 for perforce@freebsd.org; Fri, 9 May 2003 21:57:10 -0700 (PDT) Date: Fri, 9 May 2003 21:57:10 -0700 (PDT) Message-Id: <200305100457.h4A4vARk030044@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30907 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 May 2003 04:57:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=30907 Change 30907 by jmallett@jmallett_dalek on 2003/05/09 21:56:33 Use 64-bit ELF definitions for MIPS, related to how things are done on Alpha, but as we don't want the 32-bit variant we cannot share the include- need to get elf64.h not elf.h. Affected files ... .. //depot/projects/mips/gnu/usr.bin/cc/cc_tools/Makefile#5 edit Differences ... ==== //depot/projects/mips/gnu/usr.bin/cc/cc_tools/Makefile#5 (text+ko) ==== @@ -147,14 +147,13 @@ echo '#define TARGET_CPU_DEFAULT (MASK_GNU_AS|MASK_GNU_LD)' >>${.TARGET} .endif echo '#include "ansidecl.h"' >> ${.TARGET} +.if ${TARGET_ARCH} != "mips" echo '#include "${GCC_CPU}/${GCC_CPU}.h"' >> ${.TARGET} +.endif .if ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "amd64" echo '#include "${GCC_CPU}/att.h"' >> ${.TARGET} .endif -.if ${TARGET_ARCH} == "mips" - echo '#include "${GCC_CPU}/abi64.h"' >> ${.TARGET} -.endif -.if ${TARGET_ARCH} != "alpha" +.if ${TARGET_ARCH} != "alpha" && ${TARGET_ARCH} != "mips" echo '#include "dbxelf.h"' >> ${.TARGET} echo '#include "elfos.h"' >> ${.TARGET} .endif @@ -164,6 +163,9 @@ .if ${TARGET_ARCH} == "alpha" echo '#include "${GCC_CPU}/elf.h"' >> ${.TARGET} .endif +.if ${TARGET_ARCH} == "mips" + echo '#include "${GCC_CPU}/elf64.h"' >> ${.TARGET} +.endif .if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "amd64" .if exists(${GCCDIR}/config/${GCC_CPU}/sysv4.h) echo '#include "${GCC_CPU}/sysv4.h"' >> ${.TARGET} From owner-p4-projects@FreeBSD.ORG Fri May 9 22:00:17 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D99BE37B404; Fri, 9 May 2003 22:00:16 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 62E3B37B401 for ; Fri, 9 May 2003 22:00:16 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DBEC843F3F for ; Fri, 9 May 2003 22:00:14 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4A50E0U030155 for ; Fri, 9 May 2003 22:00:14 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4A50ENp030152 for perforce@freebsd.org; Fri, 9 May 2003 22:00:14 -0700 (PDT) Date: Fri, 9 May 2003 22:00:14 -0700 (PDT) Message-Id: <200305100500.h4A50ENp030152@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30908 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 May 2003 05:00:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=30908 Change 30908 by jmallett@jmallett_dalek on 2003/05/09 21:59:58 Update to a newer, better configuration: o) Trust elf64.h to give us better section stuff, which makes optimisation work. o) Turn off OBJECT_FORMAT_ COFF, "it confuses collect2" other configs say. o) Default to a GVALUE of 0 so we don't have problems relocating bigger pieces of data relative to the gp. o) Prefer DWARF2 (at least for now?) as that doesn't ICE with -gdwarf-2, unlike old -g, so better to default to it, though XXX: the elf64.h inclusion may dtrt now, so removing this needs investigated, but I am sick of 45-minute GCC builds. o) Put the CPU target defaults in the right define, and fill in MASK_GAS too. Affected files ... .. //depot/projects/mips/contrib/gcc/config/mips/freebsd.h#8 edit Differences ... ==== //depot/projects/mips/contrib/gcc/config/mips/freebsd.h#8 (text+ko) ==== @@ -65,40 +65,13 @@ /* Define the target in terms of a bitmask (see mips.h for MASK_ defns). */ #undef TARGET_ENDIAN_DEFAULT -#define TARGET_ENDIAN_DEFAULT (MASK_BIG_ENDIAN | MASK_LONG64 | MASK_64BIT) +#define TARGET_ENDIAN_DEFAULT MASK_BIG_ENDIAN -/* Define the strings to put out for each section in the object file. */ -#define SBSS_SECTION_ASM_OP "\t.section .sbss" -#define TEXT_SECTION_ASM_OP "\t.text" /* instructions */ -#define DATA_SECTION_ASM_OP "\t.data" /* large data */ -#define SDATA_SECTION_ASM_OP "\t.sdata" /* small data */ -#define RDATA_SECTION_ASM_OP "\t.rdata" /* read-only data */ +#undef TARGET_CPU_DEFAULT +#define TARGET_CPU_DEFAULT (MASK_LONG64 | MASK_64BIT | MASK_GAS) -/* A list of other sections which the compiler might be "in" at any - given time. */ -#undef EXTRA_SECTIONS -#define EXTRA_SECTIONS in_sdata, in_sbss, in_rdata -#undef READONLY_DATA_SECTION -#define SMALL_DATA_SECTION sdata_section -#define READONLY_DATA_SECTION const_section - -#undef EXTRA_SECTION_FUNCTIONS -#define EXTRA_SECTION_FUNCTIONS \ - SECTION_FUNCTION_TEMPLATE(sdata_section, in_sdata, SDATA_SECTION_ASM_OP) \ - SECTION_FUNCTION_TEMPLATE(sbss_section, in_sbss, SBSS_SECTION_ASM_OP) \ - SECTION_FUNCTION_TEMPLATE(const_section, in_rdata, RDATA_SECTION_ASM_OP) - -#define SECTION_FUNCTION_TEMPLATE(FN, ENUM, OP) \ -void FN () \ -{ \ - if (in_section != ENUM) \ - { \ - fprintf (asm_out_file, "%s\n", OP); \ - in_section = ENUM; \ - } \ -} - +/* No mips-tfile. */ #undef ASM_FINAL_SPEC /* @@ -108,3 +81,22 @@ */ #undef LOCAL_LABEL_PREFIX #define LOCAL_LABEL_PREFIX "." + +/* + * Use Dwarf2 for FreeBSD/MIPS. + */ +#define DWARF2_DEBUGGING_INFO +#define MIPS_DEBUGGING_INFO +#undef PREFERRED_DEBUGGING_TYPE +#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG + +/* + * Be explicit about the object format we don't want. + */ +#undef OBJECT_FORMAT_COFF + +/* -G is incompatible with -KPIC which is the default, so only allow objects + in the small data section if the user explicitly asks for it. */ + +#undef MIPS_DEFAULT_GVALUE +#define MIPS_DEFAULT_GVALUE 0 From owner-p4-projects@FreeBSD.ORG Fri May 9 22:14:34 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B197437B404; Fri, 9 May 2003 22:14:33 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 50C1B37B401 for ; Fri, 9 May 2003 22:14:33 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D2A9243FA3 for ; Fri, 9 May 2003 22:14:32 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4A5EW0U031631 for ; Fri, 9 May 2003 22:14:32 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4A5EWsF031628 for perforce@freebsd.org; Fri, 9 May 2003 22:14:32 -0700 (PDT) Date: Fri, 9 May 2003 22:14:32 -0700 (PDT) Message-Id: <200305100514.h4A5EWsF031628@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30909 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 May 2003 05:14:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=30909 Change 30909 by peter@peter_hammer on 2003/05/09 22:13:40 Umm, fix things to work with the system compiler.... Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/critical.c#6 edit .. //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#6 edit .. //depot/projects/hammer/sys/amd64/amd64/exception.S#4 edit .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#16 edit .. //depot/projects/hammer/sys/amd64/amd64/pmap.c#6 edit .. //depot/projects/hammer/sys/amd64/amd64/support.S#4 edit .. //depot/projects/hammer/sys/amd64/amd64/trap.c#9 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/critical.c#6 (text+ko) ==== ==== //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#6 (text+ko) ==== @@ -170,7 +170,7 @@ break; default: - printf("kldload: unexpected relocation type %d\n", + printf("kldload: unexpected relocation type %ld\n", rtype); return -1; } ==== //depot/projects/hammer/sys/amd64/amd64/exception.S#4 (text+ko) ==== @@ -199,7 +199,7 @@ * XXX The PCPU stuff is stubbed out right now... */ IDTVEC(fast_syscall) - #swapgs + /* swapgs */ movq %rsp,PCPU(SCRATCH_RSP) movq common_tss+COMMON_TSS_RSP0,%rsp /* Now emulate a trapframe. Ugh. */ @@ -255,7 +255,7 @@ movq TF_RIP(%rsp),%rcx /* original %rip */ movq TF_RSP(%rsp),%r9 /* user stack pointer */ movq %r9,%rsp /* original %rsp */ - #swapgs + /* swapgs */ sysretq 3: /* Requested full context restore, use doreti for that */ andq $~PCB_FULLCTX,PCB_FLAGS(%rax) ==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#16 (text+ko) ==== @@ -352,7 +352,7 @@ * one less debugger trap, so allowing it is fairly harmless. */ if (!EFL_SECURE(rflags & ~PSL_RF, regs->tf_rflags & ~PSL_RF)) { - printf("sigreturn: rflags = 0x%x\n", rflags); + printf("sigreturn: rflags = 0x%lx\n", rflags); return (EINVAL); } ==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#6 (text+ko) ==== @@ -1797,8 +1797,8 @@ * Page Directory table entry not valid, we need a new PT page */ if (pte == NULL) { - panic("pmap_enter: invalid page directory pdir=%#jx, va=%#x\n", - (uintmax_t)pmap->pm_pdir[PTDPTDI], va); + panic("pmap_enter: invalid page directory pdir=%#lx, va=%#lx\n", + pmap->pm_pdir[PTDPTDI], va); } pa = VM_PAGE_TO_PHYS(m) & PG_FRAME; @@ -1869,7 +1869,7 @@ err = pmap_remove_pte(pmap, pte, va); vm_page_unlock_queues(); if (err) - panic("pmap_enter: pte vanished, va: 0x%x", va); + panic("pmap_enter: pte vanished, va: 0x%lx", va); } /* @@ -2563,7 +2563,7 @@ tpte = *pte; if (tpte == 0) { - printf("TPTE at %p IS ZERO @ VA %08x\n", + printf("TPTE at %p IS ZERO @ VA %08lx\n", pte, pv->pv_va); panic("bad pte"); } ==== //depot/projects/hammer/sys/amd64/amd64/support.S#4 (text+ko) ==== @@ -366,7 +366,7 @@ cmpq %rax,%rdi /* verify address is valid */ ja fusufault -# XXX use the 64 extend +/* XXX use the 64 extend */ xorq %rax, %rax movl (%rdi),%eax movq $0,PCB_ONFAULT(%rcx) @@ -397,7 +397,7 @@ cmpq %rax,%rdi ja fusufault -# XXX use the 64 extend +/* XXX use the 64 extend */ xorq %rax, %rax movzwl (%rdi),%eax movq $0,PCB_ONFAULT(%rcx) @@ -414,7 +414,7 @@ cmpq %rax,%rdi ja fusufault -# XXX use the 64 extend +/* XXX use the 64 extend */ xorq %rax, %rax movzbl (%rdi),%eax movq $0,PCB_ONFAULT(%rcx) ==== //depot/projects/hammer/sys/amd64/amd64/trap.c#9 (text+ko) ==== @@ -555,7 +555,7 @@ frame->tf_err & PGEX_U ? "user" : "supervisor", frame->tf_err & PGEX_W ? "write" : "read", frame->tf_err & PGEX_P ? "protection violation" : "page not present", -eva, frame->tf_rip, frame->tf_rax, frame->tf_rbx, frame->tf_rcx, frame->tf_rdx, frame->tf_rsp, frame->tf_rbp, frame->tf_rsi, frame->tf_rdi); +(void *)eva, (void *)frame->tf_rip, (void *)frame->tf_rax, (void *)frame->tf_rbx, (void *)frame->tf_rcx, (void *)frame->tf_rdx, (void *)frame->tf_rsp, (void *)frame->tf_rbp, (void *)frame->tf_rsi, (void *)frame->tf_rdi); /* kludge to pass faulting virtual address to sendsig */ frame->tf_err = eva; @@ -579,13 +579,13 @@ type, trap_msg[type], ISPL(frame->tf_cs) == SEL_UPL ? "user" : "kernel"); if (type == T_PAGEFLT) { - printf("fault virtual address = 0x%x\n", eva); + printf("fault virtual address = 0x%lx\n", eva); printf("fault code = %s %s, %s\n", code & PGEX_U ? "user" : "supervisor", code & PGEX_W ? "write" : "read", code & PGEX_P ? "protection violation" : "page not present"); } - printf("instruction pointer = 0x%x:0x%x\n", + printf("instruction pointer = 0x%lx:0x%lx\n", frame->tf_cs & 0xffff, frame->tf_rip); if (ISPL(frame->tf_cs) == SEL_UPL) { ss = frame->tf_ss & 0xffff; @@ -595,8 +595,8 @@ esp = (long)&frame->tf_rsp; } printf("stack pointer = 0x%x:0x%x\n", ss, esp); - printf("frame pointer = 0x%x:0x%x\n", ss, frame->tf_rbp); - printf("code segment = base 0x%x, limit 0x%x, type 0x%x\n", + printf("frame pointer = 0x%x:0x%lx\n", ss, frame->tf_rbp); + printf("code segment = base 0x%lx, limit 0x%lx, type 0x%x\n", softseg.ssd_base, softseg.ssd_limit, softseg.ssd_type); printf(" = DPL %d, pres %d, long %d, def32 %d, gran %d\n", softseg.ssd_dpl, softseg.ssd_p, softseg.ssd_long, softseg.ssd_def32, @@ -610,7 +610,7 @@ printf("nested task, "); if (frame->tf_rflags & PSL_RF) printf("resume, "); - printf("IOPL = %d\n", (frame->tf_rflags & PSL_IOPL) >> 12); + printf("IOPL = %ld\n", (frame->tf_rflags & PSL_IOPL) >> 12); printf("current process = "); if (curproc) { printf("%lu (%s)\n", From owner-p4-projects@FreeBSD.ORG Fri May 9 22:14:35 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 21ED337B404; Fri, 9 May 2003 22:14:35 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BCAC437B401 for ; Fri, 9 May 2003 22:14:33 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 52A3343FAF for ; Fri, 9 May 2003 22:14:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4A5EX0U031637 for ; Fri, 9 May 2003 22:14:33 -0700 (PDT) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4A5EWOZ031634 for perforce@freebsd.org; Fri, 9 May 2003 22:14:32 -0700 (PDT) Date: Fri, 9 May 2003 22:14:32 -0700 (PDT) Message-Id: <200305100514.h4A5EWOZ031634@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 30910 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 May 2003 05:14:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=30910 Change 30910 by peter@peter_hammer on 2003/05/09 22:14:08 Switch to -mcmodel=kernel Affected files ... .. //depot/projects/hammer/sys/conf/kern.mk#9 edit Differences ... ==== //depot/projects/hammer/sys/conf/kern.mk#9 (text+ko) ==== @@ -57,7 +57,7 @@ # once pmap is ready. Be excessively careful to not generate FPU code. # .if ${MACHINE_ARCH} == "amd64" -CFLAGS+= -mcmodel=medium -mno-red-zone \ +CFLAGS+= -mcmodel=kernel -mno-red-zone \ -mfpmath=387 -mno-sse -mno-sse2 -mno-mmx -mno-3dnow -msoft-float .endif From owner-p4-projects@FreeBSD.ORG Fri May 9 22:27:51 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF55E37B404; Fri, 9 May 2003 22:27:50 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6CAB437B401 for ; Fri, 9 May 2003 22:27:50 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E67E143FBF for ; Fri, 9 May 2003 22:27:49 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4A5Rn0U032052 for ; Fri, 9 May 2003 22:27:49 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4A5RnCq032049 for perforce@freebsd.org; Fri, 9 May 2003 22:27:49 -0700 (PDT) Date: Fri, 9 May 2003 22:27:49 -0700 (PDT) Message-Id: <200305100527.h4A5RnCq032049@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30911 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 May 2003 05:27:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=30911 Change 30911 by marcel@marcel_nfs on 2003/05/09 22:27:32 Really fix the nat computation. There was a bug in the unwinder that confused me. While here, don't return garbage for out-of- frame registers. Complain instead... Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia64/db_interface.c#8 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia64/db_interface.c#8 (text+ko) ==== @@ -234,8 +234,8 @@ bsp = ddb_regs.tf_special.bspstore + ddb_regs.tf_special.ndirty; regno = (db_expr_t)vp->valuep - 32; - sof = ddb_regs.tf_special.cfm & 0x7f; - nats = (((sof - regno) << 3) + 62 - ((bsp >> 3) & 0x3f)) / 63; + sof = (int)(ddb_regs.tf_special.cfm & 0x7f); + nats = (sof - regno + 63 - ((int)(bsp >> 3) & 0x3f)) / 63; reg = (void*)(bsp - ((sof - regno + nats) << 3)); @@ -465,18 +465,16 @@ if (regno >= 14 && regno <= 31) return ((®s->tf_scratch.gr14)[regno - 14]); - if (regno > 0 && regno < 128) { + sof = (int)(regs->tf_special.cfm & 0x7f); + if (regno >= 32 && regno < sof + 32) { bsp = regs->tf_special.bspstore + regs->tf_special.ndirty; regno -= 32; - sof = regs->tf_special.cfm & 0x7f; - nats = (((sof - regno) << 3) + 62 - ((bsp >> 3) & 0x3f)) / 63; + nats = (sof - regno + 63 - ((int)(bsp >> 3) & 0x3f)) / 63; rsp = (void*)(bsp - ((sof - regno + nats) << 3)); - if (regno < sof) - return (*rsp); - return (0xdeadbeefdeadbeef); + return (*rsp); } - db_printf(" **** STRANGE REGISTER NUMBER %d **** ", regno + 32); + db_printf(" **** STRANGE REGISTER NUMBER %d **** ", regno); return (0); } From owner-p4-projects@FreeBSD.ORG Fri May 9 22:48:20 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D92B37B401; Fri, 9 May 2003 22:48:20 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 931) id C2A1E37B401; Fri, 9 May 2003 22:48:19 -0700 (PDT) Date: Sat, 10 May 2003 00:48:19 -0500 From: Juli Mallett To: Perforce Change Reviews Message-ID: <20030510004819.A87450@FreeBSD.org> References: <200305100454.h4A4s5eq029888@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: <200305100454.h4A4s5eq029888@repoman.freebsd.org>; from jmallett@FreeBSD.org on Fri, May 09, 2003 at 09:54:05PM -0700 X-Title: Code Maven X-Towel: Yes X-Negacore: Yes X-Authentication-Warning: localhost: juli pwned teh intarweb Subject: Re: PERFORCE change 30905 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 May 2003 05:48:21 -0000 * Juli Mallett [ Date: 2003-05-09 ] [ w.r.t. PERFORCE change 30905 for review ] > http://perforce.freebsd.org/chv.cgi?CH=30905 > > Change 30905 by jmallett@jmallett_dalek on 2003/05/09 21:54:02 > > Use an ungodly huge stack, for now, it's doing well here > and since that my random problems have gone away, but that > may be the result of other things related to mutex_init. > > Prime the GP, compiler changes going in soon need this to > produce a booting kernel. Oops, I forgot about this crud... > -ENTRY(btext) > + .globl btext > +btext: We just want to mark the beginning of the text segment, not have a full-fledged entry point, that would require an END() to shut up the assembler, and that's just stupid. > +#if 0 > + # Put thread0 onto our temporary stack. > + ld t0, pcpup > + ld t0, PC_CURTHREAD(t0) > + sd sp, TD_KSTACK(t0) > +#endif > + This was sooo not meant to be committed. Trying to just get away with using the tempstack, and I if0'd it to see if it was the cause of my mutex pain and suffering with witness. -- juli mallett. email: jmallett@freebsd.org; efnet: juli; From owner-p4-projects@FreeBSD.ORG Fri May 9 23:58:41 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B8DD637B404; Fri, 9 May 2003 23:58:40 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6AA7437B401 for ; Fri, 9 May 2003 23:58:40 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0009543FAF for ; Fri, 9 May 2003 23:58:39 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4A6wd0U036150 for ; Fri, 9 May 2003 23:58:39 -0700 (PDT) (envelope-from jmallett@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4A6wdbp036147 for perforce@freebsd.org; Fri, 9 May 2003 23:58:39 -0700 (PDT) Date: Fri, 9 May 2003 23:58:39 -0700 (PDT) Message-Id: <200305100658.h4A6wdbp036147@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jmallett@freebsd.org using -f From: Juli Mallett To: Perforce Change Reviews Subject: PERFORCE change 30912 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 May 2003 06:58:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=30912 Change 30912 by jmallett@jmallett_dalek on 2003/05/09 23:57:45 Remove code not meant for commit. Affected files ... .. //depot/projects/mips/sys/mips/mips/locore.S#7 edit Differences ... ==== //depot/projects/mips/sys/mips/mips/locore.S#7 (text+ko) ==== @@ -93,13 +93,6 @@ jal platform_start nop -#if 0 - # Put thread0 onto our temporary stack. - ld t0, pcpup - ld t0, PC_CURTHREAD(t0) - sd sp, TD_KSTACK(t0) -#endif - # Start MI things rolling. jal mi_startup nop From owner-p4-projects@FreeBSD.ORG Sat May 10 17:18:42 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5428137B404; Sat, 10 May 2003 17:18:41 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0480237B401 for ; Sat, 10 May 2003 17:18:41 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id A343043FE3 for ; Sat, 10 May 2003 17:18:40 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4B0Ie0U021941 for ; Sat, 10 May 2003 17:18:40 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4B0IeKJ021938 for perforce@freebsd.org; Sat, 10 May 2003 17:18:40 -0700 (PDT) Date: Sat, 10 May 2003 17:18:40 -0700 (PDT) Message-Id: <200305110018.h4B0IeKJ021938@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30925 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 May 2003 00:18:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=30925 Change 30925 by marcel@marcel_nfs on 2003/05/10 17:18:23 Make disabled FP traps fatal while in kernel mode. While here, fix a debug printf (s/cpu/cpup/) and compile them out by default. Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia64/trap.c#20 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia64/trap.c#20 (text+ko) ==== @@ -536,10 +536,16 @@ struct pcb *pcb; struct thread *thr; + /* Always fatal in kernel. Should never happen. */ + if (!user) + goto dopanic; + pcb = td->td_pcb; pcpu = pcb->pcb_fpcpu; +#if 0 printf("XXX: td %p: highfp on cpu %p\n", td, pcpu); +#endif /* * The pcpu variable holds the address of the per-CPU @@ -584,7 +590,9 @@ thr = PCPU_GET(fpcurthread); - printf("XXX: cpu %p: highfp belongs to td %p\n", pcpu, thr); +#if 0 + printf("XXX: cpu %p: highfp belongs to td %p\n", pcpup, thr); +#endif /* * The thr variable holds the thread that owns the high FP From owner-p4-projects@FreeBSD.ORG Sat May 10 17:20:45 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 841B637B404; Sat, 10 May 2003 17:20:44 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 24F7737B401 for ; Sat, 10 May 2003 17:20:44 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C3A1B43FBD for ; Sat, 10 May 2003 17:20:43 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4B0Kh0U022077 for ; Sat, 10 May 2003 17:20:43 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4B0Khhv022074 for perforce@freebsd.org; Sat, 10 May 2003 17:20:43 -0700 (PDT) Date: Sat, 10 May 2003 17:20:43 -0700 (PDT) Message-Id: <200305110020.h4B0Khhv022074@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30926 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 May 2003 00:20:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=30926 Change 30926 by marcel@marcel_nfs on 2003/05/10 17:19:44 Access to the high FP registers are disabled while in kernel mode. We need to enable them prior to saving/restoring and disable them again when we're done. Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia64/context.s#16 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia64/context.s#16 (text+ko) ==== @@ -499,6 +499,9 @@ * save_high_fp(struct _high_fp *) */ ENTRY(save_high_fp, 1) + rsm psr.dfh + ;; + srlz.d add r31=16,r32 stf.spill [r32]=f32,32 ;; @@ -644,6 +647,9 @@ stf.spill [r32]=f126 ;; stf.spill [r31]=f127 + ssm psr.dfh + ;; + srlz.d br.ret.sptk rp ;; END(save_high_fp) @@ -652,6 +658,9 @@ * restore_high_fp(struct _high_fp *) */ ENTRY(restore_high_fp, 1) + rsm psr.dfh + ;; + srlz.d add r31=16,r32 ldf.fill f32=[r32],32 ;; @@ -797,6 +806,9 @@ ldf.fill f126=[r32] ;; ldf.fill f127=[r31] + ssm psr.dfh + ;; + srlz.d br.ret.sptk rp ;; END(restore_high_fp) From owner-p4-projects@FreeBSD.ORG Sat May 10 17:22:48 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A09DD37B404; Sat, 10 May 2003 17:22:47 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 405A737B401 for ; Sat, 10 May 2003 17:22:47 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id E0CD043FAF for ; Sat, 10 May 2003 17:22:46 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4B0Mk0U022124 for ; Sat, 10 May 2003 17:22:46 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4B0MkPi022121 for perforce@freebsd.org; Sat, 10 May 2003 17:22:46 -0700 (PDT) Date: Sat, 10 May 2003 17:22:46 -0700 (PDT) Message-Id: <200305110022.h4B0MkPi022121@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30927 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 May 2003 00:22:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=30927 Change 30927 by marcel@marcel_nfs on 2003/05/10 17:21:54 Do not forcibly disable the high FP registers. We may be returning from a disabled FP trap and need them enabled. Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia64/exception.s#19 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia64/exception.s#19 (text+ko) ==== @@ -508,11 +508,11 @@ (p14) br.cond.sptk 1f ;; } -{ .mii +{ .mib // Switch register stack alloc r30=ar.pfs,0,0,0,0 // discard current frame shl r31=r25,16 // value for ar.rsc - dep r24=-1,r24,19,1 // XXX disable high FP. + nop 0 ;; } // The loadrs can fault if the backing store is not currently From owner-p4-projects@FreeBSD.ORG Sat May 10 17:25:52 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 08BED37B401; Sat, 10 May 2003 17:25:52 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9D6D137B405 for ; Sat, 10 May 2003 17:25:51 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4447843FDF for ; Sat, 10 May 2003 17:25:51 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4B0Pp0U022284 for ; Sat, 10 May 2003 17:25:51 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4B0PooJ022281 for perforce@freebsd.org; Sat, 10 May 2003 17:25:50 -0700 (PDT) Date: Sat, 10 May 2003 17:25:50 -0700 (PDT) Message-Id: <200305110025.h4B0PooJ022281@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30928 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 May 2003 00:25:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=30928 Change 30928 by marcel@marcel_nfs on 2003/05/10 17:24:54 Use bcopy and copyin/copyout to read and write bytes. This avoids a page fault caused by the debugger trying to read or write from/to a bogus address. Keep the jmp_buf for now. Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia64/db_interface.c#9 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia64/db_interface.c#9 (text+ko) ==== @@ -403,13 +403,13 @@ register size_t size; register char *data; { - register char *src; db_nofault = &db_jmpbuf; - src = (char *)addr; - while (size-- > 0) - *data++ = *src++; + if (addr < VM_MAX_ADDRESS) + copyin((char *)addr, data, size); + else + bcopy((char *)addr, data, size); db_nofault = 0; } @@ -423,13 +423,13 @@ register size_t size; register char *data; { - register char *dst; db_nofault = &db_jmpbuf; - dst = (char *)addr; - while (size-- > 0) - *dst++ = *data++; + if (addr < VM_MAX_ADDRESS) + copyout(data, (char *)addr, size); + else + bcopy(data, (char *)addr, size); db_nofault = 0; } From owner-p4-projects@FreeBSD.ORG Sat May 10 17:35:04 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E489037B404; Sat, 10 May 2003 17:35:03 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8075D37B401 for ; Sat, 10 May 2003 17:35:03 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1A9ED43FBD for ; Sat, 10 May 2003 17:35:03 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4B0Z20U022678 for ; Sat, 10 May 2003 17:35:02 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4B0Z2B7022675 for perforce@freebsd.org; Sat, 10 May 2003 17:35:02 -0700 (PDT) Date: Sat, 10 May 2003 17:35:02 -0700 (PDT) Message-Id: <200305110035.h4B0Z2B7022675@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30929 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 May 2003 00:35:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=30929 Change 30929 by marcel@marcel_nfs on 2003/05/10 17:34:36 Get ia32 emulation from the ground again. This currently only works for the break-based syscall path. The EPC-based syscall path needs explicit support. Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia32/ia32_sysvec.c#5 edit .. //depot/projects/ia64_epc/sys/ia64/ia32/ia32_util.h#2 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia32/ia32_sysvec.c#5 (text+ko) ==== @@ -86,9 +86,9 @@ 0x50, /* pushl %eax */ 0xcd, 0x80, /* int $0x80 */ 0xeb, 0xfe, /* 0: jmp 0b */ - 0, 0, 0, 0 + 0 }; -static int ia32_szsigcode = sizeof(ia32_sigcode) & ~3; +static int ia32_szsigcode = sizeof(ia32_sigcode); struct sysentvec ia32_freebsd_sysvec = { SYS_MAXSYSCALL, @@ -107,8 +107,8 @@ "FreeBSD ELF", elf32_coredump, NULL, - MINSIGSTKSZ, - 4096, + IA32_MINSIGSTKSZ, + IA32_PAGE_SIZE, 0, IA32_USRSTACK, IA32_USRSTACK, @@ -147,8 +147,8 @@ */ arginfo = (struct ia32_ps_strings *)IA32_PS_STRINGS; szsigcode = *(imgp->proc->p_sysent->sv_szsigcode); - destp = (caddr_t)arginfo - szsigcode - SPARE_USRSPACE - - roundup((ARG_MAX - imgp->stringspace), sizeof(char *)); + destp = (caddr_t)arginfo - szsigcode - IA32_USRSPACE - + roundup((ARG_MAX - imgp->stringspace), sizeof(char *)); /* * install sigcode @@ -187,6 +187,7 @@ /* * vectp also becomes our initial stack base */ + vectp = (void*)((uintptr_t)vectp & ~15); stack_base = vectp; stringp = imgp->stringbase; @@ -246,14 +247,21 @@ struct segment_descriptor desc; struct vmspace *vmspace = td->td_proc->p_vmspace; + /* + * Pretend we entered the kernel due to an exception so that the + * trapframe gets initialized for exit through exception_restore. + */ + frame->tf_flags = 0; + exec_setregs(td, entry, stack, ps_strings); /* - * Mark this process as using the ia32 instruction set and - * enable the high FP registers by default. + * Adjust the trapframe according to the ia32 runtime. */ frame->tf_special.psr |= IA64_PSR_IS; - frame->tf_special.psr &= ~IA64_PSR_DFH; + frame->tf_special.sp = stack; + frame->tf_special.bspstore = (IA32_PS_STRINGS - ia32_szsigcode - + IA32_USRSPACE + 15) & ~15; codesel = LSEL(LUCODE_SEL, SEL_UPL); datasel = LSEL(LUDATA_SEL, SEL_UPL); @@ -268,10 +276,9 @@ * Build the GDT and LDT. */ gdt = IA32_USRSTACK; - vm_map_find(&vmspace->vm_map, 0, 0, - &gdt, PAGE_SIZE, 0, - VM_PROT_ALL, VM_PROT_ALL, 0); - ldt = gdt + 4096; + vm_map_find(&vmspace->vm_map, 0, 0, &gdt, IA32_PAGE_SIZE << 1, 0, + VM_PROT_ALL, VM_PROT_ALL, 0); + ldt = gdt + IA32_PAGE_SIZE; desc.sd_lolimit = 8*NLDT-1; desc.sd_lobase = ldt & 0xffffff; ==== //depot/projects/ia64_epc/sys/ia64/ia32/ia32_util.h#2 (text+ko) ==== @@ -44,8 +44,11 @@ int ps_nenvstr; /* the number of environment strings */ }; -#define IA32_USRSTACK (4L*1024*1024*1024 - PAGE_SIZE) -#define IA32_PS_STRINGS (IA32_USRSTACK - sizeof(struct ia32_ps_strings)) +#define IA32_MINSIGSTKSZ 2048 +#define IA32_PAGE_SIZE 4096 +#define IA32_USRSTACK (2L*1024*1024*1024 - IA32_PAGE_SIZE*2) +#define IA32_PS_STRINGS (IA32_USRSTACK - sizeof(struct ia32_ps_strings)) +#define IA32_USRSPACE IA32_PAGE_SIZE static __inline caddr_t stackgap_init(void); static __inline void *stackgap_alloc(caddr_t *, size_t); @@ -54,7 +57,7 @@ stackgap_init() { #define szsigcode (*(curproc->p_sysent->sv_szsigcode)) - return (caddr_t)(((caddr_t)IA32_PS_STRINGS) - szsigcode - SPARE_USRSPACE); + return (((caddr_t)IA32_PS_STRINGS) - szsigcode - IA32_USRSPACE); #undef szsigcode } From owner-p4-projects@FreeBSD.ORG Sat May 10 23:49:43 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AE4937B404; Sat, 10 May 2003 23:49:42 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2BED037B401 for ; Sat, 10 May 2003 23:49:42 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id C7A9A43FBF for ; Sat, 10 May 2003 23:49:41 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4B6nf0U047601 for ; Sat, 10 May 2003 23:49:41 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4B6nfIP047598 for perforce@freebsd.org; Sat, 10 May 2003 23:49:41 -0700 (PDT) Date: Sat, 10 May 2003 23:49:41 -0700 (PDT) Message-Id: <200305110649.h4B6nfIP047598@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30939 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 May 2003 06:49:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=30939 Change 30939 by marcel@marcel_nfs on 2003/05/10 23:48:58 Add support for swithing to ia32. We need to restore the scratch registers as they hold the ia32 state and jump to userland not with a regular branch, but with br.ia. That's about it here... Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia64/syscall.s#18 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia64/syscall.s#18 (text+ko) ==== @@ -92,6 +92,13 @@ br.sptk b6 ;; } +gw_ret_ia32: + mov ar.rnat=r0 + mov ar.rsc=0xc + mov ar.pfs=r0 + ;; + br.ia.sptk b6 + ;; ENTRY(break_sigtramp, 0) { .mib @@ -432,10 +439,10 @@ mov ar.pfs=r20 ;; } -{ .mmb +{ .mmi ld8 gp=[r15],16 // gp ld8 r27=[r14],16 // ndirty - nop 0 + tbit.z p14,p15=r26,34 // p14=ia64, p15=ia32 ;; } { .mmi @@ -450,10 +457,10 @@ nop 0 ;; } -{ .mmi - ld8 r9=[r14] // r9 - ld8 r10=[r15] // r10 - dep r26=-1,r26,19,1 // Set psr.dfh +{ .mmb + ld8 r9=[r14],40 // r9 + ld8 r10=[r15],40 // r10 +(p15) br.spnt epc_syscall_setup_ia32 ;; } { .mmi @@ -487,4 +494,64 @@ br.ret.sptk b7 ;; } +epc_syscall_setup_ia32: +{ .mmi + loadrs + mov ar.k7=r31 + mov sp=r16 + ;; +} +{ .mmi + mov r30=ar.bspstore + ;; + mov ar.bspstore=r21 + dep r30=0,r30,0,9 + ;; +} +{ .mmi + mov ar.k6=r30 + mov ar.unat=r17 + mov r11=r26 + ;; +} + + ld8 r16=[r14],16 + ld8 r17=[r15],16 + ;; + ld8 r18=[r14],16 + ld8 r19=[r15],16 + ;; + ld8 r20=[r14],16 + ld8 r21=[r15],16 + ;; + ld8 r22=[r14],16 + ld8 r23=[r15],16 + ;; + ld8 r24=[r14],16 + ld8 r25=[r15],16 + ;; + ld8 r26=[r14],16 + ld8 r27=[r15],16 + ;; + ld8 r28=[r14],16 + ld8 r29=[r15],16 + ;; + ld8 r30=[r14],40 + ld8 r31=[r15],40 + ;; + ld8 r2=[r14],16 + ld8 r3=[r15],8 + ;; + mov ar.csd=r2 + mov ar.ssd=r3 + ;; + mov r2=ar.k5 + mov psr.l=r11 + ;; + srlz.d + add r2=gw_ret_ia32-ia64_gateway_page,r2 + ;; + mov b7=r2 + br.ret.sptk b7 + ;; END(epc_syscall) From owner-p4-projects@FreeBSD.ORG Sat May 10 23:55:51 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C51FC37B404; Sat, 10 May 2003 23:55:50 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4127F37B401 for ; Sat, 10 May 2003 23:55:50 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D026843FE0 for ; Sat, 10 May 2003 23:55:49 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h4B6tn0U047888 for ; Sat, 10 May 2003 23:55:49 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4B6tnO5047885 for perforce@freebsd.org; Sat, 10 May 2003 23:55:49 -0700 (PDT) Date: Sat, 10 May 2003 23:55:49 -0700 (PDT) Message-Id: <200305110655.h4B6tnO5047885@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 30940 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 May 2003 06:55:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=30940 Change 30940 by marcel@marcel_nfs on 2003/05/10 23:55:30 o Do not clear the frame flag as it results in an improper trapframe for returning through EPC. o Clear the scratch registers manually and make sure ndirty is 0. o While here, make the diff unreadably by s/frame/tf/ for consistency. Affected files ... .. //depot/projects/ia64_epc/sys/ia64/ia32/ia32_sysvec.c#6 edit Differences ... ==== //depot/projects/ia64_epc/sys/ia64/ia32/ia32_sysvec.c#6 (text+ko) ==== @@ -240,27 +240,27 @@ static void ia32_setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings) { - struct trapframe *frame = td->td_frame; + struct trapframe *tf = td->td_frame; vm_offset_t gdt, ldt; u_int64_t codesel, datasel, ldtsel; u_int64_t codeseg, dataseg, gdtseg, ldtseg; struct segment_descriptor desc; struct vmspace *vmspace = td->td_proc->p_vmspace; - /* - * Pretend we entered the kernel due to an exception so that the - * trapframe gets initialized for exit through exception_restore. - */ - frame->tf_flags = 0; + exec_setregs(td, entry, stack, ps_strings); + + /* Non-syscall frames are cleared by exec_setregs() */ + if (tf->tf_flags & FRAME_SYSCALL) { + bzero(&tf->tf_scratch, sizeof(tf->tf_scratch)); + bzero(&tf->tf_scratch_fp, sizeof(tf->tf_scratch_fp)); + } else + tf->tf_special.ndirty = 0; - exec_setregs(td, entry, stack, ps_strings); + tf->tf_special.psr |= IA64_PSR_IS; + tf->tf_special.sp = stack; - /* - * Adjust the trapframe according to the ia32 runtime. - */ - frame->tf_special.psr |= IA64_PSR_IS; - frame->tf_special.sp = stack; - frame->tf_special.bspstore = (IA32_PS_STRINGS - ia32_szsigcode - + /* Point the RSE backstore to something harmless. */ + tf->tf_special.bspstore = (IA32_PS_STRINGS - ia32_szsigcode - IA32_USRSPACE + 15) & ~15; codesel = LSEL(LUCODE_SEL, SEL_UPL); @@ -268,9 +268,9 @@ ldtsel = GSEL(GLDT_SEL, SEL_UPL); /* Setup ia32 segment registers. */ - frame->tf_scratch.gr16 = (datasel << 48) | (datasel << 32) | + tf->tf_scratch.gr16 = (datasel << 48) | (datasel << 32) | (datasel << 16) | datasel; - frame->tf_scratch.gr17 = (ldtsel << 32) | (datasel << 16) | codesel; + tf->tf_scratch.gr17 = (ldtsel << 32) | (datasel << 16) | codesel; /* * Build the GDT and LDT. @@ -319,12 +319,12 @@ + (1L << 62) /* 32 bits */ + (1L << 63); /* page granularity */ - frame->tf_scratch.csd = codeseg; - frame->tf_scratch.ssd = dataseg; - frame->tf_scratch.gr24 = dataseg; /* ESD */ - frame->tf_scratch.gr27 = dataseg; /* DSD */ - frame->tf_scratch.gr28 = dataseg; /* FSD */ - frame->tf_scratch.gr29 = dataseg; /* GSD */ + tf->tf_scratch.csd = codeseg; + tf->tf_scratch.ssd = dataseg; + tf->tf_scratch.gr24 = dataseg; /* ESD */ + tf->tf_scratch.gr27 = dataseg; /* DSD */ + tf->tf_scratch.gr28 = dataseg; /* FSD */ + tf->tf_scratch.gr29 = dataseg; /* GSD */ gdtseg = gdt /* base */ + ((8L*NGDT - 1) << 32) /* limit */ @@ -341,15 +341,15 @@ + (0L << 62) /* 16 bits */ + (0L << 63); /* byte granularity */ - frame->tf_scratch.gr30 = ldtseg; /* LDTD */ - frame->tf_scratch.gr31 = gdtseg; /* GDTD */ + tf->tf_scratch.gr30 = ldtseg; /* LDTD */ + tf->tf_scratch.gr31 = gdtseg; /* GDTD */ /* Set ia32 control registers on this processor. */ ia64_set_cflg(CR0_PE | CR0_PG | ((long)(CR4_XMM | CR4_FXSR) << 32)); ia64_set_eflag(PSL_USER); /* PS_STRINGS value for BSD/OS binaries. It is 0 for non-BSD/OS. */ - frame->tf_scratch.gr11 = IA32_PS_STRINGS; + tf->tf_scratch.gr11 = IA32_PS_STRINGS; /* * XXX - Linux emulator