mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-10-04 17:06:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use elf_aux_info() on OpenBSD

Browse Source 
NFC for ARMv7. For PowerPC move elf_aux_info() to higher priority over
sysctl for newer systems.

(cherry picked from commit b299e0de46)
This commit is contained in:
Brad Smith
2025-09-27 03:36:00 -04:00
committed by Sam Lantinga
parent 7b28fb29bd
commit 641201a99a
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/cpuinfo/SDL_cpuinfo.c
View File

@@ -50,13 +50,12 @@
#endif #endif
#if defined(__MACOSX__) && (defined(__ppc__) || defined(__ppc64__)) #if defined(__MACOSX__) && (defined(__ppc__) || defined(__ppc64__))
#include <sys/sysctl.h> /* For AltiVec check */ #include <sys/sysctl.h> /* For AltiVec check */
#elif defined(__OpenBSD__) && defined(__powerpc__) #elif defined(__OpenBSD__) && defined(__powerpc__) && !defined(HAVE_ELF_AUX_INFO)
#include <sys/types.h> #include <sys/types.h>
#include <sys/sysctl.h> /* For AltiVec check */ #include <sys/sysctl.h> /* For AltiVec check */
#include <machine/cpu.h> #include <machine/cpu.h>
#elif defined(__FreeBSD__) && defined(__powerpc__) #elif defined(__FreeBSD__) && defined(__powerpc__) && defined(HAVE_ELF_AUX_INFO)
#include <machine/cpu.h> #include <machine/cpu.h>
#include <sys/auxv.h>
#elif defined(SDL_ALTIVEC_BLITTERS) && defined(HAVE_SETJMP) #elif defined(SDL_ALTIVEC_BLITTERS) && defined(HAVE_SETJMP)
#include <signal.h> #include <signal.h>
#include <setjmp.h> #include <setjmp.h>
@@ -343,7 +342,12 @@ static int CPU_haveAltiVec(void)
{ {
volatile int altivec = 0; volatile int altivec = 0;
#ifndef SDL_CPUINFO_DISABLED #ifndef SDL_CPUINFO_DISABLED
#if (defined(__MACOSX__) && (defined(__ppc__) || defined(__ppc64__))) || (defined(__OpenBSD__) && defined(__powerpc__)) #if (defined(__FreeBSD__) || defined(__OpenBSD__)) && defined(__powerpc__) && defined(HAVE_ELF_AUX_INFO)
unsigned long cpufeatures = 0;
elf_aux_info(AT_HWCAP, &cpufeatures, sizeof(cpufeatures));
altivec = cpufeatures & PPC_FEATURE_HAS_ALTIVEC;
return altivec;
#elif (defined(__MACOSX__) && (defined(__ppc__) || defined(__ppc64__))) || (defined(__OpenBSD__) && defined(__powerpc__))
#ifdef __OpenBSD__ #ifdef __OpenBSD__
int selectors[2] = { CTL_MACHDEP, CPU_ALTIVEC }; int selectors[2] = { CTL_MACHDEP, CPU_ALTIVEC };
#else #else
@@ -355,11 +359,6 @@ static int CPU_haveAltiVec(void)
if (0 == error) { if (0 == error) {
altivec = (hasVectorUnit != 0); altivec = (hasVectorUnit != 0);
} }
#elif defined(__FreeBSD__) && defined(__powerpc__)
unsigned long cpufeatures = 0;
elf_aux_info(AT_HWCAP, &cpufeatures, sizeof(cpufeatures));
altivec = cpufeatures & PPC_FEATURE_HAS_ALTIVEC;
return altivec;
#elif defined(__LINUX__) && defined(__powerpc__) && defined(HAVE_GETAUXVAL) #elif defined(__LINUX__) && defined(__powerpc__) && defined(HAVE_GETAUXVAL)
altivec = getauxval(AT_HWCAP) & PPC_FEATURE_HAS_ALTIVEC; altivec = getauxval(AT_HWCAP) & PPC_FEATURE_HAS_ALTIVEC;
#elif defined(SDL_ALTIVEC_BLITTERS) && defined(HAVE_SETJMP) #elif defined(SDL_ALTIVEC_BLITTERS) && defined(HAVE_SETJMP)
@@ -489,8 +488,6 @@ static int CPU_haveNEON(void)
return 0; /* assume anything else from Apple doesn't have NEON. */ return 0; /* assume anything else from Apple doesn't have NEON. */
#elif !defined(__arm__) #elif !defined(__arm__)
return 0; /* not an ARM CPU at all. */ return 0; /* not an ARM CPU at all. */
#elif defined(__OpenBSD__)
return 1; /* OpenBSD only supports ARMv7 CPUs that have NEON. */
#elif defined(HAVE_ELF_AUX_INFO) #elif defined(HAVE_ELF_AUX_INFO)
unsigned long hasneon = 0; unsigned long hasneon = 0;
if (elf_aux_info(AT_HWCAP, (void *)&hasneon, (int)sizeof(hasneon)) != 0) { if (elf_aux_info(AT_HWCAP, (void *)&hasneon, (int)sizeof(hasneon)) != 0) {
@@ -527,6 +524,8 @@ static int CPU_haveNEON(void)
} }
return 0; return 0;
} }
#elif defined(__OpenBSD__)
return 1; /* OpenBSD only supports ARMv7 CPUs that have NEON. */
#else #else
#warning SDL_HasNEON is not implemented for this ARM platform. Write me. #warning SDL_HasNEON is not implemented for this ARM platform. Write me.
return 0; return 0;