Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/libc/arch/arm/gen Fix the .cfi correctly.



details:   https://anonhg.NetBSD.org/src/rev/6317be4f4748
branches:  trunk
changeset: 789722:6317be4f4748
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Sep 04 23:08:29 2013 +0000

description:
Fix the .cfi correctly.

diffstat:

 lib/libc/arch/arm/gen/swapcontext.S |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r f2b1babacd5a -r 6317be4f4748 lib/libc/arch/arm/gen/swapcontext.S
--- a/lib/libc/arch/arm/gen/swapcontext.S       Wed Sep 04 22:59:50 2013 +0000
+++ b/lib/libc/arch/arm/gen/swapcontext.S       Wed Sep 04 23:08:29 2013 +0000
@@ -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 @@
 #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}



Home | Main Index | Thread Index | Old Index