From df0f48365cb1bb71e41890e65265aa3ebf2692ab Mon Sep 17 00:00:00 2001
From: Kevin Buettner <kevinb@redhat.com>
Date: Mon, 14 Jun 2010 19:21:11 +0000
Subject: [PATCH] Examine instruction at label `start' instead of `_start'.

---
 gdb/testsuite/ChangeLog               | 11 +++++++++++
 gdb/testsuite/gdb.disasm/t01_mov.exp  |  2 +-
 gdb/testsuite/gdb.disasm/t02_mova.exp |  2 +-
 gdb/testsuite/gdb.disasm/t03_add.exp  |  2 +-
 gdb/testsuite/gdb.disasm/t04_sub.exp  |  2 +-
 gdb/testsuite/gdb.disasm/t05_cmp.exp  |  2 +-
 gdb/testsuite/gdb.disasm/t06_ari2.exp |  2 +-
 gdb/testsuite/gdb.disasm/t07_ari3.exp |  2 +-
 gdb/testsuite/gdb.disasm/t08_or.exp   |  2 +-
 gdb/testsuite/gdb.disasm/t09_xor.exp  |  2 +-
 gdb/testsuite/gdb.disasm/t10_and.exp  |  2 +-
 gdb/testsuite/gdb.disasm/t11_logs.exp |  2 +-
 gdb/testsuite/gdb.disasm/t12_bit.exp  |  2 +-
 gdb/testsuite/gdb.disasm/t13_otr.exp  |  2 +-
 14 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d293c071865..4a247934b58 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2010-06-14  Kevin Buettner  <kevinb@redhat.com>
+
+	* gdb.disasm/t01_mov.exp, gdb.disasm/t02_mova.exp,
+	gdb.disasm/t03_add.exp, gdb.disasm/t04_sub.exp,
+	gdb.disasm/t05_cmp.exp, gdb.disasm/t06_ari2.exp,
+	gdb.disasm/t07_ari3.exp, gdb.disasm/t08_or.exp,
+	gdb.disasm/t09_xor.exp, gdb.disasm/t10_and.exp,
+	gdb.disasm/t11_logs.exp, gdb.disasm/t12_bit.exp,
+	gdb.disasm/t13_otr.exp: Examine instruction at label `start' instead
+	of `_start'.
+
 2010-06-11  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
 
 	* gdb.mi/mi-nonstop.exp: Do not call perror if non-stop mode is
diff --git a/gdb/testsuite/gdb.disasm/t01_mov.exp b/gdb/testsuite/gdb.disasm/t01_mov.exp
index c8968cad894..155c05dec2e 100644
--- a/gdb/testsuite/gdb.disasm/t01_mov.exp
+++ b/gdb/testsuite/gdb.disasm/t01_mov.exp
@@ -48,7 +48,7 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load $binfile
 
-gdb_test "x/i _start" "mov.b	#0x12(:8|),r3h" \
+gdb_test "x/i start" "mov.b	#0x12(:8|),r3h" \
 	"mov.b	#0x12:8,r3h"
 gdb_test "x" "mov.b	#0x12(:8|),@er3" \
 	"mov.b	#0x12:8,@er3"
diff --git a/gdb/testsuite/gdb.disasm/t02_mova.exp b/gdb/testsuite/gdb.disasm/t02_mova.exp
index 97aafa55272..48f1d41dc2a 100644
--- a/gdb/testsuite/gdb.disasm/t02_mova.exp
+++ b/gdb/testsuite/gdb.disasm/t02_mova.exp
@@ -48,7 +48,7 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load $binfile
 
-gdb_test "x /i _start" "mova/b.l\t@\\(0x1234(:16|),r3l.b\\),er1" \
+gdb_test "x /i start" "mova/b.l\t@\\(0x1234(:16|),r3l.b\\),er1" \
 	"mova/b.c @(0x1234:16,r3l.b),er1"
 gdb_test "x" "mova/b.l\t@\\(0x1234(:16|),r3.w\\),er1" \
 	"mova/b.c @(0x1234:16,r3.w),er1"
