Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ArmCPUDetect: Add OpenBSD support for elf_aux_info #13254

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ArmCPUDetect: Add OpenBSD support for elf_aux_info #13254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Source/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,11 @@ endif()
add_definitions(-D__STDC_LIMIT_MACROS)
add_definitions(-D__STDC_CONSTANT_MACROS)

check_symbol_exists(elf_aux_info sys/auxv.h HAVE_ELF_AUX_INFO)
if(HAVE_ELF_AUX_INFO)
add_definitions(-DHAVE_ELF_AUX_INFO)
endif()

add_subdirectory(Core)
if (ANDROID)
add_subdirectory(Android/jni)
Expand Down
29 changes: 22 additions & 7 deletions Source/Core/Common/ArmCPUDetect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,18 @@
#elif defined(__linux__)
#include <asm/hwcap.h>
#include <sys/auxv.h>
#elif defined(__FreeBSD__)
#elif defined(HAVE_ELF_AUX_INFO)
#include <sys/auxv.h>
#elif defined(__OpenBSD__)
#include <machine/armreg.h>
#include <machine/cpu.h>
#include <sys/sysctl.h>
#endif

#ifdef __OpenBSD__
// clang-format off
#include <sys/types.h>
#include <sys/sysctl.h>
// clang-format on
#endif

#include <fmt/format.h>
Expand Down Expand Up @@ -142,13 +147,13 @@ static bool Read_MIDR_EL1_Sysfs(u64* value)

#endif

#if defined(__linux__) || defined(__FreeBSD__)
#if defined(__linux__) || defined(HAVE_ELF_AUX_INFO)

static u32 ReadHwCap(u32 type)
{
#if defined(__linux__)
return getauxval(type);
#elif defined(__FreeBSD__)
#elif defined(HAVE_ELF_AUX_INFO)
u_long hwcap = 0;
elf_aux_info(type, &hwcap, sizeof(hwcap));
return hwcap;
Expand Down Expand Up @@ -189,7 +194,7 @@ static bool Read_MIDR_EL1(u64* value)

#endif

#if defined(_WIN32) || defined(__linux__) || defined(__FreeBSD__)
#if defined(_WIN32) || defined(__linux__) || defined(HAVE_ELF_AUX_INFO)

static std::string MIDRToString(u64 midr)
{
Expand Down Expand Up @@ -254,11 +259,21 @@ void CPUInfo::Detect()
{
cpu_id = MIDRToString(reg);
}
#elif defined(__linux__) || defined(__FreeBSD__)
// Linux, Android, and FreeBSD
#elif defined(__linux__) || defined(HAVE_ELF_AUX_INFO)
// Linux, Android, FreeBSD and OpenBSD with elf_aux_info

#if defined(__FreeBSD__)
SysctlByName(&model_name, "hw.model");
#elif defined(__OpenBSD__)
int mib[2];
size_t len;
char hwmodel[256];

mib[0] = CTL_HW;
mib[1] = HW_MODEL;
len = std::size(hwmodel);
if (sysctl(mib, 2, &hwmodel, &len, nullptr, 0) != -1)
model_name = std::string(hwmodel, len - 1);
#elif defined(__linux__)
if (!ReadDeviceTree(&model_name, "model"))
{
Expand Down