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 build by matching .cfi/#if.



details:   https://anonhg.NetBSD.org/src/rev/ac398d70eb0f
branches:  trunk
changeset: 789720:ac398d70eb0f
user:      htodd <htodd%NetBSD.org@localhost>
date:      Wed Sep 04 22:38:09 2013 +0000

description:
Fix build by matching .cfi/#if.

diffstat:

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

diffs (27 lines):

diff -r 9abbb2461b40 -r ac398d70eb0f lib/libc/arch/arm/gen/swapcontext.S
--- a/lib/libc/arch/arm/gen/swapcontext.S       Wed Sep 04 21:17:15 2013 +0000
+++ b/lib/libc/arch/arm/gen/swapcontext.S       Wed Sep 04 22:38:09 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: swapcontext.S,v 1.11 2013/09/04 21:17:15 matt Exp $    */
+/*     $NetBSD: swapcontext.S,v 1.12 2013/09/04 22:38:09 htodd 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.11 2013/09/04 21:17:15 matt Exp $")
+        RCSID("$NetBSD: swapcontext.S,v 1.12 2013/09/04 22:38:09 htodd Exp $")
 #endif /* LIBC_SCCS && !lint */
 
 ENTRY(swapcontext)
@@ -52,7 +52,7 @@
 #endif
        bl      PIC_SYM(_C_LABEL(_getcontext), PLT)  /* getcontext(oucp) */
        cmp     r0, #0
-#if !defined(__thumb__)
+#if !defined(__thumb__) && defined(__UNWIND_TABLES__)
        pop     {r0-r2, lr}
        .cfi_def_cfa_offset 0
        RETc(ne)



Home | Main Index | Thread Index | Old Index