Mercurial > mplayer.hg
changeset 26896:4559d4a7c3cb
Check for ALTIVEC_H instead of __APPLE_CC__ to decide which AltiVec vector
declaration syntax to use. Checking for HAVE_ALTIVEC_VECTOR_BRACES would be
better, but this variant is more likely to be mergeable upstream.
| author | diego |
|---|---|
| date | Fri, 30 May 2008 12:09:06 +0000 |
| parents | 2aadf9302854 |
| children | 23c3741dc490 |
| files | libmpeg2/idct_altivec.c libmpeg2/libmpeg-0.4.1.diff |
| diffstat | 2 files changed, 3 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpeg2/idct_altivec.c Fri May 30 12:05:24 2008 +0000 +++ b/libmpeg2/idct_altivec.c Fri May 30 12:09:06 2008 +0000 @@ -56,10 +56,10 @@ #define vec_mergel my_vec_mergel #endif -#if defined(__APPLE_CC__) /* apple */ +#ifdef HAVE_ALTIVEC_H /* gnu */ +#define VEC_S16(a,b,c,d,e,f,g,h) {a, b, c, d, e, f, g, h} +#else /* apple */ #define VEC_S16(a,b,c,d,e,f,g,h) (vector_s16_t) (a, b, c, d, e, f, g, h) -#else /* gnu */ -#define VEC_S16(a,b,c,d,e,f,g,h) {a, b, c, d, e, f, g, h} #endif static const vector_s16_t constants ATTR_ALIGN(16) =
--- a/libmpeg2/libmpeg-0.4.1.diff Fri May 30 12:05:24 2008 +0000 +++ b/libmpeg2/libmpeg-0.4.1.diff Fri May 30 12:09:06 2008 +0000 @@ -50,20 +50,6 @@ +#endif /* ARCH_X86 || ARCH_X86_64 */ #if defined(ARCH_PPC) || defined(ARCH_SPARC) -@@ -166,10 +168,10 @@ - - canjump = 1; - --#ifdef HAVE_ALTIVEC_H /* gnu */ --#define VAND(a,b,c) "vand " #a "," #b "," #c "\n\t" --#else /* apple */ -+#if defined(__APPLE_CC__) /* apple */ - #define VAND(a,b,c) "vand v" #a ",v" #b ",v" #c "\n\t" -+#else /* gnu */ -+#define VAND(a,b,c) "vand " #a "," #b "," #c "\n\t" - #endif - asm volatile ("mtspr 256, %0\n\t" - VAND (0, 0, 0) @@ -212,7 +241,7 @@ accel = 0;