diff --git a/gdbsupport/ChangeLog b/gdbsupport/ChangeLog
index 6b555cb9704..45c2ce70a31 100644
--- a/gdbsupport/ChangeLog
+++ b/gdbsupport/ChangeLog
@@ -1,3 +1,9 @@
+2020-07-28  Tom de Vries  <tdevries@suse.de>
+
+	PR build/26281
+	* gdb_optional.h (class optional): Add volatile member to union
+	contaning m_dummy and m_item.
+
 2020-07-17  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* tdesc.h (struct target_desc_deleter): Moved here
diff --git a/gdbsupport/gdb_optional.h b/gdbsupport/gdb_optional.h
index 02a87f6ee48..ef6760df60b 100644
--- a/gdbsupport/gdb_optional.h
+++ b/gdbsupport/gdb_optional.h
@@ -208,6 +208,8 @@ private:
   {
     struct { } m_dummy;
     T m_item;
+    volatile char dont_use; /* Silences -Wmaybe-uninitialized warning, see
+			       PR gcc/80635.  */
   };
 
   /* True if the object was ever emplaced.  */