Fix ppc64-linux breakage - get the function entry address, not the

descriptor address.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@5814

diff --git a/callgrind/main.c b/callgrind/main.c
index bdd406f8d12ef2cd10d16ee1b85a1a0d2781b559..7b5dc96550f1bf45221b0d7f8435fd2367488856 100644 (file)
--- a/callgrind/main.c
+++ b/callgrind/main.c
@@ -564,7 +564,9 @@ IRBB* CLG_(instrument)( VgCallbackClosure* closure,
    // helper call to setup_bbcc, with pointer to basic block info struct as argument
    arg1 = mkIRExpr_HWord( (HWord)bb );
    argv = mkIRExprVec_1(arg1);
-   di = unsafeIRDirty_0_N( 1, "setup_bbcc", & CLG_(setup_bbcc), argv);
+   di = unsafeIRDirty_0_N( 1, "setup_bbcc", 
+                              VG_(fnptr_to_fnentry)( & CLG_(setup_bbcc) ), 
+                              argv);
    addStmtToIRBB( bbOut, IRStmt_Dirty(di) );
 
    instrCount = 0;