summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root>2008-01-20 17:30:24 +0000
committerroot <root>2008-01-20 17:30:24 +0000
commit3915f3c3488051550026a4fffdf43059ff958546 (patch)
tree62e1297955635cf078bb70a0f7ce9c2bd1e917a0
parent78f7ab4189614860e9802a1ce964c718c6d2cb9c (diff)
*** empty log message ***rel-4_4
-rw-r--r--coro.c6
-rw-r--r--coro.h3
2 files changed, 5 insertions, 4 deletions
diff --git a/coro.c b/coro.c
index ebc9654..057008d 100644
--- a/coro.c
+++ b/coro.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001-2006 Marc Alexander Lehmann <schmorp@schmorp.de>
+ * Copyright (c) 2001-2008 Marc Alexander Lehmann <schmorp@schmorp.de>
*
* Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met:
@@ -68,8 +68,8 @@ 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__
+/* instead, check for gcc 3, ELF and GNU/Linux and hope for the best */
+#if __GNUC__ >= 3 && __ELF__ && __linux__
# define HAVE_CFI 1
#endif
diff --git a/coro.h b/coro.h
index 00ed664..70bf252 100644
--- a/coro.h
+++ b/coro.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001-2006 Marc Alexander Lehmann <schmorp@schmorp.de>
+ * Copyright (c) 2001-2008 Marc Alexander Lehmann <schmorp@schmorp.de>
*
* Redistribution and use in source and binary forms, with or without modifica-
* tion, are permitted provided that the following conditions are met:
@@ -43,6 +43,7 @@
* Use _setjmp instead of setjmp on _XOPEN_SOURCE >= 600.
* 2007-05-02 Add assembly versions for x86 and amd64 (to avoid reliance
* on SIGUSR2 and sigaltstack in Crossfire).
+ * 2008-01-21 Disable CFI usage on anything but GNU/Linux.
*/
#ifndef CORO_H