From 1a6ecda3983c9daab2f94dfe5bc1fdcd759a94ea Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Wed, 4 Dec 2024 15:32:26 -0800 Subject: [PATCH 1/2] utilize /proc/cpuinfo on NetBSD too --- cpuid_arm64.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cpuid_arm64.c b/cpuid_arm64.c index aaf508439..fbb78e794 100644 --- a/cpuid_arm64.c +++ b/cpuid_arm64.c @@ -127,7 +127,7 @@ static char *cpuname_lower[] = { int get_feature(char *search) { -#ifdef __linux +#if defined( __linux ) || defined( __NetBSD__ ) FILE *infile; char buffer[2048], *p,*t; p = (char *) NULL ; @@ -163,7 +163,7 @@ int get_feature(char *search) int detect(void) { -#ifdef __linux +#if defined( __linux ) || defined( __NetBSD__ ) FILE *infile; char buffer[512], *p, *cpu_part = NULL, *cpu_implementer = NULL; @@ -314,7 +314,7 @@ void get_cpucount(void) { int n=0; -#ifdef __linux +#if defined( __linux ) || defined( __NetBSD__ ) FILE *infile; char buffer[2048], *p,*t; p = (char *) NULL ; @@ -608,7 +608,7 @@ void get_libname(void) void get_features(void) { -#ifdef __linux +#if defined( __linux ) || defined( __NetBSD__ ) FILE *infile; char buffer[2048], *p,*t; p = (char *) NULL ; From a791912cbb06260e1d0271b31959f16a41ddef4c Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Wed, 4 Dec 2024 15:34:57 -0800 Subject: [PATCH 2/2] handle uname returning evbarm on NetBSD --- c_check | 3 +++ 1 file changed, 3 insertions(+) diff --git a/c_check b/c_check index c2b52c81b..c3c290171 100755 --- a/c_check +++ b/c_check @@ -6,6 +6,9 @@ hostarch=`uname -m | sed -e 's/i.86/x86/'` if [ "$hostos" = "AIX" ] || [ "$hostos" = "SunOS" ]; then hostarch=`uname -p` fi +if [ "$hostarch" = "evbarm" ]; then + hostarch=`uname -p` +fi case "$hostarch" in amd64) hostarch=x86_64 ;; arm*) [ "$hostarch" = "arm64" ] || hostarch='arm' ;;