From 3f983d475ae51820e37978b443c327b13650faaa Mon Sep 17 00:00:00 2001
From: Yufeng Zhang <yufeng.zhang@arm.com>
Date: Wed, 2 Oct 2013 18:09:26 +0000
Subject: [PATCH] gdb/testsuite/

	* gdb.trace/entry-values.exp: Modify regular expression to scan for
	'bl' instruction instead of 'call' for ARM and AArch64 targets.
---
 gdb/testsuite/ChangeLog                  | 5 +++++
 gdb/testsuite/gdb.trace/entry-values.exp | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 1eef53025e9..991e677f710 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-02  Vidya Praveen  <vidyapraveen@arm.com>
+
+	* gdb.trace/entry-values.exp: Modify regular expression to scan for
+	'bl' instruction instead of 'call' for ARM and AArch64 targets.
+
 2013-10-02  Pedro Alves  <palves@redhat.com>
 
 	* gdb.dwarf2/dw2-reg-undefined.exp <pattern_rax_rbx_rcx_print,
diff --git a/gdb/testsuite/gdb.trace/entry-values.exp b/gdb/testsuite/gdb.trace/entry-values.exp
index 85306ad0bf0..b36a4e4d994 100644
--- a/gdb/testsuite/gdb.trace/entry-values.exp
+++ b/gdb/testsuite/gdb.trace/entry-values.exp
@@ -75,10 +75,16 @@ gdb_test_multiple $test $test {
 set bar_length ""
 set bar_call_foo ""
 
+if { [istarget "arm*-*-*"] || [istarget "aarch64*-*-*"] } {
+    set call_insn "bl"
+} else {
+    set call_insn "call"
+}
+
 # Calculate the offset of the last instruction from the beginning.
 set test "disassemble bar"
 gdb_test_multiple $test $test {
-    -re ".*$hex <\\+$decimal>:\[ \t\]+call\[^\r\n\]+\r\n\[ \]+$hex <\\+($decimal)>:" {
+    -re ".*$hex <\\+$decimal>:\[ \t\]+$call_insn\[^\r\n\]+\r\n\[ \]+$hex <\\+($decimal)>:" {
 	set bar_call_foo $expect_out(1,string)
 	exp_continue
     }
-- 
2.30.2