diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-05-30 12:09:06 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-05-30 12:09:06 +0000 |
| commit | 71f6340af735f7035066a13b23b686b07008ca5f (patch) | |
| tree | f6b59e7186ab1176c28c19c0a6fbfa7259b9de7a /libmpeg2 | |
| parent | c6fe9d1af4e94684738a75ee743293ac1f3c8d10 (diff) | |
| download | mpv-71f6340af735f7035066a13b23b686b07008ca5f.tar.bz2 mpv-71f6340af735f7035066a13b23b686b07008ca5f.tar.xz | |
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.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26928 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpeg2')
| -rw-r--r-- | libmpeg2/idct_altivec.c | 6 | ||||
| -rw-r--r-- | libmpeg2/libmpeg-0.4.1.diff | 14 |
2 files changed, 3 insertions, 17 deletions
diff --git a/libmpeg2/idct_altivec.c b/libmpeg2/idct_altivec.c index 303cfe8662..381ef069f0 100644 --- a/libmpeg2/idct_altivec.c +++ b/libmpeg2/idct_altivec.c @@ -56,10 +56,10 @@ static inline vector_s16_t my_vec_mergel (vector_s16_t const A, #define vec_mergel my_vec_mergel #endif -#if defined(__APPLE_CC__) /* 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 */ +#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) #endif static const vector_s16_t constants ATTR_ALIGN(16) = diff --git a/libmpeg2/libmpeg-0.4.1.diff b/libmpeg2/libmpeg-0.4.1.diff index b54b28a952..8a39bd1498 100644 --- a/libmpeg2/libmpeg-0.4.1.diff +++ b/libmpeg2/libmpeg-0.4.1.diff @@ -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; |