Module Name: src Committed By: skrll Date: Mon Oct 21 08:28:14 UTC 2013
Modified Files: src/lib/libc/arch/arm/gen: _setjmp.S Log Message: Fix bug introduced in revision 1.13 which meant longjmp would never work on EABI where VFP didn't exist. Hi gimpy! To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/lib/libc/arch/arm/gen/_setjmp.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/lib/libc/arch/arm/gen/_setjmp.S diff -u src/lib/libc/arch/arm/gen/_setjmp.S:1.14 src/lib/libc/arch/arm/gen/_setjmp.S:1.15 --- src/lib/libc/arch/arm/gen/_setjmp.S:1.14 Thu Sep 12 15:36:15 2013 +++ src/lib/libc/arch/arm/gen/_setjmp.S Mon Oct 21 08:28:14 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: _setjmp.S,v 1.14 2013/09/12 15:36:15 joerg Exp $ */ +/* $NetBSD: _setjmp.S,v 1.15 2013/10/21 08:28:14 skrll Exp $ */ /* * Copyright (c) 1997 Mark Brinicombe @@ -135,6 +135,7 @@ ENTRY(_longjmp) vldmia r3, {d8-d15} ldr r3, [r0, #(_JB_REG_FPSCR * 4)] vmsr fpscr, r3 +1: #endif /* __ARM_EABI__ && (_ARM_ARCH_T2 || !__thumb__) */ adds r0, r0, #(_JB_REG_R4 * 4)