[src/trunk]: src/sys/arch/arm/arm Fix INTEGRATOR build.

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

details:   https://anonhg.NetBSD.org/src/rev/0b44edd353bf
branches:  trunk
changeset: 789746:0b44edd353bf
user:      skrll <skrll%NetBSD.org@localhost>
date:      Fri Sep 06 21:25:34 2013 +0000

description:
Fix INTEGRATOR build.

diffstat:

 sys/arch/arm/arm/vectors.S |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r e6b53ced4d65 -r 0b44edd353bf sys/arch/arm/arm/vectors.S
--- a/sys/arch/arm/arm/vectors.S        Fri Sep 06 17:54:09 2013 +0000
+++ b/sys/arch/arm/arm/vectors.S        Fri Sep 06 21:25:34 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vectors.S,v 1.9 2013/09/06 09:43:32 skrll Exp $        */
+/*     $NetBSD: vectors.S,v 1.10 2013/09/06 21:25:34 skrll Exp $       */
 
 /*
  * Copyright (C) 1994-1997 Mark Brinicombe
@@ -67,12 +67,14 @@
 #ifdef __ARM_FIQ_INDIRECT
        b       _C_LABEL(fiqvector)
 #else
-_C_LABEL(fiqvector):
+_C_LABEL(fiqbranch):
        subs    pc, lr, #4
 #endif
 END(page0rel)
 
-#else /* CPU_ARMV7 || CPU_ARM11 || ARM_HAS_VBAR */
+#endif /* CPU_ARMV7 || CPU_ARM11 || ARM_HAS_VBAR */
+
+#if !defined(ARM_HAS_VBAR)
 
        .global _C_LABEL(page0), _C_LABEL(page0_data), _C_LABEL(page0_end)
        .align  0