From be777e08f4ff4cd46874e4b138917de9786b6a07 Mon Sep 17 00:00:00 2001
From: Yao Qi <yao@codesourcery.com>
Date: Thu, 23 Jun 2011 07:46:13 +0000
Subject: [PATCH] 	gdb/testsuite/

	* gdb.base/moribund-step.exp: Skip test if displaced stepping is not
	supported.
	* lib/gdb.exp (support_displaced_stepping): New.
---
 gdb/testsuite/ChangeLog                  |  6 ++++++
 gdb/testsuite/gdb.base/moribund-step.exp |  6 ++++++
 gdb/testsuite/lib/gdb.exp                | 12 ++++++++++++
 3 files changed, 24 insertions(+)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d87b4ea39b..9f5ed90c0b 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-23  Yao Qi  <yao@codesourcery.com>
+
+	* gdb.base/moribund-step.exp: Skip test if displaced stepping is not
+	supported.
+	* lib/gdb.exp (support_displaced_stepping): New.
+
 2011-06-23  Yao Qi  <yao@codesourcery.com>
 
 	* gdb.threads/execl.exp: Skip on remote target.
diff --git a/gdb/testsuite/gdb.base/moribund-step.exp b/gdb/testsuite/gdb.base/moribund-step.exp
index 515ad2fb2a..e0bdbab064 100644
--- a/gdb/testsuite/gdb.base/moribund-step.exp
+++ b/gdb/testsuite/gdb.base/moribund-step.exp
@@ -14,6 +14,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 set testfile moribund-step
+
+if { ![support_displaced_stepping] } {
+    unsupported "displaced stepping"
+    return -1
+}
+
 if { [prepare_for_testing ${testfile}.exp ${testfile} start.c] } {
     return -1
 }
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 0e07931d87..f465398ab0 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -1615,6 +1615,18 @@ proc is_x86_like_target {} {
     return [is_ilp32_target]
 }
 
+# Return 1 if displaced stepping is supported on target, otherwise, return 0.
+proc support_displaced_stepping {} {
+
+    if { [istarget "x86_64-*-linux*"] || [istarget "i\[34567\]86-*-linux*"]
+	 || [istarget "arm*-*-linux*"] || [istarget "powerpc-*-linux*"]
+	 || [istarget "powerpc64-*-linux*"] || [istarget "s390*-*-*"] } {
+	return 1
+    }
+
+    return 0
+}
+
 # Run a test on the target to see if it supports vmx hardware.  Return 0 if so, 
 # 1 if it does not.  Based on 'check_vmx_hw_available' from the GCC testsuite.