Attachment 193554 Details for Bug 227811 – patch

[patch] patch

cpuid.patch (text/plain), 3.14 KB, created by Piotr Kubaj on 2018-05-20 09:59:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Kubaj

Created: 2018-05-20 09:59:18 UTC

Size: 3.14 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 470444)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	cpuid
>-PORTVERSION=	20170122
>+PORTVERSION=	20180519
> CATEGORIES=	sysutils
> MASTER_SITES=	http://www.etallen.com/cpuid/
> PKGNAMESUFFIX=	${CPUID_SUFFIX}
>Index: distinfo
>===================================================================
>--- distinfo	(revision 470444)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1500174826
>-SHA256 (cpuid-20170122.src.tar.gz) = 667612aae6704341dd10844e97c84c5c5c8700817a5937a3c293b55013bc4865
>-SIZE (cpuid-20170122.src.tar.gz) = 80046
>+TIMESTAMP = 1526817399
>+SHA256 (cpuid-20180519.src.tar.gz) = 967823be36f23cbc972eb0aa882d069c1d155a5978990ac3bcf425e6a2e7ff9a
>+SIZE (cpuid-20180519.src.tar.gz) = 84784
>Index: files/patch-cpuid.c
>===================================================================
>--- files/patch-cpuid.c	(revision 470444)
>+++ files/patch-cpuid.c	(working copy)
>@@ -1,15 +1,27 @@
>---- cpuid.c.orig	2016-11-30 14:34:23 UTC
>+--- cpuid.c.orig	2018-04-19 14:15:07 UTC
> +++ cpuid.c
>-@@ -23,6 +23,8 @@
>+@@ -21,17 +21,19 @@
>+ #ifdef __linux__
>+ #define USE_CPUID_MODULE
>  #define USE_KERNEL_SCHED_SETAFFINITY
>++#include <sys/sysmacros.h>
>  #endif
>  
>+ #if __GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__ >= 40300
>+ #define USE_CPUID_COUNT
>+ #endif
>+ 
> +#define CPUID_MAJOR 0
> +
>  #define _GNU_SOURCE
>  #include <stdio.h>
>  #include <sys/types.h>
>-@@ -34,6 +36,8 @@
>+ #include <sys/stat.h>
>+-#include <sys/sysmacros.h>
>+ #include <fcntl.h>
>+ #include <errno.h>
>+ #include <unistd.h>
>+@@ -39,6 +41,8 @@
>  #include <string.h>
>  #include <regex.h>
>  #include <getopt.h>
>@@ -18,7 +30,7 @@
>  
>  #ifdef USE_CPUID_MODULE
>  #include <linux/major.h>
>-@@ -58,6 +62,7 @@ typedef const char* const  ccstring;
>+@@ -67,6 +71,7 @@ typedef const char* const  ccstring;
>  #define XSTR(x)  STR(x)
>  
>  
>@@ -26,7 +38,7 @@
>  #define MAX(l,r)            ((l) > (r) ? (l) : (r))
>  
>  #define LENGTH(array, type) (sizeof(array) / sizeof(type))
>-@@ -6471,11 +6476,16 @@ real_setup(unsigned int  cpu,
>+@@ -6622,11 +6627,16 @@ real_setup(unsigned int  cpu,
>           int  status;
>           status = syscall(__NR_sched_setaffinity, 0, sizeof(mask), &mask);
>  #else
>@@ -45,9 +57,9 @@
>  #endif
>           if (status == -1) {
>              if (cpu > 0) {
>-@@ -6590,11 +6600,14 @@ static int real_get (int           cpuid
>-           : "a" (reg), 
>+@@ -6749,11 +6759,14 @@ static int real_get (int           cpuid
>              "c" (ecx));
>+ #endif
>     } else {
> -      off64_t  result;
> -      off64_t  offset = ((off64_t)ecx << 32) + reg;
>@@ -63,7 +75,7 @@
>        if (result == -1) {
>           if (quiet) {
>              return FALSE;
>-@@ -7138,7 +7151,7 @@ main(int     argc,
>+@@ -7307,7 +7320,7 @@ main(int     argc,
>     };
>  
>     boolean        opt_one_cpu     = FALSE;
>@@ -72,7 +84,7 @@
>     boolean        opt_kernel      = FALSE;
>     boolean        opt_raw         = FALSE;
>     boolean        opt_debug       = FALSE;
>-@@ -7268,7 +7281,8 @@ main(int     argc,
>+@@ -7437,7 +7450,8 @@ main(int     argc,
>     }
>  
>     // Default to -i.  So use inst unless -k is specified.

Actions: View | Diff

Attachments on bug 227811: 192851 | 193554