|
17795
|
1 |
--- liboil-0.3.16/liboil/Makefile.am-orig 2010-03-31 02:18:29.020416389 -0500
|
|
|
2 |
+++ liboil-0.3.16/liboil/Makefile.am 2010-03-31 02:18:45.577467717 -0500
|
|
|
3 |
@@ -28,12 +28,12 @@ if HAVE_3DNOW_INTRINSICS
|
|
|
4 |
#libs_i386 += 3dnow/lib3dnow.la
|
|
|
5 |
endif
|
|
|
6 |
|
|
|
7 |
-if HAVE_AMD64
|
|
|
8 |
-if HAVE_GCC_ASM
|
|
|
9 |
-SUBDIRS += amd64 i386_amd64
|
|
|
10 |
-libs += amd64/libamd64.la i386_amd64/libi386_amd64.la
|
|
|
11 |
-endif
|
|
|
12 |
-endif
|
|
|
13 |
+#if HAVE_AMD64
|
|
|
14 |
+#if HAVE_GCC_ASM
|
|
|
15 |
+#SUBDIRS += amd64 i386_amd64
|
|
|
16 |
+#libs += amd64/libamd64.la i386_amd64/libi386_amd64.la
|
|
|
17 |
+#endif
|
|
|
18 |
+#endif
|
|
|
19 |
|
|
|
20 |
if HAVE_POWERPC
|
|
|
21 |
if HAVE_GCC_ASM
|
|
|
22 |
--- liboil-0.3.16/liboil/i386/trans8x8_i386.c-orig 2010-04-05 18:56:25.689914551 -0500
|
|
|
23 |
+++ liboil-0.3.16/liboil/i386/trans8x8_i386.c 2010-04-05 18:58:26.305370945 -0500
|
|
|
24 |
@@ -136,6 +136,8 @@ trans8x8_u16_mmx (uint16_t *dest, int ds
|
|
|
25 |
}
|
|
|
26 |
OIL_DEFINE_IMPL_FULL (trans8x8_u16_mmx, trans8x8_u16, OIL_IMPL_FLAG_MMX);
|
|
|
27 |
|
|
|
28 |
+/* These two functions crash when used with Sun Studio compiler */
|
|
|
29 |
+#if !defined (__SUNPRO_C)
|
|
|
30 |
static void
|
|
|
31 |
trans8x8_u16_asm1 (uint16_t *dest, int dstr, uint16_t *src, int sstr)
|
|
|
32 |
{
|
|
|
33 |
@@ -233,4 +235,5 @@ trans8x8_u16_asm2 (uint16_t *dest, int d
|
|
|
34 |
: "eax", "ecx", "edx", "esi", "edi");
|
|
|
35 |
}
|
|
|
36 |
OIL_DEFINE_IMPL (trans8x8_u16_asm2, trans8x8_u16);
|
|
|
37 |
+#endif
|
|
|
38 |
|