diff --git a/gdb/testsuite/gdb.disasm/t03_add.exp b/gdb/testsuite/gdb.disasm/t03_add.exp
index 6e170fb0cf3..894517aa717 100644
--- a/gdb/testsuite/gdb.disasm/t03_add.exp
+++ b/gdb/testsuite/gdb.disasm/t03_add.exp
@@ -48,7 +48,7 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load $binfile
 
-gdb_test "x /i _start" "add.b\t#0x12(:8|),r1h" \
+gdb_test "x /i start" "add.b\t#0x12(:8|),r1h" \
 	"add.b #0x12:8,r1h"
 gdb_test "x" "add.b\t#0x12(:8|),@er1" \
 	"add.b #0x12:8,@er1"
diff --git a/gdb/testsuite/gdb.disasm/t04_sub.exp b/gdb/testsuite/gdb.disasm/t04_sub.exp
index de5eb548378..07989a09144 100644
--- a/gdb/testsuite/gdb.disasm/t04_sub.exp
+++ b/gdb/testsuite/gdb.disasm/t04_sub.exp
@@ -48,7 +48,7 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load $binfile
 
-gdb_test "x /i _start" "sub.b\t#0x12(:8|),@er1" \
+gdb_test "x /i start" "sub.b\t#0x12(:8|),@er1" \
 	"sub.b #0x12:8,@er1"
 gdb_test "x" "sub.b\t#0x12(:8|),@\\(0x3(:2|),er1\\)" \
 	"sub.b #0x12:8,@(0x3:2,er1)"
diff --git a/gdb/testsuite/gdb.disasm/t05_cmp.exp b/gdb/testsuite/gdb.disasm/t05_cmp.exp
index 271182c7e2e..0469e2acd89 100644
--- a/gdb/testsuite/gdb.disasm/t05_cmp.exp
+++ b/gdb/testsuite/gdb.disasm/t05_cmp.exp
@@ -48,7 +48,7 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load $binfile
 
-gdb_test "x /i _start" "cmp.b\t@er3,@er1" \
+gdb_test "x /i start" "cmp.b\t@er3,@er1" \
 	"cmp.b @er3,@er1"
 gdb_test "x" "cmp.b\t@er3,@\\(0x3(:2|),er1\\)" \
 	"cmp.b @er3,@(0x3:2,er1)"
diff --git a/gdb/testsuite/gdb.disasm/t06_ari2.exp b/gdb/testsuite/gdb.disasm/t06_ari2.exp
index 885694bbf99..fd0c1c2e67d 100644
--- a/gdb/testsuite/gdb.disasm/t06_ari2.exp
+++ b/gdb/testsuite/gdb.disasm/t06_ari2.exp
@@ -48,7 +48,7 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load $binfile
 
-gdb_test "x /i _start" "addx(.b|)\t#0x12(:8|),r1h" \
+gdb_test "x /i start" "addx(.b|)\t#0x12(:8|),r1h" \
 	"addx.b #0x12:8,r1h"
 gdb_test "x" "addx(.b|)\t#0x12(:8|),@er1" \
 	"addx.b #0x12:8,@er1"
diff --git a/gdb/testsuite/gdb.disasm/t07_ari3.exp b/gdb/testsuite/gdb.disasm/t07_ari3.exp
index 0ae22b07326..4a11118cef5 100644
--- a/gdb/testsuite/gdb.disasm/t07_ari3.exp
+++ b/gdb/testsuite/gdb.disasm/t07_ari3.exp
@@ -48,7 +48,7 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load $binfile
 
-gdb_test "x /i _start" "neg.b\tr1h" \
+gdb_test "x /i start" "neg.b\tr1h" \
 	"neg.b r1h"
 gdb_test "x" "neg.b\t@er1" \
 	"neg.b @er1"
diff --git a/gdb/testsuite/gdb.disasm/t08_or.exp b/gdb/testsuite/gdb.disasm/t08_or.exp
index a33676f01e9..5043aa7ace4 100644
--- a/gdb/testsuite/gdb.disasm/t08_or.exp
+++ b/gdb/testsuite/gdb.disasm/t08_or.exp
@@ -48,7 +48,7 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load $binfile
 
