Module Name:    src
Committed By:   htodd
Date:           Wed Sep  4 22:38:09 UTC 2013

Modified Files:
        src/lib/libc/arch/arm/gen: swapcontext.S

Log Message:
Fix build by matching .cfi/#if.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 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.11 src/lib/libc/arch/arm/gen/swapcontext.S:1.12
--- src/lib/libc/arch/arm/gen/swapcontext.S:1.11	Wed Sep  4 21:17:15 2013
+++ src/lib/libc/arch/arm/gen/swapcontext.S	Wed Sep  4 22:38:09 2013
@@ -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 @@ ENTRY(swapcontext)
 #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)

Reply via email to