[src/trunk]: src/sys/arch/arm/include Switch to unified syntax

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/756bafa5a1f9
branches:  trunk
changeset: 789217:756bafa5a1f9
user:      matt <matt%NetBSD.org@localhost>
date:      Sun Aug 11 04:39:18 2013 +0000

description:
Switch to unified syntax
use it to get condition return on thumb

diffstat:

 sys/arch/arm/include/asm.h |  12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diffs (40 lines):

diff -r 0c8bcab98cfe -r 756bafa5a1f9 sys/arch/arm/include/asm.h
--- a/sys/arch/arm/include/asm.h        Sun Aug 11 04:36:17 2013 +0000
+++ b/sys/arch/arm/include/asm.h        Sun Aug 11 04:39:18 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: asm.h,v 1.18 2013/08/07 17:09:50 matt Exp $    */
+/*     $NetBSD: asm.h,v 1.19 2013/08/11 04:39:18 matt Exp $    */
 
 /*
  * Copyright (c) 1990 The Regents of the University of California.
@@ -39,6 +39,8 @@
 
 #include <arm/cdefs.h>
 
+       .syntax         unified
+
 #define        __BIT(n)        (1 << (n))
 #define __BITS(hi,lo)  ((~((~0)<<((hi)+1)))&((~0)<<(lo)))
 
@@ -54,7 +56,7 @@
 #endif
 
 #ifndef _ALIGN_TEXT
-# define _ALIGN_TEXT .align 0
+# define _ALIGN_TEXT .align 2
 #endif
 
 /*
@@ -171,7 +173,11 @@
 #if defined (_ARM_ARCH_4T)
 # define RET           bx              lr
 # define RETr(r)       bx              r
-# define RETc(c)       __CONCAT(bx,c)  lr
+# if defined(__thumb__)
+#  define RETc(c)      it c; __CONCAT(bx,c)    lr
+# else
+#  define RETc(c)      __CONCAT(bx,c)  lr
+# endif
 #else
 # define RET           mov             pc, lr
 # define RETr(r)       mov             pc, r