From fd986183343387b019080d81838ad9371593b219 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@adacore.com>
Date: Fri, 6 Aug 2021 12:30:51 -0600
Subject: [PATCH] Unconditionally define _initialize_addrmap

The way that init.c is generated does not allow for an initialization
function to be conditionally defined -- doing so will result in a link
error.

This patch fixes a build problem that arises from such a conditional
definition.  It can be reproduce with --disable-unit-tests.
---
 gdb/addrmap.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gdb/addrmap.c b/gdb/addrmap.c
index 22817824cdc..49e51a388e1 100644
--- a/gdb/addrmap.c
+++ b/gdb/addrmap.c
@@ -681,11 +681,13 @@ test_addrmap ()
 }
 
 } // namespace selftests
+#endif /* GDB_SELF_TEST */
 
 void _initialize_addrmap ();
 void
 _initialize_addrmap ()
 {
+#if GDB_SELF_TEST
   selftests::register_test ("addrmap", selftests::test_addrmap);
-}
 #endif /* GDB_SELF_TEST */
+}
-- 
2.30.2