From 6243acc4393f32a0a52d8eeec35081ebb3027cfe Mon Sep 17 00:00:00 2001 From: pkubaj Date: Fri, 11 Mar 2022 16:20:36 +0000 Subject: [PATCH] Fix architecture detection on FreeBSD For powerpc64, HW_MACHINE contains powerpc. Actual architecture name is in HW_MACHINE_ARCH. Since I'm not sure it will work on other BSD's, it's ifdef'd. --- lscpu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lscpu.c b/lscpu.c index 750dc32..6c30b79 100644 --- a/lscpu.c +++ b/lscpu.c @@ -926,7 +926,11 @@ int main(int argc, char **argv) }; sysctl_get_cpu_info sysctl_array[] = { +#ifdef __FreeBSD__ + {HW_MACHINE_ARCH, gen_info.arch, sizeof(gen_info.arch), "HW_MACHINE_ARCH"}, +#else {HW_MACHINE, gen_info.arch, sizeof(gen_info.arch), "HW_MACHINE"}, +#endif {HW_BYTEORDER, &(gen_info.byte_order), sizeof(gen_info.byte_order), "HW_BYTEORDER"}, {HW_MODEL, gen_info.model, sizeof(gen_info.model), "HW_MODEL"}, {HW_NCPU, &(gen_info.active_cpu_num), sizeof(gen_info.active_cpu_num), "HW_NCPU"},