Attachment #34421 for bug #55937

View | Details | Raw Unified | Return to bug 55937
Collapse All | Expand All

Lines 6-15 Link Here

(-)sysutils/x86info/Makefile (-3 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= x86info	8	PORTNAME= x86info
9	PORTVERSION= 1.11	9	PORTVERSION= 1.12b
10	CATEGORIES= sysutils	10	CATEGORIES= sysutils
11	MASTER_SITES= http://www.codemonkey.org.uk/x86info/ \	11	MASTER_SITES= http://www.codemonkey.org.uk/projects/x86info/ \
12	ftp://ftp.suse.com/pub/people/davej/x86info/ \
13	${MASTER_SITE_SOURCEFORGE}	12	${MASTER_SITE_SOURCEFORGE}
14	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}
15	EXTRACT_SUFX= .tgz	14	EXTRACT_SUFX= .tgz

Line 1 Link Here

(-)sysutils/x86info/distinfo (-1 / +1 lines)
1	MD5 (x86info-1.11.tgz) = c383845a7cbaa9c9e9784b1469e19950	1	MD5 (x86info-1.12b.tgz) = 4f0ce10a00db5778b16a09f68f5f6767

Lines 1-5 Link Here

(-)sysutils/x86info/files/patch-Makefile (-2 / +2 lines)
1	--- Makefile.orig Thu Nov 14 13:42:46 2002	1	--- Makefile.orig Sun Aug 24 16:14:00 2003
2	+++ Makefile Thu Nov 14 13:42:58 2002	2	+++ Makefile Sun Aug 24 16:15:05 2003
3	@@ -4,7 +4,7 @@	3	@@ -4,7 +4,7 @@
4	#CFLAGS += -mwin32 -DWIN32_LEAN_AND_MEAN	4	#CFLAGS += -mwin32 -DWIN32_LEAN_AND_MEAN
5	SHELL = /bin/sh	5	SHELL = /bin/sh




--- 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");




--- 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
 cpuid_UP:
-
-#else /* BSD or WIN32 */

-#else /* BSD */
-	.type	_cpuid_UP,@function
-#endif /* __WIN32__ */
-
-_cpuid_UP:
-#endif /* linux */
-
 	pushl %ebp
 	movl %esp,%ebp
 	pushl %edi




--- 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

Return to bug 55937

Line 0 Link Here

(-)sysutils/x86info/files/patch-bench_benchmarks.c (+21 lines)
	1	--- bench/benchmarks.c.orig Sun Aug 24 11:04:51 2003
	2	+++ bench/benchmarks.c Sun Aug 24 11:08:26 2003
	3	@@ -1,7 +1,8 @@
	4	#include <time.h>
	5	#include <sys/time.h>
	6	-#include <asm/unistd.h>
	7	+#include <sys/unistd.h>
	8	#include <sys/stat.h>
	9	+#include <sys/syscall.h>
	10	#include <stdio.h>
	11	#include "../x86info.h"
	12	#include "bench.h"
	13	@@ -13,7 +14,7 @@
	14	if (show_bench != 1)
	15	return;
	16
	17	- TIME(asm volatile("int $0x80" :"=a" (ret) :"0" (__NR_getppid)), "int 0x80");
	18	+ TIME(asm volatile("int $0x80" :"=a" (ret) :"0" (SYS_getppid)), "int 0x80");
	19	TIME(asm volatile("cpuid": : :"ax", "dx", "cx", "bx"), "cpuid");
	20
	21	TIME(asm volatile("addl $1,0(%esp)"), "addl");

Lines 1-17 Link Here

(-)sysutils/x86info/files/patch-cpuid_UP.S (-12 / +12 lines)
1	--- cpuid_UP.S.orig Tue Dec 11 11:01:41 2001	1	--- cpuid_UP.S.orig Tue Nov 26 20:20:07 2002
2	+++ cpuid_UP.S Tue Dec 18 13:42:43 2001	2	+++ cpuid_UP.S Sun Aug 24 16:12:12 2003
3	@@ -1,21 +1,14 @@	3	@@ -1,25 +1,8 @@
4	.align 4	4	.align 4
5	.text	5	.text
6		6
7	-#ifdef linux	7	-#ifdef linux
8		8	-
9	+#ifdef __WIN32__
10	+.globl _cpuid_UP
11	+ .def _cpuid_UP; .scl 2; .type 32; .endef
12	+#else /* a sane system */
13	.globl cpuid_UP	9	.globl cpuid_UP
14	.type cpuid_UP,@function	10	- .type cpuid_UP,@function
15	cpuid_UP:	11	cpuid_UP:
16	-	12	-
17	-#else /* BSD or WIN32 */	13	-#else /* BSD or WIN32 */
Lines 23-28 Link Here
23	-#else /* BSD */	19	-#else /* BSD */
24	- .type _cpuid_UP,@function	20	- .type _cpuid_UP,@function
25	-#endif /* __WIN32__ */	21	-#endif /* __WIN32__ */
26		22	-
27	_cpuid_UP:	23	-_cpuid_UP:
28	#endif /* linux */	24	-#endif /* linux */
		25	-
		26	pushl %ebp
		27	movl %esp,%ebp
		28	pushl %edi

Line 0 Link Here

(-)sysutils/x86info/files/patch-x86info.h (+22 lines)
	1	--- x86info.h.orig Sun Aug 24 10:59:27 2003
	2	+++ x86info.h Sun Aug 24 11:00:47 2003
	3	@@ -1,15 +1,10 @@
	4	#ifndef _X86INFO_H
	5	#define _X86INFO_H
	6
	7	-#ifdef linux
	8	-#include <linux/types.h>
	9	-typedef unsigned char u8;
	10	-typedef unsigned short u16;
	11	-typedef unsigned int u32;
	12	-#else
	13	-#include <machine/types.h>
	14	-#define __u32 int
	15	-#endif /* linux */
	16	+#include <sys/types.h>
	17	+typedef u_int8_t u8;
	18	+typedef u_int16_t u16;
	19	+typedef u_int32_t u32;
	20
	21	#define VENDOR_AMD 1
	22	#define VENDOR_CENTAUR 2