---
 testsuite/systemtap.context/backtrace.stp |    2 +-
 testsuite/systemtap.context/backtrace.tcl |   12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

Index: src/testsuite/systemtap.context/backtrace.tcl
===================================================================
--- src.orig/testsuite/systemtap.context/backtrace.tcl	2008-02-05 17:55:06.000000000 -0500
+++ src/testsuite/systemtap.context/backtrace.tcl	2008-02-05 17:55:06.000000000 -0500
@@ -5,6 +5,12 @@
 set m5 0
 set m6 0
 
+if {[istarget ia64-*-*]} {
+	set retexp {.*return\>--\r\n 0x[a-f0-9]+ : yyy_func3[^\[]+\[systemtap_test_module2\]\r\n}
+} else {
+	set retexp {.*return\>--\r\n 0x[a-f0-9]+ : kretprobe_trampoline_holder[^\r\n]+\r\n}
+}
+
 spawn stap backtrace.stp
 #exp_internal 1
 expect {
@@ -36,7 +42,7 @@
 	incr m2
 	expect {
 	    -timeout 5
-	    -re {.*---\r\n 0x[a-f0-9]+ : yyy_func3[^\[]+\[systemtap_test_module2\]\r\n} {
+	    -re {.*call\>--\r\n 0x[a-f0-9]+ : yyy_func3[^\[]+\[systemtap_test_module2\]\r\n} {
 		if {$m2 == 1} {incr m2}
 		exp_continue
 	    }
@@ -76,7 +82,7 @@
 	incr m4
 	expect {
 	    -timeout 5
-	    -re {.*0x[a-f0-9]+ : kretprobe_trampoline_holder[^\r\n]+\r\n} {
+	    -re $retexp {
 		if {$m4 == 1} {incr m4}
 		exp_continue
 	    }
@@ -104,7 +110,7 @@
 	incr m6
 	expect {
 	    -timeout 5
-	    -re {.*---\r\n 0x[a-f0-9]+[^\r\n]+\r\n} {
+	    -re {.*profile>--\r\n 0x[a-f0-9]+[^\r\n]+\r\n} {
 		if {$m6 == 1} {incr m6}
 	    }
 	}
Index: src/testsuite/systemtap.context/backtrace.stp
===================================================================
--- src.orig/testsuite/systemtap.context/backtrace.stp	2008-02-05 17:53:45.000000000 -0500
+++ src/testsuite/systemtap.context/backtrace.stp	2008-02-05 17:55:06.000000000 -0500
@@ -4,7 +4,7 @@
         print("--------\n")
 	bt = backtrace()
 	printf("the %s stack is %s\n", point, bt)
-        print("--------\n")
+        printf("--<%s>--\n", point)
 	print_stack(bt);
         print("--------\n")
 }