-gdb_test "x /i _start" "or.b\t#0x12(:8|),r1h" \
+gdb_test "x /i start" "or.b\t#0x12(:8|),r1h" \
 	"or.b #0x12:8,r1h"
 gdb_test "x" "or.b\t#0x12(:8|),@er1" \
 	"or.b #0x12:8,@er1"
diff --git a/gdb/testsuite/gdb.disasm/t09_xor.exp b/gdb/testsuite/gdb.disasm/t09_xor.exp
index 8fc3655e9b7..3c6d1d98fd1 100644
--- a/gdb/testsuite/gdb.disasm/t09_xor.exp
+++ b/gdb/testsuite/gdb.disasm/t09_xor.exp
@@ -48,7 +48,7 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load $binfile
 
-gdb_test "x /i _start" "xor.b\t#0x12(:8|),r1h" \
+gdb_test "x /i start" "xor.b\t#0x12(:8|),r1h" \
 	"xor.b #0x12:8,r1h"
 gdb_test "x" "xor.b\t#0x12(:8|),@er1" \
 	"xor.b #0x12:8,@er1"
diff --git a/gdb/testsuite/gdb.disasm/t10_and.exp b/gdb/testsuite/gdb.disasm/t10_and.exp
index 9ebcd81fd2c..7533cdf1be4 100644
--- a/gdb/testsuite/gdb.disasm/t10_and.exp
+++ b/gdb/testsuite/gdb.disasm/t10_and.exp
@@ -48,7 +48,7 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load $binfile
 
-gdb_test "x /i _start" "and.b\t#0x12(:8|),r1h" \
+gdb_test "x /i start" "and.b\t#0x12(:8|),r1h" \
 	"and.b #0x12:8,r1h"
 gdb_test "x" "and.b\t#0x12(:8|),@er1" \
 	"and.b #0x12:8,@er1"
diff --git a/gdb/testsuite/gdb.disasm/t11_logs.exp b/gdb/testsuite/gdb.disasm/t11_logs.exp
index 7d80965bebc..6902b1d2302 100644
--- a/gdb/testsuite/gdb.disasm/t11_logs.exp
+++ b/gdb/testsuite/gdb.disasm/t11_logs.exp
@@ -48,7 +48,7 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load $binfile
 
-gdb_test "x /i _start" "not.b\tr1h" \
+gdb_test "x /i start" "not.b\tr1h" \
 	"not.b r1h"
 gdb_test "x" "not.b\t@er1" \
 	"not.b @er1"
diff --git a/gdb/testsuite/gdb.disasm/t12_bit.exp b/gdb/testsuite/gdb.disasm/t12_bit.exp
index 6b9fd45aa31..2fa3e649a68 100644
--- a/gdb/testsuite/gdb.disasm/t12_bit.exp
+++ b/gdb/testsuite/gdb.disasm/t12_bit.exp
@@ -48,7 +48,7 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load $binfile
 
-gdb_test "x /i _start" "bset\t#0x7,r1h" \
+gdb_test "x /i start" "bset\t#0x7,r1h" \
 	"bset #0x7,r1h"
 gdb_test "x" "bset\t#0x7,@er1" \
 	"bset #0x7,@er1"
diff --git a/gdb/testsuite/gdb.disasm/t13_otr.exp b/gdb/testsuite/gdb.disasm/t13_otr.exp
index e44b918c88f..4ff3c49bd46 100644
--- a/gdb/testsuite/gdb.disasm/t13_otr.exp
+++ b/gdb/testsuite/gdb.disasm/t13_otr.exp
@@ -50,7 +50,7 @@ gdb_load $binfile
 
 global hex
 
-gdb_test "x /i _start" "bra\t.\\+18 \\($hex\\)" \
+gdb_test "x /i start" "bra\t.\\+18 \\($hex\\)" \
 	"bra .+18"
 gdb_test "x" "brn\t.\\+18 \\($hex\\)" \
 	"brn .+18"