Module Name: src
Committed By: matt
Date: Sat Sep 1 14:46:51 UTC 2012
Modified Files:
src/sys/arch/arm/arm32: cpuswitch.S
Log Message:
blx reg is V5, not V4T
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/arm/arm32/cpuswitch.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/cpuswitch.S
diff -u src/sys/arch/arm/arm32/cpuswitch.S:1.69 src/sys/arch/arm/arm32/cpuswitch.S:1.70
--- src/sys/arch/arm/arm32/cpuswitch.S:1.69 Fri Aug 31 11:45:38 2012
+++ src/sys/arch/arm/arm32/cpuswitch.S Sat Sep 1 14:46:51 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuswitch.S,v 1.69 2012/08/31 11:45:38 skrll Exp $ */
+/* $NetBSD: cpuswitch.S,v 1.70 2012/09/01 14:46:51 matt Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -89,7 +89,7 @@
#include <machine/asm.h>
#include <machine/cpu.h>
- RCSID("$NetBSD: cpuswitch.S,v 1.69 2012/08/31 11:45:38 skrll Exp $")
+ RCSID("$NetBSD: cpuswitch.S,v 1.70 2012/09/01 14:46:51 matt Exp $")
/* LINTSTUB: include <sys/param.h> */
@@ -337,7 +337,7 @@ ENTRY(lwp_trampoline)
mov r0, r5
mov r1, sp
-#ifdef _ARM_ARCH_4T
+#ifdef _ARM_ARCH_5
blx r4
#else
mov lr, pc