diff --git a/ChangeLog b/ChangeLog
index d78c626b25..cd34a09852 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-12  Joseph Myers  <joseph@codesourcery.com>
+
+	* conform/linknamespace.pl (list_syms): Remove \[.*?\] before
+	splitting into fields.
+
 2015-05-12  Leonhard Holz <leonhard.holz@web.de>
 
 	* locale/categories.def: Define _NL_COLLATE_ENCODING_TYPE.
diff --git a/conform/linknamespace.pl b/conform/linknamespace.pl
index b5347466b0..8ea437d457 100644
--- a/conform/linknamespace.pl
+++ b/conform/linknamespace.pl
@@ -68,6 +68,9 @@ sub list_syms {
       next;
     }
     s/^\s*//;
+    # Architecture-specific st_other bits appear inside [] and disrupt
+    # the format of readelf output.
+    s/\[.*?\]//;
     my (@fields) = split (/\s+/, $_);
     if (@fields < 8) {
       next;