diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index aa74cb9a73..7b867f014d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2021-03-24  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* gdbarch.sh (gdbarch_data_registry): Make static.
+	* gdbarch.c: Re-generate.
+
 2021-03-24  Luis Machado  <luis.machado@linaro.org>
 
 	* NEWS: Mention memory tagging changes.
diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
index 23509ba0a9..208cf4b5aa 100644
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -5451,7 +5451,7 @@ struct gdbarch_data_registry
   struct gdbarch_data_registration *registrations;
 };
 
-struct gdbarch_data_registry gdbarch_data_registry =
+static struct gdbarch_data_registry gdbarch_data_registry =
 {
   0, NULL,
 };
diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index 6c36130742..43e51341f9 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -2235,7 +2235,7 @@ struct gdbarch_data_registry
   struct gdbarch_data_registration *registrations;
 };
 
-struct gdbarch_data_registry gdbarch_data_registry =
+static struct gdbarch_data_registry gdbarch_data_registry =
 {
   0, NULL,
 };