Date: Fri, 9 May 2003 12:08:51 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 30867 for review Message-ID: <200305091908.h49J8ptO081272@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305091908.h49J8ptO081272>