From b9f0dce3ed194d3fe4c3f74af98ec43440380b33 Mon Sep 17 00:00:00 2001
From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Tue, 29 Sep 2009 19:27:16 +0000
Subject: [PATCH] gdb/testsuite/ 	* gdb.base/breakpoint-shadow.exp: Move
 the ia64 part into ... 	* gdb.arch/ia64-breakpoint-shadow.exp: ... a
 new file, with new tests. 	* gdb.arch/ia64-breakpoint-shadow.S: New file.

---
 gdb/testsuite/ChangeLog                      |  6 +++++
 gdb/testsuite/gdb.base/breakpoint-shadow.exp | 24 +-------------------
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d44a8f4e60f..9fabdf76738 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-29  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+	* gdb.base/breakpoint-shadow.exp: Move the ia64 part into ...
+	* gdb.arch/ia64-breakpoint-shadow.exp: ... a new file, with new tests.
+	* gdb.arch/ia64-breakpoint-shadow.S: New file.
+
 2009-09-29  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
 
 	* gdb.objc/basicclass.exp: Disable pending breakpoint query.
diff --git a/gdb/testsuite/gdb.base/breakpoint-shadow.exp b/gdb/testsuite/gdb.base/breakpoint-shadow.exp
index a787bb690b4..fcc50dd4730 100644
--- a/gdb/testsuite/gdb.base/breakpoint-shadow.exp
+++ b/gdb/testsuite/gdb.base/breakpoint-shadow.exp
@@ -48,29 +48,7 @@ gdb_test_multiple "disass main" $test {
 }
 
 gdb_test "b [gdb_get_line_number "break-first"]" "Breakpoint \[0-9\] at .*" "First breakpoint placed"
-set test "Second breakpoint placed"
-gdb_test_multiple "b [gdb_get_line_number "break-second"]" $test {
-    -re "Breakpoint \[0-9\] at (0x\[0-9a-f\]*):.*$gdb_prompt $" {
-	pass $test
-	set bpt2address $expect_out(1,string)
-    }
-}
-
-if [istarget "ia64-*-*"] then {
-    # Unoptimized code should not use the 3rd slot for the first instruction of
-    # a source line.  This is important for our test, because we want both
-    # breakpoints ("Second breakpoint" and the following one) to be in the same
-    # bundle.
-
-    set test "Second breakpoint address is valid on ia64"
-    if [string match "*\[01\]" $bpt2address] {
-	pass $test
-
-	gdb_test "b *($bpt2address + 1)" "Breakpoint \[0-9\] at .*" "Third breakpoint on ia64 in the Second breakpoint's bundle"
-    } else {
-	unresolved $test
-    }
-}
+gdb_test "b [gdb_get_line_number "break-second"]" "Breakpoint \[0-9\] at .*" "Second breakpoint placed"
 
 set test "disassembly with breakpoints"
 gdb_test_multiple "disass main" $test {
-- 
2.47.2