From owner-p4-projects@FreeBSD.ORG  Fri May  9 12:08:53 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
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 <perforce@freebsd.org>; 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 <perforce@freebsd.org>; 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 <perforce@freebsd.org>; 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 <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
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 <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=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;