From c8b188085d2048b8a2c3e55ea2ef71993717bd3b Mon Sep 17 00:00:00 2001
From: Pedro Alves <pedro@palves.net>
Date: Thu, 17 Sep 2020 23:33:40 +0100
Subject: [PATCH] gdb.base/find.exp C++ify

This makes the testcase work when compiled with C++ compiler.

We need #include <string.h> for memset.

gdb/testsuite/ChangeLog:

	* gdb.base/find.c: Include <string.h>.
	(init_bufs): Add cast.
	* gdb.base/find.exp: Issue "set print asm-demangle on".
---
 gdb/testsuite/ChangeLog         | 6 ++++++
 gdb/testsuite/gdb.base/find.c   | 3 ++-
 gdb/testsuite/gdb.base/find.exp | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index a0211e61c5a..e81c85c1df7 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2020-09-17  Pedro Alves  <pedro@palves.net>
+
+	* gdb.base/find.c: Include <string.h>.
+	(init_bufs): Add cast.
+	* gdb.base/find.exp: Issue "set print asm-demangle on".
+
 2020-09-16  Tom Tromey  <tromey@adacore.com>
 
 	PR gdb/26598:
diff --git a/gdb/testsuite/gdb.base/find.c b/gdb/testsuite/gdb.base/find.c
index b97eb129883..d9db06790f2 100644
--- a/gdb/testsuite/gdb.base/find.c
+++ b/gdb/testsuite/gdb.base/find.c
@@ -21,6 +21,7 @@
 
 #include <stdlib.h>
 #include <stdint.h>
+#include <string.h>
 
 /* According to C99 <stdint.h> has to provide these identifiers as
    types, but is also free to define macros shadowing the typedefs.
@@ -54,7 +55,7 @@ static void
 init_bufs ()
 {
   search_buf_size = BUF_SIZE;
-  search_buf = malloc (search_buf_size);
+  search_buf = (char *) malloc (search_buf_size);
   if (search_buf == NULL)
     exit (1);
   memset (search_buf, 'x', search_buf_size);
diff --git a/gdb/testsuite/gdb.base/find.exp b/gdb/testsuite/gdb.base/find.exp
index ad512d51c78..6e11b776b8b 100644
--- a/gdb/testsuite/gdb.base/find.exp
+++ b/gdb/testsuite/gdb.base/find.exp
@@ -42,6 +42,9 @@ set two_patterns_found "${newline}2 patterns found\[.\]"
 
 # Test string pattern.
 
+# For when the testcase is built in C++ mode.
+gdb_test_no_output "set print asm-demangle on"
+
 gdb_test_no_output "set *(int32_t*) &int8_search_buf\[10\] = 0x61616161" ""
 
 gdb_test "find &int8_search_buf\[0\], +sizeof(int8_search_buf), 'a', 'a', 'a'" \
-- 
2.30.2