diff options
author | drochner <drochner> | 2006-10-23 18:39:24 +0000 |
---|---|---|
committer | drochner <drochner> | 2006-10-23 18:39:24 +0000 |
commit | 583cd3bbc4a17414c034dbe4f6bee76c70c0587c (patch) | |
tree | b9610e868649fd212aa91c111bac5ae3f59180b4 /devel/liboil/patches/patch-ac | |
parent | 7cfaa9964c8ea38540015ee5dddd51fb8b5c8362 (diff) | |
download | pkgsrc-583cd3bbc4a17414c034dbe4f6bee76c70c0587c.tar.gz |
-Fix compiler errors with gcc-3.3.3 on i386, reported by Robert Elz per
PR pkg/34886. Just #ifdef out the code on i386; it was disabled at
another layer anyway (due to alignment problems with any gcc on i386).
Thanks to Robert for testing.
-Make sure cpuid is read on amd64, to enable mmx/sse support. (We could
just assume it, but for the future this makes more sense.)
-bump PKGREVISION
Diffstat (limited to 'devel/liboil/patches/patch-ac')
-rw-r--r-- | devel/liboil/patches/patch-ac | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/devel/liboil/patches/patch-ac b/devel/liboil/patches/patch-ac new file mode 100644 index 00000000000..301932b5b23 --- /dev/null +++ b/devel/liboil/patches/patch-ac @@ -0,0 +1,26 @@ +$NetBSD: patch-ac,v 1.1 2006/10/23 18:39:24 drochner Exp $ + +--- ./liboil/sse/composite_sse_4pix.c.orig 2006-10-23 20:03:45.000000000 +0200 ++++ ./liboil/sse/composite_sse_4pix.c +@@ -270,6 +270,13 @@ composite_in_argb_const_mask_sse (uint32 + OIL_DEFINE_IMPL_FULL (composite_in_argb_const_mask_sse, + composite_in_argb_const_mask, OIL_IMPL_FLAG_SSE2); + ++/* ++ * These functions trigger an ICE with gcc-3.3.3 on i386. ++ * (see NetBSD PR pkg/34886) ++ * Since SSE2 is broken anyway on i386, just disable it. ++ * (amd64 is OK) ++ */ ++#ifndef __i386__ + static void + composite_over_argb_sse (uint32_t *dest, const uint32_t *src, int n) + { +@@ -504,6 +511,7 @@ composite_in_over_argb_const_mask_sse (u + } + OIL_DEFINE_IMPL_FULL (composite_in_over_argb_const_mask_sse, + composite_in_over_argb_const_mask, OIL_IMPL_FLAG_SSE2); ++#endif + + static void + composite_over_u8_sse (uint8_t *dest, const uint8_t *src, int n) |