diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-05-26 05:00:51 +0000 |
|---|---|---|
| committer | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2009-05-26 05:00:51 +0000 |
| commit | 34d11b875f96cab642893f12656f24899ca42ad7 (patch) | |
| tree | 1605cbf942e86770284fbfdb9082523f61000e24 /libavcodec/ppc | |
| parent | 71b0654cc6693a8c925966cfb88ec62c1052609f (diff) | |
| download | ffmpeg-34d11b875f96cab642893f12656f24899ca42ad7.tar.gz | |
Change HAVE_PPC64 to ARCH_PPC64.
As a side-effect this also gives it the correct value on e.g. PPC970FX-based
PPC64 systems, thus fixing "make test" (mp2/mp3 decoding).
Originally committed as revision 18953 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/ppc')
| -rw-r--r-- | libavcodec/ppc/dsputil_ppc.h | 8 | ||||
| -rw-r--r-- | libavcodec/ppc/mathops.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/ppc/dsputil_ppc.h b/libavcodec/ppc/dsputil_ppc.h index 3583acfc46..d028574f02 100644 --- a/libavcodec/ppc/dsputil_ppc.h +++ b/libavcodec/ppc/dsputil_ppc.h @@ -27,7 +27,7 @@ void powerpc_display_perf_report(void); /* the 604* have 2, the G3* have 4, the G4s have 6, and the G5 are completely different (they MUST use - HAVE_PPC64, and let's hope all future 64 bis PPC + ARCH_PPC64, and let's hope all future 64 bis PPC will use the same PMCs... */ #define POWERPC_NUM_PMC_ENABLED 6 /* if you add to the enum below, also add to the perfname array @@ -70,7 +70,7 @@ enum powerpc_data_index { }; extern unsigned long long perfdata[POWERPC_NUM_PMC_ENABLED][powerpc_perf_total][powerpc_data_total]; -#if !HAVE_PPC64 +#if !ARCH_PPC64 #define POWERP_PMC_DATATYPE unsigned long #define POWERPC_GET_PMC1(a) __asm__ volatile("mfspr %0, 937" : "=r" (a)) #define POWERPC_GET_PMC2(a) __asm__ volatile("mfspr %0, 938" : "=r" (a)) @@ -88,7 +88,7 @@ extern unsigned long long perfdata[POWERPC_NUM_PMC_ENABLED][powerpc_perf_total][ #define POWERPC_GET_PMC5(a) do {} while (0) #define POWERPC_GET_PMC6(a) do {} while (0) #endif -#else /* HAVE_PPC64 */ +#else /* ARCH_PPC64 */ #define POWERP_PMC_DATATYPE unsigned long long #define POWERPC_GET_PMC1(a) __asm__ volatile("mfspr %0, 771" : "=r" (a)) #define POWERPC_GET_PMC2(a) __asm__ volatile("mfspr %0, 772" : "=r" (a)) @@ -106,7 +106,7 @@ extern unsigned long long perfdata[POWERPC_NUM_PMC_ENABLED][powerpc_perf_total][ #define POWERPC_GET_PMC5(a) do {} while (0) #define POWERPC_GET_PMC6(a) do {} while (0) #endif -#endif /* HAVE_PPC64 */ +#endif /* ARCH_PPC64 */ #define POWERPC_PERF_DECLARE(a, cond) \ POWERP_PMC_DATATYPE \ pmc_start[POWERPC_NUM_PMC_ENABLED], \ diff --git a/libavcodec/ppc/mathops.h b/libavcodec/ppc/mathops.h index a74fcfa792..1dcc09aebd 100644 --- a/libavcodec/ppc/mathops.h +++ b/libavcodec/ppc/mathops.h @@ -44,7 +44,7 @@ static inline av_const int MULH(int a, int b){ return r; } -#if !HAVE_PPC64 +#if !ARCH_PPC64 static inline av_const int64_t MAC64(int64_t d, int a, int b) { union { uint64_t x; unsigned hl[2]; } x = { d }; |