--- tapsets.cxx.orig	2007-01-31 13:22:50.000000000 -0800
+++ tapsets.cxx	2007-01-31 14:12:48.000000000 -0800
@@ -2413,9 +2413,9 @@
 	}
       else
 	{
-#ifdef __ia64__
-	// In IA64 platform function probe point is set at its
-	// entry point rather than prologue end pointer
+#if defined (__ia64__) || defined (__s390x__)
+        // On IA64 and s390x platforms function probe point is set at its
+	// entry point rather than prologue end pointer.
 	   query_statement (fi.name, fi.decl_file, fi.decl_line,
 		&fi.die, entrypc, q);