From b275171e26c0cf9441858209ac62e70b8ddda71d Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Thu, 10 Jun 2010 16:05:29 -0700
Subject: [PATCH] PR11690: Remove a dtrace debug-print, and fix probe_perf

Stan's commit 278c975 fixes the core issue; I'm just polishing...

* dtrace.in: Comment out the debug-print before calling gcc.
* scripts/probe_perf/bench.sh: Pass -DSTAP_SDT_V2 to dtrace.
---
 dtrace.in                   | 2 +-
 scripts/probe_perf/bench.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dtrace.in b/dtrace.in
index 01b7201f1..f087c9150 100755
--- a/dtrace.in
+++ b/dtrace.in
@@ -241,7 +241,7 @@ elif (build_source):
     f.write("static __dtrace () {}\n")
     providers.semaphore_def_write(f)
     f.close()
-    print ["gcc", "-fPIC"] + defines + ["-I.", "-I@prefix@/include", "-g", "-c", fn, "-o", filename + ".o"]
+    #print ["gcc", "-fPIC"] + defines + ["-I.", "-I@prefix@/include", "-g", "-c", fn, "-o", filename + ".o"]
     call(["gcc", "-fPIC"] + defines + ["-I.", "-I@prefix@/include", "-g", "-c", fn, "-o", filename + ".o"], shell=False)
     if (not keep_temps):
         os.remove(fn)
diff --git a/scripts/probe_perf/bench.sh b/scripts/probe_perf/bench.sh
index 66fb72424..f2c10eb5c 100755
--- a/scripts/probe_perf/bench.sh
+++ b/scripts/probe_perf/bench.sh
@@ -7,8 +7,8 @@
 function stap_test() {
 
 # Compile bench
-$STAP/bin/dtrace -G -s bench_.d
-$STAP/bin/dtrace --types -h -s bench_.d
+$STAP/bin/dtrace -G -s bench_.d -D$1
+$STAP/bin/dtrace --types -h -s bench_.d -D$1
 if [ "$3"x = "semx" ] ; then
    IMPLICIT_ENABLED="-DSTAP_SDT_IMPLICIT_ENABLED"
 else
-- 
2.43.5