--- libcoro/coro.c	2006/11/25 00:27:00	1.22
+++ libcoro/coro.c	2007/04/27 19:35:28	1.26
@@ -67,6 +67,12 @@
 static volatile void *coro_init_arg;
 static volatile coro_context *new_coro, *create_coro;
 
+/* what we really want to detect here is wether we use a new-enough version of GAS */
+/* instead, check for gcc 3 and ELF and hope for the best */
+#if __GNUC__ >= 3 && __ELF__
+# define HAVE_CFI 1
+#endif
+
 static void
 coro_init (void)
 {
@@ -90,7 +96,15 @@
 trampoline (int sig)
 {
   if (setjmp (((coro_context *)new_coro)->env))
-    coro_init (); /* start it */
+    {
+#if HAVE_CFI
+      asm (".cfi_startproc");
+#endif
+      coro_init (); /* start it */
+#if HAVE_CFI
+      asm (".cfi_endproc");
+#endif
+    }
   else
     trampoline_count++;
 }
@@ -100,9 +114,9 @@
 #endif
 
 /* initialize a machine state */
-void coro_create(coro_context *ctx,
-                 coro_func coro, void *arg,
-                 void *sptr, long ssize)
+void coro_create (coro_context *ctx,
+                  coro_func coro, void *arg,
+                  void *sptr, long ssize)
 {
 #if CORO_UCONTEXT
 
@@ -142,7 +156,10 @@
   nsa.sa_flags = SA_ONSTACK;
 
   if (sigaction (SIGUSR2, &nsa, &osa))
-    perror ("sigaction");
+    {
+      perror ("sigaction");
+      abort ();
+    }
 
   /* set the new stack */
   nstk.ss_sp    = STACK_ADJUST_PTR (sptr,ssize); /* yes, some platforms (IRIX) get this wrong. */
@@ -150,7 +167,10 @@
   nstk.ss_flags = 0;
 
   if (sigaltstack (&nstk, &ostk) < 0)
-    perror ("sigaltstack");
+    {
+      perror ("sigaltstack");
+      abort ();
+    }
 
   trampoline_count = 0;
   kill (getpid (), SIGUSR2);
@@ -197,20 +217,18 @@
 # elif CORO_LINUX
 
   _setjmp (ctx->env);
-#if defined(__GLIBC__) && defined(__GLIBC_MINOR__) \
-    && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 0 && defined(JB_PC) && defined(JB_SP)
+#if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 0 && defined (JB_PC) && defined (JB_SP)
   ctx->env[0].__jmpbuf[JB_PC] = (long)coro_init;
-  ctx->env[0].__jmpbuf[JB_SP] = (long)STACK_ADJUST_PTR (sptr,ssize);
-#elif defined(__GLIBC__) && defined(__GLIBC_MINOR__) \
-    && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 0 && defined(__mc68000__)
+  ctx->env[0].__jmpbuf[JB_SP] = (long)STACK_ADJUST_PTR (sptr, ssize);
+#elif __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 0 && defined (__mc68000__)
   ctx->env[0].__jmpbuf[0].__aregs[0] = (long int)coro_init;
   ctx->env[0].__jmpbuf[0].__sp = (int *)((char *)sptr + ssize);
-#elif defined(__GNU_LIBRARY__) && defined(__i386__)
+#elif defined (__GNU_LIBRARY__) && defined (__i386__)
   ctx->env[0].__jmpbuf[0].__pc = (char *)coro_init;
   ctx->env[0].__jmpbuf[0].__sp = (void *)((char *)sptr + ssize);
-#elif defined(__GNU_LIBRARY__) && defined(__amd64__)
+#elif defined (__GNU_LIBRARY__) && defined (__amd64__)
   ctx->env[0].__jmpbuf[JB_PC]  = (long)coro_init;
-  ctx->env[0].__jmpbuf[JB_RSP] = (long)STACK_ADJUST_PTR (sptr,ssize);
+  ctx->env[0].__jmpbuf[JB_RSP] = (long)STACK_ADJUST_PTR (sptr, ssize);
 #else
 #error "linux libc or architecture not supported"
 #endif
@@ -219,7 +237,7 @@
 
   setjmp (ctx->env);
   ctx->env[JB_PC] = (__uint64_t)coro_init;
-  ctx->env[JB_SP] = (__uint64_t)STACK_ADJUST_PTR (sptr,ssize);
+  ctx->env[JB_SP] = (__uint64_t)STACK_ADJUST_PTR (sptr, ssize);
 
 # endif