Mercurial > libavcodec.hg
changeset 9713:d762f9979193 libavcodec
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).
| author | reimar |
|---|---|
| date | Tue, 26 May 2009 05:00:51 +0000 |
| parents | 1cc354a5242c |
| children | 5df11d49abb7 |
| files | ppc/dsputil_ppc.h ppc/mathops.h |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ppc/dsputil_ppc.h Tue May 26 03:51:00 2009 +0000 +++ b/ppc/dsputil_ppc.h Tue May 26 05:00:51 2009 +0000 @@ -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 @@ }; 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 @@ #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 @@ #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], \