From owner-svn-src-all@FreeBSD.ORG  Sat Aug 15 15:41:10 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A0FAF106568C;
	Sat, 15 Aug 2009 15:41:10 +0000 (UTC)
	(envelope-from stas@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8EE568FC61;
	Sat, 15 Aug 2009 15:41:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7FFfALJ075855;
	Sat, 15 Aug 2009 15:41:10 GMT (envelope-from stas@svn.freebsd.org)
Received: (from stas@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7FFfA4C075853;
	Sat, 15 Aug 2009 15:41:10 GMT (envelope-from stas@svn.freebsd.org)
Message-Id: <200908151541.n7FFfA4C075853@svn.freebsd.org>
From: Stanislav Sedov <stas@FreeBSD.org>
Date: Sat, 15 Aug 2009 15:41:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r196249 - in stable/7/lib/libc: . arm/string
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 15 Aug 2009 15:41:10 -0000

Author: stas
Date: Sat Aug 15 15:41:10 2009
New Revision: 196249
URL: http://svn.freebsd.org/changeset/base/196249

Log:
  - MFC r194583:
      Fix strncmp on arm. Return 0 as result without performing the
      main cycle only if the len passed is equal to 0. If end address
      overflows use last possible address as the end address.

Modified:
  stable/7/lib/libc/   (props changed)
  stable/7/lib/libc/arm/string/strncmp.S

Modified: stable/7/lib/libc/arm/string/strncmp.S
==============================================================================
--- stable/7/lib/libc/arm/string/strncmp.S	Sat Aug 15 15:40:30 2009	(r196248)
+++ stable/7/lib/libc/arm/string/strncmp.S	Sat Aug 15 15:41:10 2009	(r196249)
@@ -33,13 +33,17 @@
 __FBSDID("$FreeBSD$");
 
 ENTRY(strncmp)
-/* if ((len - 1) < 0) return 0 */
-	subs	r2, r2, #1
-	movmi	r0, #0
-	movmi	pc, lr
+/* if (len == 0) return 0 */
+	cmp	r2, #0
+	moveq	r0, #0
+	moveq	pc, lr
 
 /* ip == last src address to compare */
-	add	ip, r0, r2
+	adds	ip, r0, r2
+	sub	ip, ip, #1
+/* Use last possible address on overflow. */
+	movcs	ip, #0
+	subcs	ip, ip, #1
 1:
 	ldrb	r2, [r0], #1
 	ldrb	r3, [r1], #1