Module Name: src
Committed By: matt
Date: Wed Sep 4 23:08:29 UTC 2013
Modified Files:
src/lib/libc/arch/arm/gen: swapcontext.S
Log Message:
Fix the .cfi correctly.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/arch/arm/gen/swapcontext.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/swapcontext.S
diff -u src/lib/libc/arch/arm/gen/swapcontext.S:1.12 src/lib/libc/arch/arm/gen/swapcontext.S:1.13
--- src/lib/libc/arch/arm/gen/swapcontext.S:1.12 Wed Sep 4 22:38:09 2013
+++ src/lib/libc/arch/arm/gen/swapcontext.S Wed Sep 4 23:08:29 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: swapcontext.S,v 1.12 2013/09/04 22:38:09 htodd Exp $ */
+/* $NetBSD: swapcontext.S,v 1.13 2013/09/04 23:08:29 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#include "assym.h"
#if defined(LIBC_SCCS) && !defined(lint)
- RCSID("$NetBSD: swapcontext.S,v 1.12 2013/09/04 22:38:09 htodd Exp $")
+ RCSID("$NetBSD: swapcontext.S,v 1.13 2013/09/04 23:08:29 matt Exp $")
#endif /* LIBC_SCCS && !lint */
ENTRY(swapcontext)
@@ -52,9 +52,11 @@ ENTRY(swapcontext)
#endif
bl PIC_SYM(_C_LABEL(_getcontext), PLT) /* getcontext(oucp) */
cmp r0, #0
-#if !defined(__thumb__) && defined(__UNWIND_TABLES__)
+#if !defined(__thumb__)
pop {r0-r2, lr}
+#if defined(__ARM_EABI__) && defined(__UNWIND_TABLES__)
.cfi_def_cfa_offset 0
+#endif
RETc(ne)
#else
pop {r0-r3}
