RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Do not check for __APPLE_ALTIVEC__, just check for __APPLE_CC__. 

This should work even when -faltivec is not specified.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26012 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2008-02-16 17:44:49 +00:00
parent 9b3be6a2ca
commit 2fb3a82350
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmpeg2/cpu_accel.c
View File

@ -168,7 +168,7 @@ static uint32_t arch_accel (void)
canjump = 1;
#if defined( __APPLE_CC__ ) && defined( __APPLE_ALTIVEC__ ) /* 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"

2
libmpeg2/cpu_state.c
View File

@ -48,7 +48,7 @@ static void state_restore_mmx (cpu_state_t * state)
#endif
#if defined(ARCH_PPC) && defined(HAVE_ALTIVEC)
#if defined( __APPLE_CC__ ) && defined( __APPLE_ALTIVEC__ ) /* apple */
#if defined(__APPLE_CC__) /* apple */
#define LI(a,b) "li r" #a "," #b "\n\t"
#define STVX0(a,b,c) "stvx v" #a ",0,r" #c "\n\t"
#define STVX(a,b,c) "stvx v" #a ",r" #b ",r" #c "\n\t"

4
libmpeg2/idct_altivec.c
View File

@ -41,7 +41,7 @@ typedef vector unsigned short vector_u16_t;
typedef vector signed int vector_s32_t;
typedef vector unsigned int vector_u32_t;
#if defined( HAVE_ALTIVEC_H ) && !defined( __APPLE_ALTIVEC__ ) && (__GNUC__ * 100 + __GNUC_MINOR__ < 303)
#if defined(HAVE_ALTIVEC_H) && !defined(__APPLE_CC__) && (__GNUC__ * 100 + __GNUC_MINOR__ < 303)
/* work around gcc <3.3 vec_mergel bug */
static inline vector_s16_t my_vec_mergel (vector_s16_t const A,
vector_s16_t const B)
@ -56,7 +56,7 @@ static inline vector_s16_t my_vec_mergel (vector_s16_t const A,
#define vec_mergel my_vec_mergel
#endif
#if defined( __APPLE_CC__ ) && defined( __APPLE_ALTIVEC__ ) /* apple */
#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 */
#define VEC_S16(a,b,c,d,e,f,g,h) {a, b, c, d, e, f, g, h}

8
libmpeg2/libmpeg-0.4.1.diff
View File

@ -72,7 +72,7 @@
-#ifdef HAVE_ALTIVEC_H /* gnu */
-#define VAND(a,b,c) "vand " #a "," #b "," #c "\n\t"
-#else /* apple */
+#if defined( __APPLE_CC__ ) && defined( __APPLE_ALTIVEC__ ) /* 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"
@ -137,7 +137,7 @@
-#define LVX0(a,b,c) "lvx " #a ",0," #c "\n\t"
-#define LVX(a,b,c) "lvx " #a "," #b "," #c "\n\t"
-#else /* apple */
+#if defined( __APPLE_CC__ ) && defined( __APPLE_ALTIVEC__ ) /* apple */
+#if defined(__APPLE_CC__) /* apple */
#define LI(a,b) "li r" #a "," #b "\n\t"
#define STVX0(a,b,c) "stvx v" #a ",0,r" #c "\n\t"
#define STVX(a,b,c) "stvx v" #a ",r" #b ",r" #c "\n\t"
@ -464,7 +464,7 @@
typedef vector unsigned int vector_u32_t;
-#if defined(HAVE_ALTIVEC_H) && (__GNUC__ * 100 + __GNUC_MINOR__ < 303)
+#if defined( HAVE_ALTIVEC_H ) && !defined( __APPLE_ALTIVEC__ ) && (__GNUC__ * 100 + __GNUC_MINOR__ < 303)
+#if defined(HAVE_ALTIVEC_H) && !defined(__APPLE_CC__) && (__GNUC__ * 100 + __GNUC_MINOR__ < 303)
/* work around gcc <3.3 vec_mergel bug */
static inline vector_s16_t my_vec_mergel (vector_s16_t const A,
vector_s16_t const B)
@ -475,7 +475,7 @@
-#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 */
+#if defined( __APPLE_CC__ ) && defined( __APPLE_ALTIVEC__ ) /* apple */
+#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 */
+#define VEC_S16(a,b,c,d,e,f,g,h) {a, b, c, d, e, f, g, h}