Date: Tue, 9 Apr 2002 15:56:37 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 9474 for review Message-ID: <200204092256.g39Mubf68197@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9474 Change 9474 by peter@peter_daintree on 2002/04/09 15:56:07 IFC @9473 - including trying to deal with obrien's NIH gcc ifdefs. It's probably still hosed. :-( Affected files ... ... //depot/projects/ia64/bin/Makefile#3 integrate ... //depot/projects/ia64/contrib/sendmail/FREEBSD-upgrade#5 integrate ... //depot/projects/ia64/gnu/lib/Makefile#4 integrate ... //depot/projects/ia64/gnu/lib/libreadline/readline/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/Makefile#7 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc1/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc1obj/Makefile#4 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cc1plus/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/cccp/Makefile#2 integrate ... //depot/projects/ia64/gnu/usr.bin/cc/collect2/Makefile#3 integrate ... //depot/projects/ia64/gnu/usr.bin/sort/sort.c#4 integrate ... //depot/projects/ia64/lib/csu/sparc64/Makefile#4 integrate ... //depot/projects/ia64/lib/libc/gen/getobjformat.c#3 integrate ... //depot/projects/ia64/lib/libc/gen/strtofflags.c#3 integrate ... //depot/projects/ia64/lib/libc/sparc64/fpu/fpu.c#4 integrate ... //depot/projects/ia64/lib/libc_r/uthread/uthread_select.c#2 integrate ... //depot/projects/ia64/lib/libcrypt/crypt.3#3 integrate ... //depot/projects/ia64/lib/libedit/Makefile#2 integrate ... //depot/projects/ia64/lib/libstand/Makefile#6 integrate ... //depot/projects/ia64/libexec/lukemftpd/Makefile#4 integrate ... //depot/projects/ia64/libexec/tftpd/tftpd.c#4 integrate ... //depot/projects/ia64/release/Makefile#8 integrate ... //depot/projects/ia64/sbin/Makefile#8 integrate ... //depot/projects/ia64/sbin/dumpon/dumpon.8#3 integrate ... //depot/projects/ia64/sbin/dumpon/dumpon.c#5 integrate ... //depot/projects/ia64/sbin/kget/Makefile#3 delete ... //depot/projects/ia64/sbin/kget/kget.8#2 delete ... //depot/projects/ia64/sbin/kget/kget.c#2 delete ... //depot/projects/ia64/share/examples/etc/make.conf#6 integrate ... //depot/projects/ia64/share/man/man4/Makefile#7 integrate ... //depot/projects/ia64/share/man/man4/ip.4#2 integrate ... //depot/projects/ia64/share/man/man4/ng_etf.4#3 integrate ... //depot/projects/ia64/share/man/man7/hier.7#7 integrate ... //depot/projects/ia64/share/man/man8/intro.8#2 integrate ... //depot/projects/ia64/share/mk/bsd.libnames.mk#4 integrate ... //depot/projects/ia64/share/syscons/keymaps/uk.iso.kbd#2 integrate ... //depot/projects/ia64/sys/alpha/alpha/machdep.c#11 integrate ... //depot/projects/ia64/sys/boot/common/interp_forth.c#4 integrate ... //depot/projects/ia64/sys/boot/common/load_elf.c#5 integrate ... //depot/projects/ia64/sys/boot/ficl/Makefile#2 integrate ... //depot/projects/ia64/sys/boot/ficl/alpha/sysdep.h#2 integrate ... //depot/projects/ia64/sys/boot/ficl/dict.c#2 integrate ... //depot/projects/ia64/sys/boot/ficl/ficl.c#2 integrate ... //depot/projects/ia64/sys/boot/ficl/ficl.h#2 integrate ... //depot/projects/ia64/sys/boot/ficl/fileaccess.c#1 branch ... //depot/projects/ia64/sys/boot/ficl/float.c#1 branch ... //depot/projects/ia64/sys/boot/ficl/i386/sysdep.h#2 integrate ... //depot/projects/ia64/sys/boot/ficl/ia64/sysdep.h#2 integrate ... //depot/projects/ia64/sys/boot/ficl/loader.c#3 integrate ... //depot/projects/ia64/sys/boot/ficl/math64.c#2 integrate ... //depot/projects/ia64/sys/boot/ficl/math64.h#2 integrate ... //depot/projects/ia64/sys/boot/ficl/prefix.c#2 integrate ... //depot/projects/ia64/sys/boot/ficl/search.c#2 integrate ... //depot/projects/ia64/sys/boot/ficl/softwords/ficlclass.fr#1 branch ... //depot/projects/ia64/sys/boot/ficl/softwords/fileaccess.fr#1 branch ... //depot/projects/ia64/sys/boot/ficl/softwords/forml.fr#1 branch ... //depot/projects/ia64/sys/boot/ficl/softwords/ifbrack.fr#2 integrate ... //depot/projects/ia64/sys/boot/ficl/softwords/marker.fr#2 integrate ... //depot/projects/ia64/sys/boot/ficl/softwords/oo.fr#2 integrate ... //depot/projects/ia64/sys/boot/ficl/softwords/prefix.fr#2 integrate ... //depot/projects/ia64/sys/boot/ficl/softwords/softcore.fr#2 integrate ... //depot/projects/ia64/sys/boot/ficl/stack.c#2 integrate ... //depot/projects/ia64/sys/boot/ficl/testmain.c#2 integrate ... //depot/projects/ia64/sys/boot/ficl/tools.c#2 integrate ... //depot/projects/ia64/sys/boot/ficl/vm.c#2 integrate ... //depot/projects/ia64/sys/boot/ficl/words.c#2 integrate ... //depot/projects/ia64/sys/compat/linprocfs/linprocfs.c#6 integrate ... //depot/projects/ia64/sys/compat/pecoff/imgact_pecoff.c#4 integrate ... //depot/projects/ia64/sys/conf/NOTES#3 integrate ... //depot/projects/ia64/sys/conf/files#14 integrate ... //depot/projects/ia64/sys/conf/majors#4 integrate ... //depot/projects/ia64/sys/conf/options#9 integrate ... //depot/projects/ia64/sys/dev/eisa/eisaconf.c#2 integrate ... //depot/projects/ia64/sys/dev/fb/vga.c#2 integrate ... //depot/projects/ia64/sys/dev/kbd/atkbd.c#2 integrate ... //depot/projects/ia64/sys/dev/null/null.c#4 integrate ... //depot/projects/ia64/sys/dev/se/se_console.c#1 branch ... //depot/projects/ia64/sys/dev/se/sereg.h#1 branch ... //depot/projects/ia64/sys/dev/usb/usb.c#6 integrate ... //depot/projects/ia64/sys/geom/geom.h#5 integrate ... //depot/projects/ia64/sys/geom/geom_bsd.c#6 integrate ... //depot/projects/ia64/sys/geom/geom_dev.c#8 integrate ... //depot/projects/ia64/sys/geom/geom_disk.c#7 integrate ... //depot/projects/ia64/sys/geom/geom_io.c#4 integrate ... //depot/projects/ia64/sys/geom/geom_mbr.c#5 integrate ... //depot/projects/ia64/sys/geom/geom_pc98.c#3 integrate ... //depot/projects/ia64/sys/geom/geom_slice.c#7 integrate ... //depot/projects/ia64/sys/geom/geom_slice.h#4 integrate ... //depot/projects/ia64/sys/geom/geom_subr.c#5 integrate ... //depot/projects/ia64/sys/geom/geom_sunlabel.c#5 integrate ... //depot/projects/ia64/sys/i386/conf/GENERIC#8 integrate ... //depot/projects/ia64/sys/i386/conf/NEWCARD#5 integrate ... //depot/projects/ia64/sys/i386/conf/NOTES#13 integrate ... //depot/projects/ia64/sys/i386/i386/machdep.c#14 integrate ... //depot/projects/ia64/sys/i386/include/md_var.h#5 integrate ... //depot/projects/ia64/sys/i386/include/uc_device.h#2 delete ... //depot/projects/ia64/sys/i386/isa/isa_device.h#2 integrate ... //depot/projects/ia64/sys/i386/isa/pcvt/pcvt_drv.c#3 integrate ... //depot/projects/ia64/sys/ia64/ia64/machdep.c#23 integrate ... //depot/projects/ia64/sys/ia64/ia64/ssc.c#4 integrate ... //depot/projects/ia64/sys/ia64/include/ia64_cpu.h#3 integrate ... //depot/projects/ia64/sys/isa/pnpreg.h#2 integrate ... //depot/projects/ia64/sys/kern/imgact_aout.c#4 integrate ... //depot/projects/ia64/sys/kern/kern_acct.c#5 integrate ... //depot/projects/ia64/sys/kern/kern_exit.c#8 integrate ... //depot/projects/ia64/sys/kern/kern_fork.c#8 integrate ... //depot/projects/ia64/sys/kern/kern_intr.c#7 integrate ... //depot/projects/ia64/sys/kern/kern_proc.c#10 integrate ... //depot/projects/ia64/sys/kern/subr_disk.c#6 integrate ... //depot/projects/ia64/sys/kern/sys_process.c#5 integrate ... //depot/projects/ia64/sys/kern/vfs_cache.c#6 integrate ... //depot/projects/ia64/sys/kern/vfs_syscalls.c#13 integrate ... //depot/projects/ia64/sys/kern/vfs_vnops.c#10 integrate ... //depot/projects/ia64/sys/netinet/in.h#7 integrate ... //depot/projects/ia64/sys/netinet/in_pcb.c#12 integrate ... //depot/projects/ia64/sys/netinet/in_pcb.h#8 integrate ... //depot/projects/ia64/sys/netinet/ip_divert.c#7 integrate ... //depot/projects/ia64/sys/pc98/conf/GENERIC#8 integrate ... //depot/projects/ia64/sys/pc98/i386/machdep.c#12 integrate ... //depot/projects/ia64/sys/powerpc/powerpc/machdep.c#9 integrate ... //depot/projects/ia64/sys/sparc64/conf/GENERIC#7 integrate ... //depot/projects/ia64/sys/sparc64/include/emul.h#1 branch ... //depot/projects/ia64/sys/sparc64/include/frame.h#5 integrate ... //depot/projects/ia64/sys/sparc64/include/reg.h#4 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/db_trace.c#5 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/emul.c#3 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#11 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/trap.c#7 integrate ... //depot/projects/ia64/sys/sparc64/sparc64/vm_machdep.c#5 integrate ... //depot/projects/ia64/sys/sys/bio.h#7 integrate ... //depot/projects/ia64/sys/sys/disk.h#6 integrate ... //depot/projects/ia64/sys/sys/ioccom.h#4 integrate ... //depot/projects/ia64/sys/vm/uma_int.h#5 integrate ... //depot/projects/ia64/usr.bin/Makefile#16 integrate ... //depot/projects/ia64/usr.bin/awk/Makefile#4 integrate ... //depot/projects/ia64/usr.bin/colldef/parse.y#4 integrate ... //depot/projects/ia64/usr.bin/colldef/scan.l#4 integrate ... //depot/projects/ia64/usr.bin/compress/compress.1#2 integrate ... //depot/projects/ia64/usr.bin/sort/Makefile#3 delete ... //depot/projects/ia64/usr.bin/vmstat/vmstat.c#6 integrate ... //depot/projects/ia64/usr.bin/xinstall/xinstall.c#6 integrate ... //depot/projects/ia64/usr.bin/yacc/closure.c#5 integrate ... //depot/projects/ia64/usr.bin/yacc/error.c#7 integrate ... //depot/projects/ia64/usr.bin/yacc/lalr.c#5 integrate ... //depot/projects/ia64/usr.bin/yacc/lr0.c#5 integrate ... //depot/projects/ia64/usr.bin/yacc/main.c#6 integrate ... //depot/projects/ia64/usr.bin/yacc/mkpar.c#7 integrate ... //depot/projects/ia64/usr.bin/yacc/output.c#6 integrate ... //depot/projects/ia64/usr.bin/yacc/reader.c#6 integrate ... //depot/projects/ia64/usr.bin/yacc/skeleton.c#4 integrate ... //depot/projects/ia64/usr.bin/yacc/symtab.c#5 integrate ... //depot/projects/ia64/usr.bin/yacc/verbose.c#6 integrate ... //depot/projects/ia64/usr.bin/yacc/warshall.c#5 integrate ... //depot/projects/ia64/usr.sbin/Makefile#11 integrate ... //depot/projects/ia64/usr.sbin/chown/chown.8#2 integrate ... //depot/projects/ia64/usr.sbin/timed/timed/timed.8#2 integrate ... //depot/projects/ia64/usr.sbin/wicontrol/wicontrol.8#2 integrate Differences ... ==== //depot/projects/ia64/bin/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/Makefile,v 1.19 2002/02/11 18:38:54 mike Exp $ +# $FreeBSD: src/bin/Makefile,v 1.20 2002/04/09 18:25:37 bmilekic Exp $ SUBDIR= cat \ chio \ @@ -22,7 +22,6 @@ pax \ ps \ pwd \ - rcp \ realpath \ rm \ rmdir \ @@ -33,6 +32,10 @@ sync \ test +.if !defined(NO_RCMNDS) +SUBDIR+=rcp +.endif + .if !defined(NO_TCSH) SUBDIR+=csh .endif ==== //depot/projects/ia64/contrib/sendmail/FREEBSD-upgrade#5 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.11 2002/04/06 17:53:06 gshapiro Exp $ +$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.12 2002/04/09 02:09:14 gshapiro Exp $ sendmail 8.12.2 originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/ @@ -51,6 +51,8 @@ etc/mtree/BSD.include.dist etc/mtree/BSD.usr.dist etc/mtree/BSD.var.dist + etc/periodic/daily/440.status-mailq + etc/periodic/daily/500.queuerun etc/rc etc/sendmail/Makefile etc/sendmail/freebsd.mc ==== //depot/projects/ia64/gnu/lib/Makefile#4 (text+ko) ==== @@ -1,9 +1,14 @@ -# $FreeBSD: src/gnu/lib/Makefile,v 1.33 2002/01/07 19:27:50 jhb Exp $ +# $FreeBSD: src/gnu/lib/Makefile,v 1.35 2002/04/08 22:56:28 peter Exp $ -SUBDIR= libdialog libregex libreadline +.if !defined(NO_GCC) && ${MACHINE_ARCH} != "ia64" && ${MACHINE_ARCH} != "sparc64" +SUBDIR+= csu libgcc +.else +NO_CXX= yes +NO_OBJC=yes +NO_FORTRAN=yes +.endif -.if !defined(NO_GCC) -SUBDIR+= csu libgcc +SUBDIR+= libdialog libregex libreadline .if ${OBJFORMAT} == aout .if !defined(NOLIBC_R) ==== //depot/projects/ia64/gnu/lib/libreadline/readline/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libreadline/readline/Makefile,v 1.8 2001/04/21 22:05:33 ache Exp $ +# $FreeBSD: src/gnu/lib/libreadline/readline/Makefile,v 1.9 2002/04/09 13:02:26 ru Exp $ SUBDIR= doc @@ -14,8 +14,8 @@ INSTALLED_HEADERS= readline.h chardefs.h keymaps.h history.h tilde.h \ rlstdc.h rlconf.h rltypedefs.h -DPADD+= $(LIBTERMCAP) -LDADD+= -ltermcap +DPADD= ${LIBNCURSES} +LDADD= -lncurses INCDIR= /usr/include/readline ==== //depot/projects/ia64/gnu/usr.bin/Makefile#7 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.58 2002/03/24 16:01:17 markm Exp $ +# $FreeBSD: src/gnu/usr.bin/Makefile,v 1.61 2002/04/08 22:58:52 peter Exp $ -SUBDIR= awk bc cpio dc dialog diff diff3 gperf \ - grep groff gzip man patch ptx rcs sdiff send-pr tar texinfo +SUBDIR= awk bc cpio dc dialog diff diff3 \ + grep gzip man patch ptx rcs sdiff send-pr sort tar texinfo .if !defined(NO_BINUTILS) SUBDIR+=binutils @@ -21,6 +21,14 @@ .endif .endif +.if !defined(NO_GCC) && ${MACHINE_ARCH} != "ia64" && ${MACHINE_ARCH} != "sparc64" +SUBDIR+=cc +.endif + +.if !defined(NO_CXX) +SUBDIR+=gperf groff +.endif + .if !defined(NOPERL) && !defined(NO_PERL) && exists(${.CURDIR}/perl) SUBDIR+=perl .endif ==== //depot/projects/ia64/gnu/usr.bin/cc/cc/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cc/Makefile,v 1.24 2001/03/27 14:58:37 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cc/Makefile,v 1.25 2002/04/08 18:48:37 obrien Exp $ .include "../Makefile.inc" @@ -7,7 +7,7 @@ PROG= cc MAN= gcc.1 SRCS= gcc.c gccspec.c -NOSHARED?=yes +NOSHARED=yes LINKS= ${BINDIR}/cc ${BINDIR}/gcc MLINKS= gcc.1 cc.1 gcc.1 c++.1 gcc.1 g++.1 gcc.1 CC.1 ==== //depot/projects/ia64/gnu/usr.bin/cc/cc1/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cc1/Makefile,v 1.23 2002/04/04 19:26:12 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cc1/Makefile,v 1.24 2002/04/08 18:48:37 obrien Exp $ .include "../Makefile.inc" @@ -10,7 +10,7 @@ SRCS+= c-decl.c c-lex.c BINDIR= /usr/libexec NOMAN= 1 -NOSHARED?=yes +NOSHARED=yes CFLAGS+= -I. ==== //depot/projects/ia64/gnu/usr.bin/cc/cc1obj/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cc1obj/Makefile,v 1.17 2002/04/04 19:26:13 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cc1obj/Makefile,v 1.18 2002/04/08 18:48:38 obrien Exp $ .include "../Makefile.inc" @@ -10,7 +10,7 @@ SRCS+= c-decl.c c-lex.c BINDIR= /usr/libexec NOMAN= 1 -NOSHARED?=yes +NOSHARED=yes CFLAGS+= -I${GCCDIR}/objc -I. ==== //depot/projects/ia64/gnu/usr.bin/cc/cc1plus/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cc1plus/Makefile,v 1.24 2002/04/04 00:50:14 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cc1plus/Makefile,v 1.25 2002/04/08 18:48:38 obrien Exp $ .include "../Makefile.inc" @@ -11,7 +11,7 @@ search.c semantics.c sig.c spew.c tree.c typeck.c typeck2.c xref.c BINDIR= /usr/libexec NOMAN= 1 -NOSHARED?=yes +NOSHARED=yes CFLAGS+= -I${GCCDIR}/cp -I. ==== //depot/projects/ia64/gnu/usr.bin/cc/cccp/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/cccp/Makefile,v 1.20 2001/03/27 14:58:38 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/cccp/Makefile,v 1.21 2002/04/08 18:48:38 obrien Exp $ .include "../Makefile.inc" @@ -8,7 +8,7 @@ SRCS= cccp.c cexp.y obstack.c prefix.c version.c YFLAGS= BINDIR= /usr/libexec -NOSHARED?=yes +NOSHARED=yes MAN= cccp.1 MLINKS= cccp.1 cpp.1 ==== //depot/projects/ia64/gnu/usr.bin/cc/collect2/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/usr.bin/cc/collect2/Makefile,v 1.2 2002/04/06 23:12:46 obrien Exp $ +# $FreeBSD: src/gnu/usr.bin/cc/collect2/Makefile,v 1.3 2002/04/08 18:48:38 obrien Exp $ .include "../Makefile.inc" @@ -8,7 +8,7 @@ SRCS= collect2.c cplus-dem.c tlink.c underscore.c BINDIR= /usr/libexec NOMAN= -NOSHARED?=yes +NOSHARED=yes DPADD+= ${LIBCC_INT} LDADD+= ${LIBCC_INT} ==== //depot/projects/ia64/gnu/usr.bin/sort/sort.c#4 (text+ko) ==== @@ -19,7 +19,7 @@ The author may be reached (Email) at the address mike@gnu.ai.mit.edu, or (US mail) as Mike Haertel c/o Free Software Foundation. */ -/* $FreeBSD: src/gnu/usr.bin/sort/sort.c,v 1.20 2002/04/08 12:12:06 ache Exp $ */ +/* $FreeBSD: src/gnu/usr.bin/sort/sort.c,v 1.21 2002/04/08 22:00:28 ache Exp $ */ #include <config.h> @@ -198,6 +198,8 @@ static struct keyfield keyhead; #ifdef __FreeBSD__ +static unsigned char decimal_point; + static int COLLDIFF (int a, int b) { @@ -751,7 +753,11 @@ { register tmpa = UCHAR (*a), tmpb = UCHAR (*b); +#ifdef __FreeBSD__ + if (tmpa == decimal_point && tmpb == decimal_point) +#else if (tmpa == '.' && tmpb == '.') +#endif { do tmpa = UCHAR (*++a), tmpb = UCHAR (*++b); @@ -776,7 +782,11 @@ } return 0; } +#ifdef __FreeBSD__ + else if (tmpa == decimal_point) +#else else if (tmpa == '.') +#endif { do tmpa = UCHAR (*++a); @@ -785,7 +795,11 @@ return 1; return 0; } +#ifdef __FreeBSD__ + else if (tmpb == decimal_point) +#else else if (tmpb == '.') +#endif { do tmpb = UCHAR (*++b); @@ -821,7 +835,11 @@ while (tmpa == '0'); if (tmpb != '-') { +#ifdef __FreeBSD__ + if (tmpa == decimal_point) +#else if (tmpa == '.') +#endif do tmpa = UCHAR (*++a); while (tmpa == '0'); @@ -829,7 +847,11 @@ return -1; while (tmpb == '0') tmpb = UCHAR (*++b); +#ifdef __FreeBSD__ + if (tmpb == decimal_point) +#else if (tmpb == '.') +#endif do tmpb = UCHAR (*++b); while (tmpb == '0'); @@ -844,7 +866,12 @@ while (tmpa == tmpb && digits[tmpa]) tmpa = UCHAR (*++a), tmpb = UCHAR (*++b); +#ifdef __FreeBSD__ + if ((tmpa == decimal_point && !digits[tmpb]) || + (tmpb == decimal_point && !digits[tmpa])) +#else if ((tmpa == '.' && !digits[tmpb]) || (tmpb == '.' && !digits[tmpa])) +#endif return -fraccompare (a, b); if (digits[tmpa]) @@ -876,7 +903,11 @@ do tmpb = UCHAR (*++b); while (tmpb == '0'); +#ifdef __FreeBSD__ + if (tmpb == decimal_point) +#else if (tmpb == '.') +#endif do tmpb = UCHAR (*++b); while (tmpb == '0'); @@ -884,7 +915,11 @@ return 1; while (tmpa == '0') tmpa = UCHAR (*++a); +#ifdef __FreeBSD__ + if (tmpa == decimal_point) +#else if (tmpa == '.') +#endif do tmpa = UCHAR (*++a); while (tmpa == '0'); @@ -902,7 +937,12 @@ while (tmpa == tmpb && digits[tmpa]) tmpa = UCHAR (*++a), tmpb = UCHAR (*++b); +#ifdef __FreeBSD__ + if ((tmpa == decimal_point && !digits[tmpb]) || + (tmpb == decimal_point && !digits[tmpa])) +#else if ((tmpa == '.' && !digits[tmpb]) || (tmpb == '.' && !digits[tmpa])) +#endif return fraccompare (a, b); if (digits[tmpa]) @@ -1738,6 +1778,7 @@ #ifdef __FreeBSD__ (void) setlocale(LC_ALL, ""); + decimal_point = localeconv()->decimal_point[0]; #endif program_name = argv[0]; ==== //depot/projects/ia64/lib/csu/sparc64/Makefile#4 (text+ko) ==== @@ -1,12 +1,12 @@ -# $FreeBSD: src/lib/csu/sparc64/Makefile,v 1.4 2002/03/29 22:43:41 markm Exp $ +# $FreeBSD: src/lib/csu/sparc64/Makefile,v 1.5 2002/04/08 20:31:20 obrien Exp $ .PATH: ${.CURDIR}/../common -SRCS= crt1.c crti.S crtn.S +SRCS= crt1.c crti.S crtn.S crtbegin.c crtend.c OBJS= ${SRCS:N*.h:R:S/$/.o/g} OBJS+= gcrt1.o -CFLAGS+= -I${.CURDIR}/../common \ - -I${.CURDIR}/../../libc/include +SOBJS= crtbegin.So crtend.So +CFLAGS+= -I${.CURDIR}/../common -I${.CURDIR}/../../libc/include NOMAN= true NOPIC= true NOPROFILE= true ==== //depot/projects/ia64/lib/libc/gen/getobjformat.c#3 (text+ko) ==== @@ -25,9 +25,7 @@ */ #include <sys/cdefs.h> -#ifdef __FBSDID -__FBSDID("$FreeBSD: src/lib/libc/gen/getobjformat.c,v 1.5 2002/02/08 09:34:17 ru Exp $"); -#endif +__FBSDID("$FreeBSD: src/lib/libc/gen/getobjformat.c,v 1.6 2002/04/09 11:39:03 ru Exp $"); #include <sys/param.h> #include <objformat.h> ==== //depot/projects/ia64/lib/libc/gen/strtofflags.c#3 (text+ko) ==== @@ -35,9 +35,7 @@ static char sccsid[] = "@(#)stat_flags.c 8.1 (Berkeley) 5/31/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -#ifdef __FBSDID -__FBSDID("$FreeBSD: src/lib/libc/gen/strtofflags.c,v 1.20 2002/02/08 09:34:17 ru Exp $"); -#endif +__FBSDID("$FreeBSD: src/lib/libc/gen/strtofflags.c,v 1.21 2002/04/09 11:39:03 ru Exp $"); #include <sys/types.h> #include <sys/stat.h> ==== //depot/projects/ia64/lib/libc/sparc64/fpu/fpu.c#4 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu.c,v 1.3 2002/03/22 21:52:58 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu.c,v 1.4 2002/04/09 00:57:23 jake Exp $"); #include <sys/param.h> @@ -241,7 +241,7 @@ * the frame. */ frm = (struct frame *)(uf->uf_out[6] + SPOFF); - return (frm->f_local[reg - IREG_L0]); + return (frm->fr_local[reg - IREG_L0]); } __fpu_panic("fetch_reg: bogus register"); } ==== //depot/projects/ia64/lib/libc_r/uthread/uthread_select.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/libc_r/uthread/uthread_select.c,v 1.18 2001/04/10 04:19:20 deischen Exp $ + * $FreeBSD: src/lib/libc_r/uthread/uthread_select.c,v 1.19 2002/04/09 05:41:00 asmodai Exp $ */ #include <unistd.h> #include <errno.h> @@ -52,7 +52,7 @@ struct pthread *curthread = _get_curthread(); struct timespec ts; int i, ret = 0, f_wait = 1; - int pfd_index, got_one = 0, fd_count = 0; + int pfd_index, got_events = 0, fd_count = 0; struct pthread_poll_data data; if (numfds > _thread_dtablesize) { @@ -166,12 +166,22 @@ * this file descriptor from the fdset if * the requested event wasn't ready. */ - got_one = 0; + + /* + * First check for invalid descriptor. + * If found, set errno and return -1. + */ + if (data.fds[i].revents & POLLNVAL) { + errno = EBADF; + return -1; + } + + got_events = 0; if (readfds != NULL) { if (FD_ISSET(data.fds[i].fd, readfds)) { if (data.fds[i].revents & (POLLIN | POLLRDNORM)) - got_one = 1; + got_events++; else FD_CLR(data.fds[i].fd, readfds); } @@ -180,7 +190,7 @@ if (FD_ISSET(data.fds[i].fd, writefds)) { if (data.fds[i].revents & (POLLOUT | POLLWRNORM | POLLWRBAND)) - got_one = 1; + got_events++; else FD_CLR(data.fds[i].fd, writefds); @@ -189,16 +199,15 @@ if (exceptfds != NULL) { if (FD_ISSET(data.fds[i].fd, exceptfds)) { if (data.fds[i].revents & (POLLRDBAND | - POLLPRI | POLLHUP | POLLERR | - POLLNVAL)) - got_one = 1; + POLLPRI)) + got_events++; else FD_CLR(data.fds[i].fd, exceptfds); } } - if (got_one) - numfds++; + if (got_events != 0) + numfds+=got_events; } ret = numfds; } ==== //depot/projects/ia64/lib/libcrypt/crypt.3#3 (text+ko) ==== @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libcrypt/crypt.3,v 1.24 2001/12/13 08:05:32 ru Exp $ +.\" $FreeBSD: src/lib/libcrypt/crypt.3,v 1.25 2002/04/09 22:32:59 trhodes Exp $ .\" .\" Manual page, using -mandoc macros .\" @@ -167,7 +167,7 @@ .Fa digit represents which algorithm is used in encryption. Following the token is the actual salt to use in the encryption. The length of the salt is limited -to 16 characters--because the length of the returned output is also limited +to 8 characters--because the length of the returned output is also limited (_PASSWORD_LEN). The salt must be terminated with the end of the string (NULL) or a dollar sign. Any characters after the dollar sign are ignored. .Pp ==== //depot/projects/ia64/lib/libedit/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ # $NetBSD: Makefile,v 1.19 2000/08/15 12:01:40 mrg Exp $ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/libedit/Makefile,v 1.24 2001/10/01 23:10:48 obrien Exp $ +# $FreeBSD: src/lib/libedit/Makefile,v 1.25 2002/04/09 13:04:31 ru Exp $ LIB= edit SHLIB_MAJOR= 4 @@ -9,8 +9,8 @@ OSRCS= chared.c common.c el.c emacs.c fcns.c help.c hist.c key.c map.c \ parse.c prompt.c read.c refresh.c search.c sig.c term.c tty.c vi.c -DPADD= ${LIBTERMCAP} -LDADD= -ltermcap +DPADD= ${LIBNCURSES} +LDADD= -lncurses MAN= editline.3 editrc.5 ==== //depot/projects/ia64/lib/libstand/Makefile#6 (text+ko) ==== @@ -1,5 +1,4 @@ -# $FreeBSD: src/lib/libstand/Makefile,v 1.30 2002/03/19 12:03:05 peter Exp $ -# +# $FreeBSD: src/lib/libstand/Makefile,v 1.34 2002/04/09 20:38:29 obrien Exp $ # Originally from $NetBSD: Makefile,v 1.21 1997/10/26 22:08:38 lukem Exp $ # # Notes: @@ -12,8 +11,7 @@ NOPIC= YES MAN= libstand.3 -# Mostly OK, some of the libc imports are a bit noisy -CFLAGS+= -Wall +CFLAGS+= -ffreestanding .if ${MACHINE_ARCH} == "alpha" CFLAGS+= -mno-fp-regs @@ -104,15 +102,11 @@ .PATH: ${.CURDIR}/../libc/ia64/gen SRCS+= __divdi3.S __divsi3.S __moddi3.S __modsi3.S SRCS+= __udivdi3.S __udivsi3.S __umoddi3.S __umodsi3.S -# XXX should be global -CFLAGS+= -ffreestanding .endif -.if ${MACHINE_ARCH} != "sparc64" # _setjmp/_longjmp .PATH: ${.CURDIR}/${MACHINE_ARCH} SRCS+= _setjmp.S -.endif # decompression functionality from libbz2 .PATH: ${.CURDIR}/../../contrib/bzip2 ==== //depot/projects/ia64/libexec/lukemftpd/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 4/4/94 -# $FreeBSD: src/libexec/lukemftpd/Makefile,v 1.3 2002/03/01 17:30:01 obrien Exp $ +# $FreeBSD: src/libexec/lukemftpd/Makefile,v 1.4 2002/04/08 21:22:58 obrien Exp $ MAINTAINER= obrien @@ -30,7 +30,7 @@ CLEANFILES+= ls-unmain.c ls-unmain.c: ls.c - sed -e 's/^main(/ls_main(/g' -e 's|extern.h|${LSDIR}/extern.h|' \ + sed -e 's/^main(/ls_main(/g' -e 's,extern.h,${LSDIR}/extern.h,' \ ${.ALLSRC} > ${.TARGET} .if !defined(NOPAM) ==== //depot/projects/ia64/libexec/tftpd/tftpd.c#4 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "@(#)tftpd.c 8.1 (Berkeley) 6/4/93"; #endif static const char rcsid[] = - "$FreeBSD: src/libexec/tftpd/tftpd.c,v 1.22 2002/02/07 04:49:34 imp Exp $"; + "$FreeBSD: src/libexec/tftpd/tftpd.c,v 1.23 2002/04/09 19:13:43 ambrisko Exp $"; #endif /* not lint */ /* @@ -576,9 +576,19 @@ (void)setjmp(timeoutbuf); send_data: - if (send(peer, dp, size + 4, 0) != size + 4) { - syslog(LOG_ERR, "write: %m"); - goto abort; + { + int i, t = 1; + for (i = 0; ; i++){ + if (send(peer, dp, size + 4, 0) != size + 4) { + sleep(t); + t = (t < 32) ? t<< 1 : t; + if (i >= 12) { + syslog(LOG_ERR, "write: %m"); + goto abort; + } + } + break; + } } read_ahead(file, pf->f_convert); for ( ; ; ) { ==== //depot/projects/ia64/release/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.666 2002/04/02 15:07:34 matusita Exp $ +# $FreeBSD: src/release/Makefile,v 1.667 2002/04/09 01:17:47 matusita Exp $ # # make release CHROOTDIR=/some/dir BUILDNAME=somename CVSROOT=/cvs/dir \ # [ RELEASETAG=tag ] @@ -1009,6 +1009,7 @@ @echo "read" >> ${RD}/image.${FSIMAGE}/boot/loader.rc .endif @echo "load -t mfs_root /mfsroot" >> ${RD}/image.${FSIMAGE}/boot/loader.rc + @echo "set hint.acpi.0.disable=1" >> ${RD}/image.${FSIMAGE}/boot/loader.rc @echo "echo \\007\\007" >> ${RD}/image.${FSIMAGE}/boot/loader.rc @echo "autoboot 10" >> ${RD}/image.${FSIMAGE}/boot/loader.rc .if ${MACHINE_ARCH} == "i386" && ${AUTO_KEYBOARD_DETECT} ==== //depot/projects/ia64/sbin/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 -# $FreeBSD: src/sbin/Makefile,v 1.101 2002/04/02 10:58:30 marcel Exp $ +# $FreeBSD: src/sbin/Makefile,v 1.102 2002/04/09 10:55:11 phk Exp $ # XXX MISSING: icheck ncheck @@ -87,7 +87,6 @@ .if ${MACHINE_ARCH} == "i386" SUBDIR+=cxconfig \ - kget \ mount_nwfs \ mount_smbfs \ nextboot ==== //depot/projects/ia64/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.22 2002/01/23 09:35:55 sobomax Exp $ +.\" $FreeBSD: src/sbin/dumpon/dumpon.8,v 1.23 2002/04/09 19:51:50 trhodes Exp $ .\" .Dd May 12, 1995 .Dt DUMPON 8 @@ -96,14 +96,12 @@ .Pp Since .Nm -can only be called after the system enters single-user mode, -it can not be used to create dumps for system panics during -kernel initialization. -In such cases use +cannot be used during kernel initialization, the .Va dumpdev -tunable provided by +variable of .Xr loader 8 -instead. +must be used to enable dumps for system panics which occur +during kernel initialization. .Sh SEE ALSO .Xr sysctl 3 , .Xr fstab 5 , ==== //depot/projects/ia64/sbin/dumpon/dumpon.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ static char sccsid[] = "From: @(#)swapon.c 8.1 (Berkeley) 6/5/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/dumpon/dumpon.c,v 1.15 2002/04/08 09:20:04 phk Exp $"; + "$FreeBSD: src/sbin/dumpon/dumpon.c,v 1.16 2002/04/09 10:00:18 phk Exp $"; #endif /* not lint */ #include <err.h> @@ -84,9 +84,9 @@ if (fd < 0) err(EX_OSFILE, "%s", argv[0]); u = 0; - i = ioctl(fd, DIOCGKERNELDUMP, &u); + i = ioctl(fd, DIOCSKERNELDUMP, &u); u = 1; - i = ioctl(fd, DIOCGKERNELDUMP, &u); + i = ioctl(fd, DIOCSKERNELDUMP, &u); if (i == 0 && verbose) printf("kernel dumps on %s\n", argv[0]); @@ -95,12 +95,12 @@ if (fd < 0) err(EX_OSFILE, "%s", _PATH_DEVNULL); u = 0; - i = ioctl(fd, DIOCGKERNELDUMP, &u); + i = ioctl(fd, DIOCSKERNELDUMP, &u); if (i == 0 && verbose) printf("kernel dumps disabled\n"); } if (i < 0) - err(EX_OSERR, "ioctl(DIOCGKERNELDUMP)"); + err(EX_OSERR, "ioctl(DIOCSKERNELDUMP)"); exit (0); } ==== //depot/projects/ia64/share/examples/etc/make.conf#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/etc/make.conf,v 1.183 2002/03/30 18:14:37 ume Exp $ +# $FreeBSD: src/share/examples/etc/make.conf,v 1.184 2002/04/09 18:25:40 bmilekic Exp $ # # NOTE: Please would any committer updating this file also update the # make.conf(5) manual page, if necessary, which is located in @@ -116,6 +116,7 @@ #NOSECURE= true # do not build crypto code in secure/ subdir #NOSHARE= true # do not go into the share subdir #NOUUCP= true # do not build uucp related programs +#NO_RCMNDS= true # do not build rlogin, rsh & rcp # # To build the OpenSSL manpages, uncomment the following. These are not # built by default because they clobber a number of system manpages with ==== //depot/projects/ia64/share/man/man4/Makefile#7 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.151 2002/03/27 09:58:14 phk Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.152 2002/04/09 21:34:33 julian Exp $ MAN= aac.4 \ acpi.4 \ @@ -95,6 +95,7 @@ ng_bridge.4 \ ng_cisco.4 \ ng_echo.4 \ + ng_etf.4 \ ng_ether.4 \ ng_frame_relay.4 \ ng_gif.4 \ ==== //depot/projects/ia64/share/man/man4/ip.4#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ip.4 8.2 (Berkeley) 11/30/93 -.\" $FreeBSD: src/share/man/man4/ip.4,v 1.24 2001/10/01 16:09:21 ru Exp $ +.\" $FreeBSD: src/share/man/man4/ip.4,v 1.25 2002/04/09 18:03:18 silby Exp $ .\" .Dd March 3, 2001 .Dt IP 4 @@ -144,9 +144,9 @@ .Bl -tag -width IP_PORTRANGE_DEFAULT .It Dv IP_PORTRANGE_DEFAULT use the default range of values, normally -.Dv IPPORT_RESERVED +.Dv IPPORT_HIFIRSTAUTO through -.Dv IPPORT_USERRESERVED . +.Dv IPPORT_HILASTAUTO . This is adjustable through the sysctl setting: .Sy net.inet.ip.portrange.first and ==== //depot/projects/ia64/share/man/man4/ng_etf.4#3 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ng_etf.4,v 1.3 2001/11/21 17:29:00 ru Exp $ +.\" $FreeBSD: src/share/man/man4/ng_etf.4,v 1.4 2002/04/09 21:34:33 julian Exp $ .\" .Dd February 28, 2001 .Dt NG_ETF 4 @@ -128,7 +128,7 @@ DONE ngctl -f /tmp/xwert -# something to set a hook to catch packets an dshow them. +# something to set a hook to catch packets and show them. echo "Unrecognised packets:" nghook -a etf: newproto & # Filter two random ethertypes to that hook. ==== //depot/projects/ia64/share/man/man7/hier.7#7 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204092256.g39Mubf68197>