diff --git a/amd64/bsd_asm.h b/amd64/bsd_asm.h
index d4c2c7e..c462fb3 100644
--- a/amd64/bsd_asm.h
+++ b/amd64/bsd_asm.h
@@ -62,7 +62,7 @@
 
 #define _START_ENTRY	.p2align 4,0x90
 
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__ELF__)
+#if defined(__ELF__)
 #define _ENTRY(x)	.text; _START_ENTRY; \
 			.globl CNAME(x); .type CNAME(x),@function; CNAME(x):
 #define	END(x)		.size x, . - x
diff --git a/amd64/e_remainder.S b/amd64/e_remainder.S
index 5b621a2..a0b4900 100644
--- a/amd64/e_remainder.S
+++ b/amd64/e_remainder.S
@@ -25,6 +25,6 @@ ENTRY(remainder)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/amd64/e_remainderf.S b/amd64/e_remainderf.S
index 16f4b9b..c63e97e 100644
--- a/amd64/e_remainderf.S
+++ b/amd64/e_remainderf.S
@@ -24,6 +24,6 @@ ENTRY(remainderf)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/amd64/e_remainderl.S b/amd64/e_remainderl.S
index 14aefbc..5f21b93 100644
--- a/amd64/e_remainderl.S
+++ b/amd64/e_remainderl.S
@@ -30,6 +30,6 @@ ENTRY(remainderl)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/amd64/e_sqrt.S b/amd64/e_sqrt.S
index 4b359a3..a44e41f 100644
--- a/amd64/e_sqrt.S
+++ b/amd64/e_sqrt.S
@@ -35,6 +35,6 @@ END(sqrt)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/amd64/e_sqrtf.S b/amd64/e_sqrtf.S
index d7487e4..f74175b 100644
--- a/amd64/e_sqrtf.S
+++ b/amd64/e_sqrtf.S
@@ -34,6 +34,6 @@ END(sqrtf)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/amd64/e_sqrtl.S b/amd64/e_sqrtl.S
index e7a93eb..6e7eac0 100644
--- a/amd64/e_sqrtl.S
+++ b/amd64/e_sqrtl.S
@@ -41,6 +41,6 @@ ENTRY(sqrtl)
 	ret
 
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/amd64/s_llrint.S b/amd64/s_llrint.S
index 1291c8b..d7a0f74 100644
--- a/amd64/s_llrint.S
+++ b/amd64/s_llrint.S
@@ -7,6 +7,6 @@ ENTRY(llrint)
 END(llrint)
 
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/amd64/s_llrintf.S b/amd64/s_llrintf.S
index c0dbde9..f5d39b3 100644
--- a/amd64/s_llrintf.S
+++ b/amd64/s_llrintf.S
@@ -7,6 +7,6 @@ ENTRY(llrintf)
 END(llrintf)
 
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/amd64/s_llrintl.S b/amd64/s_llrintl.S
index 6d6eb47..12f2d33 100644
--- a/amd64/s_llrintl.S
+++ b/amd64/s_llrintl.S
@@ -40,6 +40,6 @@ ENTRY(llrintl)
 
 
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/amd64/s_logbl.S b/amd64/s_logbl.S
index 1d016ec..d22afeb 100644
--- a/amd64/s_logbl.S
+++ b/amd64/s_logbl.S
@@ -24,6 +24,6 @@ ENTRY(logbl)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/amd64/s_lrint.S b/amd64/s_lrint.S
index 51d145e..9e1b917 100644
--- a/amd64/s_lrint.S
+++ b/amd64/s_lrint.S
@@ -39,6 +39,6 @@ END(lrint)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/amd64/s_lrintf.S b/amd64/s_lrintf.S
index 1d6eec4..8e0b0c2 100644
--- a/amd64/s_lrintf.S
+++ b/amd64/s_lrintf.S
@@ -39,6 +39,6 @@ END(lrintf)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/amd64/s_lrintl.S b/amd64/s_lrintl.S
index f64c5bb..288c0bb 100644
--- a/amd64/s_lrintl.S
+++ b/amd64/s_lrintl.S
@@ -40,6 +40,6 @@ ENTRY(lrintl)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/amd64/s_remquo.S b/amd64/s_remquo.S
index 24d638d..8ef8425 100644
--- a/amd64/s_remquo.S
+++ b/amd64/s_remquo.S
@@ -71,6 +71,6 @@ END(remquo)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/amd64/s_remquof.S b/amd64/s_remquof.S
index d73a360..129a807 100644
--- a/amd64/s_remquof.S
+++ b/amd64/s_remquof.S
@@ -71,6 +71,6 @@ END(remquof)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/amd64/s_remquol.S b/amd64/s_remquol.S
index 3214124..344e1fb 100644
--- a/amd64/s_remquol.S
+++ b/amd64/s_remquol.S
@@ -76,6 +76,6 @@ ENTRY(remquol)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/amd64/s_rintl.S b/amd64/s_rintl.S
index 825d965..479e836 100644
--- a/amd64/s_rintl.S
+++ b/amd64/s_rintl.S
@@ -21,6 +21,6 @@ ENTRY(rintl)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/amd64/s_scalbn.S b/amd64/s_scalbn.S
index 4a0f33b..9d4152b 100644
--- a/amd64/s_scalbn.S
+++ b/amd64/s_scalbn.S
@@ -50,6 +50,6 @@ END(scalbn)
 .set   CNAME(ldexp),CNAME(scalbn)
 
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/amd64/s_scalbnf.S b/amd64/s_scalbnf.S
index 8c606f0..75b4bb2 100644
--- a/amd64/s_scalbnf.S
+++ b/amd64/s_scalbnf.S
@@ -50,6 +50,6 @@ END(scalbnf)
 .set   CNAME(ldexpf),CNAME(scalbnf)
 
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/amd64/s_scalbnl.S b/amd64/s_scalbnl.S
index f5751dd..fa0d2bf 100644
--- a/amd64/s_scalbnl.S
+++ b/amd64/s_scalbnl.S
@@ -35,6 +35,6 @@ END(scalbnl)
 .set   CNAME(ldexpl),CNAME(scalbnl)
 
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/bsd_asm.h b/i387/bsd_asm.h
index 0e3c01e..db57aa1 100644
--- a/i387/bsd_asm.h
+++ b/i387/bsd_asm.h
@@ -72,7 +72,7 @@
 /* XXX should use .p2align 4,0x90 for -m486. */
 #define _START_ENTRY .p2align 2,0x90
 
