[src/trunk]: src/sys/arch/arm/include Appease clang's integrated assembler an...

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

details:   https://anonhg.NetBSD.org/src/rev/2546bb1e5186
branches:  trunk
changeset: 338520:2546bb1e5186
user:      matt <matt%NetBSD.org@localhost>
date:      Thu May 28 21:52:36 2015 +0000

description:
Appease clang's integrated assembler and have separate thumb2 and arm asm's
for ldrht

diffstat:

 sys/arch/arm/include/locore.h |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (22 lines):

diff -r b3ddcb7cd0cb -r 2546bb1e5186 sys/arch/arm/include/locore.h
--- a/sys/arch/arm/include/locore.h     Thu May 28 20:14:00 2015 +0000
+++ b/sys/arch/arm/include/locore.h     Thu May 28 21:52:36 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.h,v 1.22 2015/05/28 02:22:37 matt Exp $ */
+/*     $NetBSD: locore.h,v 1.23 2015/05/28 21:52:36 matt Exp $ */
 
 /*
  * Copyright (c) 1994-1996 Mark Brinicombe.
@@ -226,8 +226,10 @@
        va &= ~1;
        uint32_t insn;
        if (user_p) {
-#ifdef _ARM_ARCH_T2
-               __asm __volatile("ldrht %0, [%1]" : "=&r"(insn) : "r"(va));
+#if defined(__thumb__) && defined(_ARM_ARCH_T2)
+               __asm __volatile("ldrht %0, [%1, #0]" : "=&r"(insn) : "r"(va));
+#elif defined(_ARM_ARCH_7)
+               __asm __volatile("ldrht %0, [%1], #0" : "=&r"(insn) : "r"(va));
 #else
                __asm __volatile("ldrt %0, [%1]" : "=&r"(insn) : "r"(va & ~3));
 #ifdef __ARMEB__