diff options
author | jmmv <jmmv> | 2007-01-08 13:21:43 +0000 |
---|---|---|
committer | jmmv <jmmv> | 2007-01-08 13:21:43 +0000 |
commit | 6e74d05206c7850760706baed4b767b278429bc6 (patch) | |
tree | 55f7266f23439649f25af9c43d5340fde4962c6e | |
parent | 940556e6c9aab8f5f9426aa2c00f8f27730f6f6e (diff) | |
download | pkgsrc-6e74d05206c7850760706baed4b767b278429bc6.tar.gz |
Only use __builtin_ctzl if it is available; minimum gcc version number taken
from http://gcc.gnu.org/ml/gcc-patches/2005-01/msg00828.html, so I guess it
is right.
Should fix PR pkg/35380 by tron@, which reports build failure under
NetBSD 3.1/i386 (it worked in -current, though).
-rw-r--r-- | devel/nasm/distinfo | 4 | ||||
-rw-r--r-- | devel/nasm/patches/patch-ad | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/devel/nasm/distinfo b/devel/nasm/distinfo index 1829fa585c3..600f0f5552c 100644 --- a/devel/nasm/distinfo +++ b/devel/nasm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2007/01/06 15:11:58 jmmv Exp $ +$NetBSD: distinfo,v 1.10 2007/01/08 13:21:43 jmmv Exp $ SHA1 (nasm-0.98.39.tar.bz2) = 73d64812bb95774355f737c0fb0271382d23db67 RMD160 (nasm-0.98.39.tar.bz2) = b5587b1b81f58cef3a50e438e8efb365945df587 @@ -6,5 +6,5 @@ Size (nasm-0.98.39.tar.bz2) = 543976 bytes SHA1 (patch-aa) = 27409c3b71634dc5c3aa02b3cae49ebad2db6579 SHA1 (patch-ab) = bbe1d7219dd2e5ade8f97a4f3070bc87d3a7d4b5 SHA1 (patch-ac) = 7ae622ab78b1cf30ca027d652476d7d48deae182 -SHA1 (patch-ad) = 1f572247b2b6b46b4b8c4c2c055010459def496b +SHA1 (patch-ad) = 63e36d38c04006ff1730171714ea3e84fa640af9 SHA1 (patch-ae) = f6029c8574c4e11d59d161819a379e9f687bc346 diff --git a/devel/nasm/patches/patch-ad b/devel/nasm/patches/patch-ad index c1e25e516da..232b8b36526 100644 --- a/devel/nasm/patches/patch-ad +++ b/devel/nasm/patches/patch-ad @@ -207,7 +207,7 @@ + if (align != (align & -align)) { + return -1; + } else { -+#ifdef __GNUC__ ++#if defined(__GNUC__) && GCC_VERSION >= 3004 + return (align ? __builtin_ctzl (align) : 0); +#else + unsigned long result = 0; |