From: Tom Tromey <tromey@adacore.com>
Date: Wed, 2 Oct 2019 16:13:33 +0000 (-0600)
Subject: Let ARI allow gdb %p printf extensions
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=cd6fdaa1edac2a543aa23d77f0001f25f45c026b;p=deliverable%2Fbinutils-gdb.git

Let ARI allow gdb %p printf extensions

As pointed out by Simon, this changes ARI to allow the gdb-specific %p
printf extensions.

gdb/ChangeLog
2019-10-08  Tom Tromey  <tromey@adacore.com>

	* contrib/ari/gdb_ari.sh (%p): Allow gdb-specific %p extensions.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 49b468d695..c4c7d5f0f0 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2019-10-08  Tom Tromey  <tromey@adacore.com>
+
+	* contrib/ari/gdb_ari.sh (%p): Allow gdb-specific %p extensions.
+
 2019-10-08  Christian Biesinger  <cbiesinger@google.com>
 
 	* gdbtypes.c (overload_debug): Move comment to header.
diff --git a/gdb/contrib/ari/gdb_ari.sh b/gdb/contrib/ari/gdb_ari.sh
index 4bd434c8fe..7202563f7a 100755
--- a/gdb/contrib/ari/gdb_ari.sh
+++ b/gdb/contrib/ari/gdb_ari.sh
@@ -353,7 +353,8 @@ Do not use printf(\"%p\"), instead use printf(\"%s\",paddr()) to dump a \
 target address, or host_address_to_string() for a host address"
     category["%p"] = ari_code
 }
-/%p/ && !/%prec/ {
+# Allow gdb %p extensions, but not other uses of %p.
+/%p[^[\]sF]/ && !/%prec/ {
     fail("%p")
 }