-#if defined(__linux__) || defined(__FreeBSD__) || defined(__ELF__)
+#if defined(__ELF__)
 #define CNAME(csym)		csym
 #define HIDENAME(asmsym)	.asmsym
 #define _ENTRY(x) .text; _START_ENTRY; \
diff --git a/i387/e_exp.S b/i387/e_exp.S
index b3aaee0..0f03f9e 100644
--- a/i387/e_exp.S
+++ b/i387/e_exp.S
@@ -71,6 +71,6 @@ END(exp)
     //
 
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/e_fmod.S b/i387/e_fmod.S
index f88f06a..44e52e5 100644
--- a/i387/e_fmod.S
+++ b/i387/e_fmod.S
@@ -20,6 +20,6 @@ END(fmod)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/e_log.S b/i387/e_log.S
index af8e96c..ebd6ae7 100644
--- a/i387/e_log.S
+++ b/i387/e_log.S
@@ -16,6 +16,6 @@ END(log)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/e_log10.S b/i387/e_log10.S
index 334e9e3..b559a74 100644
--- a/i387/e_log10.S
+++ b/i387/e_log10.S
@@ -16,6 +16,6 @@ END(log10)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/e_log10f.S b/i387/e_log10f.S
index d4f28ef..afdf1b0 100644
--- a/i387/e_log10f.S
+++ b/i387/e_log10f.S
@@ -17,6 +17,6 @@ END(log10f)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/e_logf.S b/i387/e_logf.S
index 3256fd4..af06fd8 100644
--- a/i387/e_logf.S
+++ b/i387/e_logf.S
@@ -16,6 +16,6 @@ ENTRY(logf)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/e_remainder.S b/i387/e_remainder.S
index ae7eeb1..2aa3113 100644
--- a/i387/e_remainder.S
+++ b/i387/e_remainder.S
@@ -20,6 +20,6 @@ END(remainder)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/e_remainderf.S b/i387/e_remainderf.S
index ae90b4c..2b7b597 100644
--- a/i387/e_remainderf.S
+++ b/i387/e_remainderf.S
@@ -21,6 +21,6 @@ END(remainderf)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/e_remainderl.S b/i387/e_remainderl.S
index 403eaf9..04d460b 100644
--- a/i387/e_remainderl.S
+++ b/i387/e_remainderl.S
@@ -20,6 +20,6 @@ ENTRY(remainderl)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/e_sqrt.S b/i387/e_sqrt.S
index 607cbaa..7c36dfe 100644
--- a/i387/e_sqrt.S
+++ b/i387/e_sqrt.S
@@ -15,6 +15,6 @@ END(sqrt)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/e_sqrtf.S b/i387/e_sqrtf.S
index 98639a5..05fb77f 100644
--- a/i387/e_sqrtf.S
+++ b/i387/e_sqrtf.S
@@ -16,6 +16,6 @@ END(sqrtf)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/e_sqrtl.S b/i387/e_sqrtl.S
index 80f1eaa..5317f95 100644
--- a/i387/e_sqrtl.S
+++ b/i387/e_sqrtl.S
@@ -14,6 +14,6 @@ ENTRY(sqrtl)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_ceil.S b/i387/s_ceil.S
index 63dc2d3..80de70a 100644
--- a/i387/s_ceil.S
+++ b/i387/s_ceil.S
@@ -29,6 +29,6 @@ END(ceil)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_ceilf.S b/i387/s_ceilf.S
index 081870a..7ea898a 100644
--- a/i387/s_ceilf.S
+++ b/i387/s_ceilf.S
@@ -31,6 +31,6 @@ END(ceilf)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_ceill.S b/i387/s_ceill.S
index f291aec..838edd1 100644
--- a/i387/s_ceill.S
+++ b/i387/s_ceill.S
@@ -29,6 +29,6 @@ END(ceill)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_copysign.S b/i387/s_copysign.S
index 2eea80d..4386747 100644
--- a/i387/s_copysign.S
+++ b/i387/s_copysign.S
@@ -20,6 +20,6 @@ END(copysign)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_copysignf.S b/i387/s_copysignf.S
index c6c5843..5d0169b 100644
--- a/i387/s_copysignf.S
+++ b/i387/s_copysignf.S
@@ -21,6 +21,6 @@ END(copysignf)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_copysignl.S b/i387/s_copysignl.S
index 48e295f..1a9a06a 100644
--- a/i387/s_copysignl.S
+++ b/i387/s_copysignl.S
@@ -19,6 +19,6 @@ END(copysignl)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_cos.S b/i387/s_cos.S
index e685136..4e29ec3 100644
--- a/i387/s_cos.S
+++ b/i387/s_cos.S
@@ -28,6 +28,6 @@ END(cos)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_floor.S b/i387/s_floor.S
index 12bced2..13097eb 100644
--- a/i387/s_floor.S
+++ b/i387/s_floor.S
@@ -30,6 +30,6 @@ END(floor)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_floorf.S b/i387/s_floorf.S
index 1ca843b..c3a4e09 100644
--- a/i387/s_floorf.S
+++ b/i387/s_floorf.S
@@ -31,6 +31,6 @@ END(floorf)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_floorl.S b/i387/s_floorl.S
index e1d012a..949116f 100644
--- a/i387/s_floorl.S
+++ b/i387/s_floorl.S
@@ -29,6 +29,6 @@ END(floorl)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_llrint.S b/i387/s_llrint.S
index dbf0453..97c292e 100644
--- a/i387/s_llrint.S
+++ b/i387/s_llrint.S
@@ -38,6 +38,6 @@ END(llrint)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_llrintf.S b/i387/s_llrintf.S
index 1987a99..447e77a 100644
--- a/i387/s_llrintf.S
+++ b/i387/s_llrintf.S
@@ -38,6 +38,6 @@ END(llrintf)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_llrintl.S b/i387/s_llrintl.S
index 2cf43e9..ad6a7c9 100644
--- a/i387/s_llrintl.S
+++ b/i387/s_llrintl.S
@@ -37,6 +37,6 @@ ENTRY(llrintl)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_logb.S b/i387/s_logb.S
index 9b85246..d0fc5d6 100644
--- a/i387/s_logb.S
+++ b/i387/s_logb.S
@@ -16,6 +16,6 @@ END(logb)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_logbf.S b/i387/s_logbf.S
index da6f85f..3e3568c 100644
--- a/i387/s_logbf.S
+++ b/i387/s_logbf.S
@@ -17,6 +17,6 @@ END(logbf)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_logbl.S b/i387/s_logbl.S
index dd964b7..6d2de64 100644
--- a/i387/s_logbl.S
+++ b/i387/s_logbl.S
@@ -15,6 +15,6 @@ ENTRY(logbl)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_lrint.S b/i387/s_lrint.S
index 2a0e9b1..1e12539 100644
--- a/i387/s_lrint.S
+++ b/i387/s_lrint.S
@@ -37,6 +37,6 @@ END(lrint)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_lrintf.S b/i387/s_lrintf.S
index 1932b6c..b588c1a 100644
--- a/i387/s_lrintf.S
+++ b/i387/s_lrintf.S
@@ -37,6 +37,6 @@ END(lrintf)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_lrintl.S b/i387/s_lrintl.S
index ed81a3e..94cc6cb 100644
--- a/i387/s_lrintl.S
+++ b/i387/s_lrintl.S
@@ -36,6 +36,6 @@ ENTRY(lrintl)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_remquo.S b/i387/s_remquo.S
index 698a461..78a588d 100644
--- a/i387/s_remquo.S
+++ b/i387/s_remquo.S
@@ -64,6 +64,6 @@ END(remquo)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_remquof.S b/i387/s_remquof.S
index 3ea13a8..8f532c3 100644
--- a/i387/s_remquof.S
+++ b/i387/s_remquof.S
@@ -64,6 +64,6 @@ END(remquof)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_remquol.S b/i387/s_remquol.S
index cee616e..b89563c 100644
--- a/i387/s_remquol.S
+++ b/i387/s_remquol.S
@@ -64,6 +64,6 @@ ENTRY(remquol)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_rint.S b/i387/s_rint.S
index 46856a2..a8109cd 100644
--- a/i387/s_rint.S
+++ b/i387/s_rint.S
@@ -15,6 +15,6 @@ END(rint)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_rintf.S b/i387/s_rintf.S
index 4e7fde0..184a16f 100644
--- a/i387/s_rintf.S
+++ b/i387/s_rintf.S
@@ -16,6 +16,6 @@ END(rintf)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_rintl.S b/i387/s_rintl.S
index fdc7ff4..8727322 100644
--- a/i387/s_rintl.S
+++ b/i387/s_rintl.S
@@ -14,6 +14,6 @@ ENTRY(rintl)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_scalbn.S b/i387/s_scalbn.S
index 96bcbcc..d690ff1 100644
--- a/i387/s_scalbn.S
+++ b/i387/s_scalbn.S
@@ -18,6 +18,6 @@ END(scalbn)
 .globl CNAME(ldexp)
 .set   CNAME(ldexp),CNAME(scalbn)
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_scalbnf.S b/i387/s_scalbnf.S
index 77cd532..7f4a2bc 100644
--- a/i387/s_scalbnf.S
+++ b/i387/s_scalbnf.S
@@ -21,6 +21,6 @@ END(scalbnf)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_scalbnl.S b/i387/s_scalbnl.S
index 9d1bf2c..5d359eb 100644
--- a/i387/s_scalbnl.S
+++ b/i387/s_scalbnl.S
@@ -21,6 +21,6 @@ END(scalbnl)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_sin.S b/i387/s_sin.S
index 4094155..6b71455 100644
--- a/i387/s_sin.S
+++ b/i387/s_sin.S
@@ -28,6 +28,6 @@ END(sin)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_tan.S b/i387/s_tan.S
index 2d3442d..7b25c3a 100644
--- a/i387/s_tan.S
+++ b/i387/s_tan.S
@@ -30,6 +30,6 @@ END(tan)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_trunc.S b/i387/s_trunc.S
index 531a76c..5422770 100644
--- a/i387/s_trunc.S
+++ b/i387/s_trunc.S
@@ -28,6 +28,6 @@ END(trunc)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_truncf.S b/i387/s_truncf.S
index c66815d..c9d32bb 100644
--- a/i387/s_truncf.S
+++ b/i387/s_truncf.S
@@ -28,6 +28,6 @@ END(truncf)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif
diff --git a/i387/s_truncl.S b/i387/s_truncl.S
index 0104a18..7152638 100644
--- a/i387/s_truncl.S
+++ b/i387/s_truncl.S
@@ -28,6 +28,6 @@ END(truncl)
 
 	
 /* Enable stack protection */
-#if defined(__linux__) && defined(__ELF__)
+#if defined(__ELF__)
 .section .note.GNU-stack,"",%progbits
 #endif