diff --git a/data/c++.m4 b/data/c++.m4
index 3eca8009..90679345 100644
--- a/data/c++.m4
+++ b/data/c++.m4
@@ -296,7 +296,8 @@ m4_define([b4_public_types_define],
 
   // basic_symbol.
   template <typename Base>
-  ]b4_parser_class_name[::basic_symbol<Base>::basic_symbol ()
+  ]b4_parser_class_name[::basic_symbol<Base>::basic_symbol ()]b4_locations_if([
+    : location ()])[
   {}
 
   template <typename Base>
diff --git a/gnulib b/gnulib
index 8635df0a..dd1a129e 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 8635df0ac89e4b1e77322126ecff67e6bca62bd8
+Subproject commit dd1a129ef62d10b1eeb4b40ad39771b93f368cec