diff options
author | Yen-Ming Lee <leeym@FreeBSD.org> | 2003-08-25 01:29:34 +0000 |
---|---|---|
committer | Yen-Ming Lee <leeym@FreeBSD.org> | 2003-08-25 01:29:34 +0000 |
commit | 38ca10bb38e5d231bf3d3fc6dc9a83b9d3f3d215 (patch) | |
tree | fa771c82a13b684c3c5f43d49ddc6ce2f6e0ec9a /sysutils/x86info | |
parent | mail/pear-mailparse: upgrading to 0.9.3. (diff) |
update to 1.12b
Freshmeat blurb:
Identifies several new CPUS. Additional MSR decoding on various
CPUs. A few misidentification bugs have been fixed. Completely
rewritten cachesize determination. Various new cache descriptors
added. Numerous MHz estimation improvements. AMD K7 powernow
register/BIOS decoding. Now decodes extended Intel feature flags,
cpuid brand field, and sSpec on some models. AMD Opteron/Athlon64
support. VIA Powersaver/Longhaul support. A --bugs option to display
CPU errata. No longer retries opening /dev/msr if the first open
fails. Fixes a memory leak in --url.
PR: 55937
Submitted by: Erik Greenwald <erik@smluc.org>
Notes
Notes:
svn path=/head/; revision=87633
Diffstat (limited to 'sysutils/x86info')
-rw-r--r-- | sysutils/x86info/Makefile | 5 | ||||
-rw-r--r-- | sysutils/x86info/distinfo | 2 | ||||
-rw-r--r-- | sysutils/x86info/files/patch-Makefile | 4 | ||||
-rw-r--r-- | sysutils/x86info/files/patch-bench_benchmarks.c | 21 | ||||
-rw-r--r-- | sysutils/x86info/files/patch-cpuid_UP.S | 24 | ||||
-rw-r--r-- | sysutils/x86info/files/patch-x86info.h | 22 |
6 files changed, 60 insertions, 18 deletions
diff --git a/sysutils/x86info/Makefile b/sysutils/x86info/Makefile index 02de41fcc2db..7bedf06ff7ef 100644 --- a/sysutils/x86info/Makefile +++ b/sysutils/x86info/Makefile @@ -6,10 +6,9 @@ # PORTNAME= x86info -PORTVERSION= 1.11 +PORTVERSION= 1.12b CATEGORIES= sysutils -MASTER_SITES= http://www.codemonkey.org.uk/x86info/ \ - ftp://ftp.suse.com/pub/people/davej/x86info/ \ +MASTER_SITES= http://www.codemonkey.org.uk/projects/x86info/ \ ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} EXTRACT_SUFX= .tgz diff --git a/sysutils/x86info/distinfo b/sysutils/x86info/distinfo index d2702aad92cd..323e1699014a 100644 --- a/sysutils/x86info/distinfo +++ b/sysutils/x86info/distinfo @@ -1 +1 @@ -MD5 (x86info-1.11.tgz) = c383845a7cbaa9c9e9784b1469e19950 +MD5 (x86info-1.12b.tgz) = 4f0ce10a00db5778b16a09f68f5f6767 diff --git a/sysutils/x86info/files/patch-Makefile b/sysutils/x86info/files/patch-Makefile index 61b3a4ad7900..a8ace0d5414d 100644 --- a/sysutils/x86info/files/patch-Makefile +++ b/sysutils/x86info/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Thu Nov 14 13:42:46 2002 -+++ Makefile Thu Nov 14 13:42:58 2002 +--- Makefile.orig Sun Aug 24 16:14:00 2003 ++++ Makefile Sun Aug 24 16:15:05 2003 @@ -4,7 +4,7 @@ #CFLAGS += -mwin32 -DWIN32_LEAN_AND_MEAN SHELL = /bin/sh diff --git a/sysutils/x86info/files/patch-bench_benchmarks.c b/sysutils/x86info/files/patch-bench_benchmarks.c new file mode 100644 index 000000000000..3e644835d648 --- /dev/null +++ b/sysutils/x86info/files/patch-bench_benchmarks.c @@ -0,0 +1,21 @@ +--- bench/benchmarks.c.orig Sun Aug 24 11:04:51 2003 ++++ bench/benchmarks.c Sun Aug 24 11:08:26 2003 +@@ -1,7 +1,8 @@ + #include <time.h> + #include <sys/time.h> +-#include <asm/unistd.h> ++#include <sys/unistd.h> + #include <sys/stat.h> ++#include <sys/syscall.h> + #include <stdio.h> + #include "../x86info.h" + #include "bench.h" +@@ -13,7 +14,7 @@ + if (show_bench != 1) + return; + +- TIME(asm volatile("int $0x80" :"=a" (ret) :"0" (__NR_getppid)), "int 0x80"); ++ TIME(asm volatile("int $0x80" :"=a" (ret) :"0" (SYS_getppid)), "int 0x80"); + TIME(asm volatile("cpuid": : :"ax", "dx", "cx", "bx"), "cpuid"); + + TIME(asm volatile("addl $1,0(%esp)"), "addl"); diff --git a/sysutils/x86info/files/patch-cpuid_UP.S b/sysutils/x86info/files/patch-cpuid_UP.S index 3dd2f4671a02..e8e5c450c232 100644 --- a/sysutils/x86info/files/patch-cpuid_UP.S +++ b/sysutils/x86info/files/patch-cpuid_UP.S @@ -1,17 +1,13 @@ ---- cpuid_UP.S.orig Tue Dec 11 11:01:41 2001 -+++ cpuid_UP.S Tue Dec 18 13:42:43 2001 -@@ -1,21 +1,14 @@ +--- cpuid_UP.S.orig Tue Nov 26 20:20:07 2002 ++++ cpuid_UP.S Sun Aug 24 16:12:12 2003 +@@ -1,25 +1,8 @@ .align 4 .text -#ifdef linux - -+#ifdef __WIN32__ -+.globl _cpuid_UP -+ .def _cpuid_UP; .scl 2; .type 32; .endef -+#else /* a sane system */ +- .globl cpuid_UP - .type cpuid_UP,@function +- .type cpuid_UP,@function cpuid_UP: - -#else /* BSD or WIN32 */ @@ -23,6 +19,10 @@ -#else /* BSD */ - .type _cpuid_UP,@function -#endif /* __WIN32__ */ - - _cpuid_UP: - #endif /* linux */ +- +-_cpuid_UP: +-#endif /* linux */ +- + pushl %ebp + movl %esp,%ebp + pushl %edi diff --git a/sysutils/x86info/files/patch-x86info.h b/sysutils/x86info/files/patch-x86info.h new file mode 100644 index 000000000000..5c195f3563d0 --- /dev/null +++ b/sysutils/x86info/files/patch-x86info.h @@ -0,0 +1,22 @@ +--- x86info.h.orig Sun Aug 24 10:59:27 2003 ++++ x86info.h Sun Aug 24 11:00:47 2003 +@@ -1,15 +1,10 @@ + #ifndef _X86INFO_H + #define _X86INFO_H + +-#ifdef linux +-#include <linux/types.h> +-typedef unsigned char u8; +-typedef unsigned short u16; +-typedef unsigned int u32; +-#else +-#include <machine/types.h> +-#define __u32 int +-#endif /* linux */ ++#include <sys/types.h> ++typedef u_int8_t u8; ++typedef u_int16_t u16; ++typedef u_int32_t u32; + + #define VENDOR_AMD 1 + #define VENDOR_CENTAUR 2 |