diff -Nu ./dinero.C /u/kbarr/projects/pin/pin-2.0-4229-gcc.3.2-ia32-linux/dinerotool-0.1/dinero.C
--- ./dinero.C	2005-12-14 14:12:19.000000000 -0500
+++ /u/kbarr/projects/pin/pin-2.0-4229-gcc.3.2-ia32-linux/dinerotool-0.1/dinero.C	2006-06-30 15:14:34.382000000 -0400
@@ -52,7 +52,7 @@
 bool do_work=false;
 INSTLIB::CONTROL control;
 
-VOID Handler(INSTLIB::CONTROL_EVENT ev, VOID * v, VOID * ctxhandle, VOID * ip, VOID * tid)
+VOID Handler(INSTLIB::CONTROL_EVENT ev, VOID * v, LEVEL_PINCLIENT::CONTEXT * ctxt, VOID * ip, VOID * tid)
 {
     switch(ev)
     {

diff -Nu ./Makefile /u/kbarr/projects/pin/pin-2.0-4229-gcc.3.2-ia32-linux/dinerotool-0.1/Makefile
--- ./Makefile	2005-12-14 14:12:19.000000000 -0500
+++ /u/kbarr/projects/pin/pin-2.0-4229-gcc.3.2-ia32-linux/dinerotool-0.1/Makefile	2006-06-30 15:15:08.906000000 -0400
@@ -1,19 +1,21 @@
-CC = g++
+CC = g++323
 default : dinerotool
 
 OBJ = dinero.o  d4-7/cmdmain.o  d4-7/cmdargs.o  d4-7/tracein.o  d4-7/pixie32fmt.o  d4-7/pixie64fmt.o  d4-7/dinfmt.o  d4-7/xdinfmt.o  d4-7/binaryfmt.o
 
 %.o : %.C
-	$(CC) -c -DNDEBUG -I../InstLib -Id4-7 -fomit-frame-pointer -Wall -Wno-unknown-pragmas -g -O2 -MMD -DBIGARRAY_MULTIPLIER=1 -DUSING_XED -g -I../Include -I../Include/gen -DTARGET_IA32 -o $@ $<
+	$(CC) -c -I../InstLib -Id4-7 -fomit-frame-pointer -Wall -Wno-unknown-pragmas -g -O2 -MMD -DBIGARRAY_MULTIPLIER=1 -DUSING_XED -g -I../Include -I../Include/gen -DTARGET_IA32 -DTARGET_LINUX -o  $@ $<
+
+
 
 %.o : %.c
-	$(CC) -c -DNDEBUG -I../InstLib -Id4-7 -fomit-frame-pointer -Wall -Wno-unknown-pragmas -g -O2 -MMD -DBIGARRAY_MULTIPLIER=1 -DUSING_XED -g -I../Include -I../Include/gen -DTARGET_IA32 -o $@ $<
+	$(CC) -c -I../InstLib -Id4-7 -fomit-frame-pointer -Wall -Wno-unknown-pragmas -g -O2 -MMD -DBIGARRAY_MULTIPLIER=1 -DUSING_XED -g -I../Include -I../Include/gen -DTARGET_IA32 -DTARGET_LINUX -o  $@ $<
 
 d4-7/libd4.a:
 	cd d4-7; 	env CC=$(CC) ./configure; 	make libd4.a
 
 dinerotool: d4-7/libd4.a $(OBJ)
-	$(CC) -g -Wl,-wrap,mmap,-wrap,__mmap,-wrap,brk,-wrap,__brk,-wrap,__default_morecore -Wl,--section-start,.interp=0x05048400 -Wl,-u,__pthread_mutex_init,-u,malloc -L../Lib/ -L../ExtLib/ -o dinerotool $(OBJ) -Ld4-7 -ld4 -lpin -lxed -lpinpthread -ldwarf -lelf -ldl -ldynamic -g
+	$(CC)  -g -Wl,-u,malloc -Wl,--section-start,.interp=0x05048400  -Wl,-u,__pthread_mutex_init -L../Lib/ -L../ExtLib/ -o dinerotool $(OBJ) -Ld4-7 -ld4 -lpin -lxed -lpinpthread -ldwarf -lelf -ldl -g
 
 package:
 	rm -rf dinerotool-0.1