--- cvsroot/libcoro/coro.c	2008/11/08 04:52:01	1.40
+++ cvsroot/libcoro/coro.c	2008/11/16 00:55:41	1.43
@@ -80,12 +80,6 @@
 static void *coro_init_arg;
 static coro_context *new_coro, *create_coro;
 
-/* what we really want to detect here is wether we use a new-enough version of GAS */
-/* with dwarf debug info. instead, check for gcc 3, ELF and GNU/Linux and hope for the best */
-# if __GNUC__ >= 3 && __ELF__ && __linux__
-#  define HAVE_CFI 1
-# endif
-
 static void
 coro_init (void)
 {
@@ -115,13 +109,7 @@
       sigsetjmp (new_coro->env, 0)
     #endif
   ) {
-      #if HAVE_CFI
-        asm (".cfi_startproc");
-      #endif
       coro_init (); /* start it */
-      #if HAVE_CFI
-        asm (".cfi_endproc");
-      #endif
     }
   else
     trampoline_done = 1;
@@ -287,7 +275,7 @@
 
 # elif CORO_ASM
 
-  ctx->sp = (volatile void **)(ssize + (char *)sptr);
+  ctx->sp = (void **)(ssize + (char *)sptr);
   *--ctx->sp = (void *)abort; /* needed for alignment only */
   *--ctx->sp = (void *)coro_init;
   ctx->sp -= NUM_SAVED;
@@ -355,6 +343,9 @@
 {
   pthread_cond_signal (&next->cv);
   pthread_cond_wait (&prev->cv, &coro_mutex);
+#if __FreeBSD__ /* freebsd is of course broken and needs manual testcancel calls... yay... */
+  pthread_testcancel ();
+#endif
 }
 
 void