From owner-svn-src-all@FreeBSD.ORG  Fri Dec  5 19:08:37 2014
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:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4C59F353;
 Fri,  5 Dec 2014 19:08:37 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2FA868F0;
 Fri,  5 Dec 2014 19:08:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB5J8aPV084329;
 Fri, 5 Dec 2014 19:08:36 GMT (envelope-from andrew@FreeBSD.org)
Received: (from andrew@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB5J8aWF084327;
 Fri, 5 Dec 2014 19:08:36 GMT (envelope-from andrew@FreeBSD.org)
Message-Id: <201412051908.sB5J8aWF084327@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: andrew set sender to
 andrew@FreeBSD.org using -f
From: Andrew Turner <andrew@FreeBSD.org>
Date: Fri, 5 Dec 2014 19:08:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r275520 - in head/sys: arm/arm libkern/arm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
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/options/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: Fri, 05 Dec 2014 19:08:37 -0000

Author: andrew
Date: Fri Dec  5 19:08:36 2014
New Revision: 275520
URL: https://svnweb.freebsd.org/changeset/base/275520

Log:
  Use the unified syntax in a few more assembly files
  
  MFC after:	1 week
  Sponsored by:	ABT Systems Ltd

Modified:
  head/sys/arm/arm/fusu.S
  head/sys/libkern/arm/ffs.S

Modified: head/sys/arm/arm/fusu.S
==============================================================================
--- head/sys/arm/arm/fusu.S	Fri Dec  5 19:04:08 2014	(r275519)
+++ head/sys/arm/arm/fusu.S	Fri Dec  5 19:08:36 2014	(r275520)
@@ -38,6 +38,8 @@
 #include "assym.s"
 __FBSDID("$FreeBSD$");
 
+	.syntax	unified
+
 #ifdef _ARM_ARCH_6
 #define GET_PCB(tmp) \
 	mrc p15, 0, tmp, c13, c0, 4; \
@@ -83,7 +85,7 @@ EENTRY_NP(casuword32)
 	ldrt	r5, [r0]
 	cmp	r5, r1
 	movne	r0, r5
-	streqt	r2, [r0]
+	strteq	r2, [r0]
 #endif
 	moveq	r0, r1
 2:

Modified: head/sys/libkern/arm/ffs.S
==============================================================================
--- head/sys/libkern/arm/ffs.S	Fri Dec  5 19:04:08 2014	(r275519)
+++ head/sys/libkern/arm/ffs.S	Fri Dec  5 19:08:36 2014	(r275520)
@@ -31,6 +31,7 @@
 #include <machine/asm.h>
 __FBSDID("$FreeBSD$");
 
+	.syntax	unified
 
 /*
  * ffs - find first set bit, this algorithm isolates the first set
@@ -62,7 +63,7 @@ ENTRY(ffs)
 	rsbne   r0, r0, r0, lsl #16 /* r0 = X * 0x0450fbaf */
               
 	/* now lookup in table indexed on top 6 bits of r0 */
-	ldrneb  r0, [ r2, r0, lsr #26 ]
+	ldrbne  r0, [ r2, r0, lsr #26 ]
 
 	RET
 .text;