From b84f17cc5f264ee8b2458255572f55397ceefe08 Mon Sep 17 00:00:00 2001 From: Pav Lucistnik Date: Thu, 3 Dec 2009 08:59:41 +0000 Subject: - Update to 3.7.1 PR: ports/140806 Submitted by: Harald Servat (maintainer) --- devel/papi/files/patch-freebsd.c | 53 ---------------------------------------- 1 file changed, 53 deletions(-) delete mode 100644 devel/papi/files/patch-freebsd.c (limited to 'devel/papi/files/patch-freebsd.c') diff --git a/devel/papi/files/patch-freebsd.c b/devel/papi/files/patch-freebsd.c deleted file mode 100644 index 8de6bdd3409d..000000000000 --- a/devel/papi/files/patch-freebsd.c +++ /dev/null @@ -1,53 +0,0 @@ ---- ./freebsd.c.orig 2008-04-26 04:19:38.000000000 -0400 -+++ ./freebsd.c 2009-07-15 12:05:10.789747000 -0400 -@@ -4,9 +4,9 @@ - - /* - * File: freebsd.c --* CVS: $Id: freebsd.c,v 1.1 2008-04-26 08:19:38 servat Exp $ -+* CVS: $Id: freebsd.c,v 1.6 2009/07/09 13:02:25 servat Exp $ - * Author: Harald Servat --* harald.servat@gmail.com -+* redcrash@gmail.com - */ - - #include -@@ -147,6 +147,14 @@ - Context.CPUsubstrate = CPU_K8; - else if (strcmp(pmc_name_of_cputype(info->pm_cputype), "INTEL_PIV") == 0) - Context.CPUsubstrate = CPU_P4; -+ else if (strcmp(pmc_name_of_cputype(info->pm_cputype), "INTEL_ATOM") == 0) -+ Context.CPUsubstrate = CPU_ATOM; -+ else if (strcmp(pmc_name_of_cputype(info->pm_cputype), "INTEL_CORE") == 0) -+ Context.CPUsubstrate = CPU_CORE; -+ else if (strcmp(pmc_name_of_cputype(info->pm_cputype), "INTEL_CORE2") == 0) -+ Context.CPUsubstrate = CPU_CORE2; -+ else if (strcmp(pmc_name_of_cputype(info->pm_cputype), "INTEL_CORE2EXTREME") == 0) -+ Context.CPUsubstrate = CPU_CORE2EXTREME; - else - /* Unknown processor! */ - Context.CPUsubstrate = CPU_UNKNOWN; -@@ -168,14 +176,11 @@ - */ - int init_mdi(void) - { -- int result; - const struct pmc_cpuinfo *info; - - SHOW_WHERE_I_AM; - - /* Initialize PMC library */ -- result = pmc_init(); -- - if (pmc_init() < 0) - return PAPI_ESYS; - -@@ -187,7 +192,7 @@ - /* Get CPU clock rate from HW.CLOCKRATE sysctl value, and - MODEL from HW.MODEL */ - int mib[5]; -- unsigned len; -+ size_t len; - int hw_clockrate; - char hw_model[PAPI_MAX_STR_LEN]; - -- cgit v1.2.3