From 557fc2572036cf01c0f5303d044e4d691705fcd1 Mon Sep 17 00:00:00 2001
From: Luis Machado <luis.machado@linaro.org>
Date: Wed, 14 Oct 2020 19:44:03 -0300
Subject: [PATCH] Fix gdb.base/msym*.exp failures

AArch64 generates functions without a prologue for these two testcases,
therefore we shouldn't expect the function location to be displayed with
an offset.

gdb/testsuite/ChangeLog:

2020-10-22  Luis Machado  <luis.machado@linaro.org>

	* gdb.base/msym-bp-shl.exp (test_break): Adjust pattern to not
	expected an offset from the function.
	* gdb.base/msym-bp.exp (test): Likewise.
---
 gdb/testsuite/ChangeLog                | 6 ++++++
 gdb/testsuite/gdb.base/msym-bp-shl.exp | 6 +++---
 gdb/testsuite/gdb.base/msym-bp.exp     | 4 ++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 19b423beb3c..f6084b892b6 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2020-10-22  Luis Machado  <luis.machado@linaro.org>
+
+	* gdb.base/msym-bp-shl.exp (test_break): Adjust pattern to not
+	expected an offset from the function.
+	* gdb.base/msym-bp.exp (test): Likewise.
+
 2020-10-22  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* gdb.fortran/array-slices.exp: Add a new test.
diff --git a/gdb/testsuite/gdb.base/msym-bp-shl.exp b/gdb/testsuite/gdb.base/msym-bp-shl.exp
index fee1d7233fd..0d860f9b1f8 100644
--- a/gdb/testsuite/gdb.base/msym-bp-shl.exp
+++ b/gdb/testsuite/gdb.base/msym-bp-shl.exp
@@ -72,7 +72,7 @@ proc test {debug} {
 	} else {
 	    test_info_break_2 \
 		"<foo@plt.*>" \
-		"<foo\\+$decimal>"
+		"<foo(\\+$decimal)?>"
 	}
     }
 
@@ -96,8 +96,8 @@ proc test {debug} {
 		"in foo at .*msym-bp-shl-lib.c:$decimal"
 	} else {
 	    test_info_break_2 \
-		"<foo\\+$decimal>" \
-		"<foo\\+$decimal>"
+		"<foo(\\+$decimal)?>" \
+		"<foo(\\+$decimal)?>"
 	}
     }
 }
diff --git a/gdb/testsuite/gdb.base/msym-bp.exp b/gdb/testsuite/gdb.base/msym-bp.exp
index c4bef7c188b..6c39437490e 100644
--- a/gdb/testsuite/gdb.base/msym-bp.exp
+++ b/gdb/testsuite/gdb.base/msym-bp.exp
@@ -60,8 +60,8 @@ proc test {debug} {
 		    "in foo at .*msym-bp-2.c:$decimal"
 	    } else {
 		test_info_break_2 \
-		    "<foo\\+$decimal>" \
-		    "<foo\\+$decimal>"
+		    "<foo(\\+$decimal)?>" \
+		    "<foo(\\+$decimal)?>"
 	    }
 	}
     }
-- 
2.30.2