Commit ff199543 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'baa94563'

* commit 'baa94563':
  ppc: linux: Check altivec using the auxv

Conflicts:
	libavutil/ppc/cpu.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 08f229d8 baa94563
...@@ -18,6 +18,11 @@ ...@@ -18,6 +18,11 @@
#ifdef __APPLE__ #ifdef __APPLE__
#include <sys/sysctl.h> #include <sys/sysctl.h>
#elif defined(__linux__)
#include <asm/cputable.h>
#include <linux/auxvec.h>
#include <fcntl.h>
#include <unistd.h>
#elif defined(__OpenBSD__) #elif defined(__OpenBSD__)
#include <sys/param.h> #include <sys/param.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
...@@ -62,6 +67,32 @@ int ff_get_cpu_flags_ppc(void) ...@@ -62,6 +67,32 @@ int ff_get_cpu_flags_ppc(void)
if (err == 0) if (err == 0)
return has_vu ? AV_CPU_FLAG_ALTIVEC : 0; return has_vu ? AV_CPU_FLAG_ALTIVEC : 0;
return 0; return 0;
#elif defined(__linux__)
// The linux kernel could have the altivec support disabled
// even if the cpu has it.
int i, ret = 0;
int fd = open("/proc/self/auxv", O_RDONLY);
unsigned long buf[64] = { 0 };
ssize_t count;
if (fd < 0)
return 0;
while ((count = read(fd, buf, sizeof(buf))) > 0) {
for (i = 0; i < count / sizeof(*buf); i += 2) {
if (buf[i] == AT_NULL)
goto out;
if (buf[i] == AT_HWCAP) {
if (buf[i + 1] & PPC_FEATURE_HAS_ALTIVEC)
ret = AV_CPU_FLAG_ALTIVEC;
goto out;
}
}
}
out:
close(fd);
return ret;
#elif CONFIG_RUNTIME_CPUDETECT && defined(__linux__) && !ARCH_PPC64 #elif CONFIG_RUNTIME_CPUDETECT && defined(__linux__) && !ARCH_PPC64
int proc_ver; int proc_ver;
// Support of mfspr PVR emulation added in Linux 2.6.17. // Support of mfspr PVR emulation added in Linux 2.6.17.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment