Attachment 46150 Details for Bug 70936 – callgrind.patch

[patch] callgrind.patch

callgrind.patch (text/plain; charset=us-ascii), 5.23 KB, created by Simon Barner on 2004-08-31 14:42:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Barner

Created: 2004-08-31 14:42:05 UTC

Size: 5.23 KB

patch

obsolete

>diff -ruN callgrind.orig/Makefile callgrind/Makefile
>--- callgrind.orig/Makefile	Mon Aug  2 12:45:40 2004
>+++ callgrind/Makefile	Tue Aug 31 15:31:48 2004
>@@ -5,11 +5,10 @@
> # $FreeBSD: ports/devel/callgrind/Makefile,v 1.2 2004/08/02 10:45:40 lofi Exp $
> #
> 
>-PORTNAME=	calltree
>-PORTVERSION=	0.9.7
>+PORTNAME=	callgrind
>+PORTVERSION=	0.9.8
> CATEGORIES=	devel
>-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
>-MASTER_SITE_SUBDIR=	kcachegrind
>+MASTER_SITES=	http://kcachegrind.sourceforge.net/
> 
> MAINTAINER=	barner@gmx.de
> COMMENT=	Valgrind skin for cache simulation and call tracing
>@@ -21,4 +20,15 @@
> GNU_CONFIGURE=	yes
> USE_GMAKE=	yes
> 
>-.include <bsd.port.mk>
>+OPTIONS=	VALGRIND_SNAPSHOT	"Depend on snapshot version of valgrind" off
>+.include <bsd.port.pre.mk>
>+
>+.if defined (WITH_VALGRIND_SNAPSHOT)
>+RUN_DEPENDS=	valgrind:${PORTSDIR}/devel/valgrind-snapshot
>+BUILD_DEPENDS=	valgrind:${PORTSDIR}/devel/valgrind-snapshot
>+.else
>+RUN_DEPENDS=	valgrind:${PORTSDIR}/devel/valgrind
>+BUILD_DEPENDS=	valgrind:${PORTSDIR}/devel/valgrind
>+.endif
>+
>+.include <bsd.port.post.mk>
>diff -ruN callgrind.orig/distinfo callgrind/distinfo
>--- callgrind.orig/distinfo	Sat Jul 31 17:47:18 2004
>+++ callgrind/distinfo	Tue Aug 31 12:41:53 2004
>@@ -1,2 +1,2 @@
>-MD5 (calltree-0.9.7.tar.gz) = f1bb4e6446f26219cf5772849630b380
>-SIZE (calltree-0.9.7.tar.gz) = 156812
>+MD5 (callgrind-0.9.8.tar.gz) = 5d98a82128b66a8ad4a931b728db420b
>+SIZE (callgrind-0.9.8.tar.gz) = 178524
>diff -ruN callgrind.orig/files/patch-src::Makefile.in callgrind/files/patch-src::Makefile.in
>--- callgrind.orig/files/patch-src::Makefile.in	Sat Jul 31 17:47:19 2004
>+++ callgrind/files/patch-src::Makefile.in	Tue Aug 31 12:41:53 2004
>@@ -1,11 +1,13 @@
>---- src/Makefile.in.orig	Thu Jun  3 05:08:28 2004
>-+++ src/Makefile.in	Thu Jun  3 05:08:54 2004
>-@@ -116,7 +116,7 @@
>+--- src/Makefile.in.orig	Thu Aug 19 22:46:55 2004
>++++ src/Makefile.in	Wed Aug 25 10:07:20 2004
>+@@ -167,8 +167,8 @@
>+ target_alias = @target_alias@
>  SUBDIRS = .
>- 
>  AM_CFLAGS = $(WERROR) -DVG_LIBDIR="\"$(libdir)"\" \
>-- -Winline -Wall -Wshadow -O -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@ -g
>-+ -fomit-frame-pointer @PREFERRED_STACK_BOUNDARY@
>- 
>+- -Winline -Wall -Wshadow -O2 -fomit-frame-pointer \
>+- @PREFERRED_STACK_BOUNDARY@ -g
>++ -fomit-frame-pointer \
>++ @PREFERRED_STACK_BOUNDARY@
>  
>  valdir = $(libdir)/valgrind
>+ incincdir = $(includedir)/valgrind
>diff -ruN callgrind.orig/files/patch-src::ct_main.c callgrind/files/patch-src::ct_main.c
>--- callgrind.orig/files/patch-src::ct_main.c	Sat Jul 31 17:47:19 2004
>+++ callgrind/files/patch-src::ct_main.c	Tue Aug 31 12:41:53 2004
>@@ -1,11 +1,10 @@
>---- src/ct_main.c.orig	Thu Jun  3 05:04:08 2004
>-+++ src/ct_main.c	Thu Jun  3 05:05:51 2004
>-@@ -5758,7 +5758,7 @@
>-    /* Install own SIGILL handler */
>-    sigill_new.ksa_handler  = cpuid_SIGILL_handler;
>-    sigill_new.ksa_flags    = 0;
>--   sigill_new.ksa_restorer = NULL;
>-+   //   sigill_new.ksa_restorer = NULL;
>-    res = VG_(ksigemptyset)( &sigill_new.ksa_mask );
>-    CT_ASSERT(res == 0);
>+--- src/ct_main.c.orig	Wed Aug 25 10:10:18 2004
>++++ src/ct_main.c	Wed Aug 25 10:13:36 2004
>+@@ -32,6 +32,7 @@
>+ */
>  
>+ #include "vg_skin.h"
>++#include "vg_unistd.h"
>+ #include "callgrind.h"
>+ #include "ct_include.h"
>+ #include "ct_events.h"
>diff -ruN callgrind.orig/files/patch-src::ct_sim.c callgrind/files/patch-src::ct_sim.c
>--- callgrind.orig/files/patch-src::ct_sim.c	Thu Jan  1 01:00:00 1970
>+++ callgrind/files/patch-src::ct_sim.c	Tue Aug 31 13:06:25 2004
>@@ -0,0 +1,11 @@
>+--- src/ct_sim.c.orig	Tue Aug 31 13:05:51 2004
>++++ src/ct_sim.c	Tue Aug 31 13:06:00 2004
>+@@ -537,7 +537,7 @@
>+    /* Install own SIGILL handler */
>+    sigill_new.ksa_handler  = cpuid_SIGILL_handler;
>+    sigill_new.ksa_flags    = 0;
>+-   sigill_new.ksa_restorer = NULL;
>++   //sigill_new.ksa_restorer = NULL;
>+    res = VG_(ksigemptyset)( &sigill_new.ksa_mask );
>+    CT_ASSERT(res == 0);
>+ 
>diff -ruN callgrind.orig/pkg-descr callgrind/pkg-descr
>--- callgrind.orig/pkg-descr	Sat Jul 31 17:47:18 2004
>+++ callgrind/pkg-descr	Tue Aug 31 12:41:53 2004
>@@ -1,9 +1,9 @@
>-Calltree uses runtime instrumentation via the Valgrind framework for its
>+Callgrind uses runtime instrumentation via the Valgrind framework for its
> cache simulation and call tracing. This way, even shared libraries and
> dynamically opened plugins can be profiled. The data files generated by
>-Calltree can be loaded into KCachegrind for browsing the performance results.
>+Callgrind can be loaded into KCachegrind for browsing the performance results.
> 
>-But there is also a command line tool in the Calltree package to get ASCII
>-reports from Calltree data files without the need to use KCachegrind.
>+But there is also a command line tool in the Callgrind package to get ASCII
>+reports from Callgrind data files without the need to use KCachegrind.
> 
> WWW: http://kcachegrind.sourceforge.net
>diff -ruN callgrind.orig/pkg-plist callgrind/pkg-plist
>--- callgrind.orig/pkg-plist	Sat Jul 31 17:47:18 2004
>+++ callgrind/pkg-plist	Tue Aug 31 12:41:53 2004
>@@ -1,7 +1,7 @@
>-bin/calltree
>-bin/ct_annotate
>-bin/ct_control
>-include/valgrind/calltree.h
>-lib/valgrind/vgskin_calltree.so
>+bin/callgrind
>+bin/callgrind_annotate
>+bin/callgrind_control
>+include/valgrind/callgrind.h
>+lib/valgrind/vgskin_callgrind.so
> share/doc/valgrind/ct_main.html
> share/doc/valgrind/ct_techdocs.html

Actions: View | Diff

Attachments on bug 70936: 46147 | 46148 | 46149 | 46150 | 46151 | 46152 | 46153