mirror of
https://git.freebsd.org/ports.git
synced 2025-04-28 17:46:38 -04:00
3eeb03bdd4
This program had not seen updates since 2017 and thus cannot report
newer CPU models (the list of known ones is hardcoded). Use simple
library call instead of manually decoding the CPU code name.
While here, simplify the installation recipe in `do-install' target
and append to our default {C,LD}FLAGS rather than overwriting them.
Requested by: Dmitry Lukhtionov
34 lines
735 B
C
34 lines
735 B
C
--- src/cpuid.c.orig 2017-07-03 16:04:31 UTC
|
|
+++ src/cpuid.c
|
|
@@ -32,6 +32,9 @@
|
|
#include <sys/cpuctl.h>
|
|
#include <sys/errno.h>
|
|
#include <sys/ioctl.h>
|
|
+#ifdef USE_LIBCPUID
|
|
+#include <libcpuid/libcpuid.h>
|
|
+#endif
|
|
|
|
#include "cpuid.h"
|
|
|
|
@@ -176,6 +179,13 @@ void getcpuvendor(char *vendor, size_t vendor_len) {
|
|
* Returns the CPU family.
|
|
*/
|
|
const char *getcpufamily(void) {
|
|
+#ifdef USE_LIBCPUID
|
|
+ struct cpu_raw_data_t raw;
|
|
+ static struct cpu_id_t id;
|
|
+
|
|
+ return (cpuid_get_raw_data(&raw) == 0 && cpu_identify(&raw, &id) == 0)
|
|
+ ? id.cpu_codename : "Unknown";
|
|
+#else
|
|
cpuctl_cpuid_count_args_t cpuid;
|
|
|
|
cpuid.level = 0x1;
|
|
@@ -240,6 +250,7 @@ const char *getcpufamily(void) {
|
|
return "Unknown";
|
|
break;
|
|
}
|
|
+#endif
|
|
}
|
|
|
|
|